gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,069 Commits 12 Branches 481 Tags 2.4 GiB
2227f33c74
Commit Graph

109069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2227f33c74 Merge pull request #13191 from udan11/fix_designer 
Fix designer
 2017-04-28 16:27:31 +02:00
Michal Čihař
8d6b1dce57 Improved handling of logout with disabled LoginCookieDeleteAll 
- avoid removing session for cookie auth if LoginCookieDeleteAll is
  disabled
- redirect user to other server rather than to login page
- show message about partial logout
- adjust tests
- this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:02:11 +02:00
Harro Verton
cde775bd2b Don't destroy the session if logins are still present. fixes #12301 
If you are logged-in into multiple database servers, logOut() logs you
out of all of them. This fix will prevent that, and will only destroy
the session when you log out of the last server.

Signed-off-by: Michal Čihař <michal@cihar.com>
Signed-off-by: Harro Verton <wanwizard@wanwizard.eu>
 2017-04-28 15:27:24 +02:00
Michal Čihař
6e27bc61ef Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-04-28 13:13:27 +02:00
Michal Čihař
bd526cf065 Add issue #13219 to changelog 
It was reported later than fix, but still worth mentioning.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 12:09:20 +02:00
Weblate
fe340a3faf Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-04-28 11:47:56 +02:00
Chien Wei Lin
65d6549d68 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-04-28 11:47:50 +02:00
Viktar Vauchkevich
ff3ae274cb Translated using Weblate (Belarusian) 
Currently translated at 24.3% (778 of 3192 strings)

[CI skip]
 2017-04-28 11:47:49 +02:00
Michal Čihař
0f1c011c28 Add token to form generated by Util::linkOrButton 
Fixes #13182

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 11:46:59 +02:00
Dadan Setia
d99fe15530 Translated using Weblate (Indonesian) 
Currently translated at 70.4% (2249 of 3192 strings)

[CI skip]
 2017-04-25 03:45:34 +02:00
Viktar Vauchkevich
e4fe584d43 Translated using Weblate (Belarusian) 
Currently translated at 24.2% (775 of 3192 strings)

[CI skip]
 2017-04-25 00:44:45 +02:00
Danilo D. de Godoy
8d61e5d06d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.7% (2994 of 3192 strings)

[CI skip]
 2017-04-21 21:46:17 +02:00
Deven Bansod
6b9f40f516 ChangeLog for b3f6e5cdad 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-04-18 21:36:01 +05:30
Deven Bansod
b3f6e5cdad Fix Refresh of ProcessList 
Issue #13182
Specifically the error mentioned in the comment: https://github.com/phpmyadmin/phpmyadmin/issues/13182#issuecomment-294876981

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-04-18 21:32:34 +05:30
bhargavi sabbisetty
a40ef5995d Translated using Weblate (Telugu) 
Currently translated at 9.6% (308 of 3192 strings)

[CI skip]
 2017-04-14 18:46:52 +02:00
Dan Ungureanu
bd2543d1b6 Fixed query that is used in designer. 
Previously, it was using the htmlspecialchars(tbl_name) instead of the
real table name.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-04-14 17:23:35 +03:00
Michal Čihař
a05bbd55e6 Correctly fail if user specifies null as one of connection parameters 
See https://github.com/phpmyadmin/docker/issues/118

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:17:47 +02:00
Stefano Martinelli
6adae69c5a Translated using Weblate (Italian) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-04-11 14:18:17 +02:00
Giovanni Sora
0f1e67490b Translated using Weblate (Interlingua) 
Currently translated at 75.7% (2418 of 3192 strings)

[CI skip]
 2017-04-11 14:18:16 +02:00
Michal Čihař
a5d8e7322d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-04-11 14:18:15 +02:00
Michal Čihař
4fe32e70aa Translated using Weblate (Arabic) 
Currently translated at 34.6% (1107 of 3192 strings)

[CI skip]
 2017-04-11 14:18:14 +02:00
Atef Ben Ali
e5ad6c500c Translated using Weblate (Arabic) 
Currently translated at 34.6% (1107 of 3192 strings)

[CI skip]
 2017-04-11 14:17:32 +02:00
Michal Čihař
42ea58692f Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-10 13:08:20 +02:00
Michal Čihař
94576e0943 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 16:30:05 +02:00
Fenn-CS
a661c06fd6 Added a locale reference for $response in PMA_getChangePassMessage() of user_password.php 
Fixes #13154

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 15:23:26 +02:00
Michal Čihař
606dbf8e0a Add documentation for PMA_HOSTS variable 
See https://github.com/phpmyadmin/docker/pull/116

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 15:19:52 +02:00
Michal Čihař
1f4b6ec0ac Ensure we have only integers in colum visibility and ordering data 
Fixes PHP error in case of invalid table preferences.

Fixes #13152

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 10:12:24 +02:00
Michal Čihař
96b13f46c5 Ensure the xhr attribute is reset on error 
Not really necessary right now, but better be safe than sorry.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:35:22 +02:00
Michal Čihař
c6c8c970ac Add debug logging to the AJAX error handler 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:35:22 +02:00
Michal Čihař
799ac0d4a0 Fix condition to ignore aborted requests 
The status=0 happens on network failure as well, so we can't ignore it
completely.

Fixes #13130

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:35:22 +02:00
Michal Čihař
a079a55282 Remove duplicite error handler 
There is already ajaxError in js/ajax.js, we can do handling there.

Issue #13130

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:33:10 +02:00
Michal Čihař
f5655f4429 Do not try to parse error response 
Issue #13130

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:33:06 +02:00
Michal Čihař
946549d2de Do not show New as a database in database dropdown 
Fixes #13144

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 09:49:44 +02:00
Michal Čihař
6f9a50f2e7 Do not include devel dependencies in the release 
The composer require does automatically run update and thus pulling in
all things we've removed in previous step. Passing --update-no-dev
avoids this.

Fixes #13146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 08:45:45 +02:00
Michal Čihař
10cbb0552f Fixed outbound links in changelog.php 
There was typo in the replacement regexp.

Fixes #13149

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 08:41:54 +02:00
Michal Čihař
5ee4320b7d Fixed pagination while browsing resuls 
Fixes #13150

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 08:28:42 +02:00
Marc Delisle
31ba6ddd14 English improvements and typo fixes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2017-04-03 09:49:37 +02:00
Deven Bansod
4248e33aed ChangeLog for #13135 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-03-31 19:47:33 +05:30
Deven Bansod
8486d8afa7 Use correct value as an argument to the Collation Description function 
Fix #13135

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-03-31 19:46:29 +05:30
Michal Čihař
13d3398ec9 Adjust tests to make them output neutral 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:31:46 +02:00
Michal Čihař
2c6c34fb28 Avoid trying to connect to MySQL server on demo 
This way we avoid PMASA-2016-44 on the demo server.

Issue #13083

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:07:42 +02:00
Michal Čihař
8beb7f544e Fixed broken links in setup 
Fixes #13133

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:07:42 +02:00
Michal Čihař
73ab7f380b Allow to run setup on the demo server 
Fixes #13083

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 13:47:45 +02:00
Michal Čihař
1952b2eaa4 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-03-30 13:17:36 +02:00
Michal Čihař
8602695340 Focus on SQL editor after inserting field name 
Fixes #13125

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 13:16:42 +02:00
Piyush Agrawal
f89aafe9bf Fix: Focus back to codemirror editor on selecting column 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-03-30 13:13:33 +02:00
Weblate
2233104590 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-30 13:11:05 +02:00
tmtisfree
4009217a2e Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-30 13:11:04 +02:00
Michal Čihař
cf525c7876 Always execute tracking queries as controluser 
Fixes #13132

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 13:09:08 +02:00
Isaac Bennetch
2f0b6c4169 Prepare for 4.7.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-29 14:39:15 -04:00