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

109047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Isaac Bennetch
5538c22c14 Adding composer lock for 4.7.0 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-29 08:15:30 -04:00
Isaac Bennetch
08bbf7bdbd Prepare for 4.7.0 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-28 20:58:44 -04:00
Isaac Bennetch
a3bff88199 Add ChangeLog for PMASA-2017-08 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-28 20:56:55 -04:00
Michal Čihař
7232271a37 Truncate only long passwords 
This avoids problems with certain PHP versions returning false when
first parameter to substr is ''.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-27 15:55:35 +02:00
Michal Čihař
f67e04987d No longer recommend not used configuration variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-27 11:37:07 +02:00
Weblate
73fce9d2c1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-27 11:29:46 +02:00
Vuong Phan
3f4e69831a Translated using Weblate (Vietnamese) 
Currently translated at 84.5% (2699 of 3192 strings)

[CI skip]
 2017-03-27 11:29:46 +02:00
tmtisfree
ae2503d9e2 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-27 11:29:43 +02:00
Michal Čihař
ebaf126501 Do not use empty() for checking submitted username 
The empty() function is evil and will you block from login with username
"0".

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-27 11:28:16 +02:00
Michal Čihař
06fe8c0e25 Properly report invalid token error on AJAX requests 
We need to keep ajax_request flag to properly report result in JSON.

Issue #13114

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 10:24:31 +01:00
Raghuram
553d1ff343 Removes default new database name 
Issue #13099

Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 13:49:37 +01:00
Michal Čihař
b98fc393ab Revert "Fixes error in designer #13032" 
This reverts commit dc649d7a29.
 2017-03-21 11:33:51 +01:00
Raghuram
dc649d7a29 Fixes error in designer #13032 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2017-03-21 10:00:58 +01:00
TheSaturn
4119b5ca3d Adds html encoding for db name 
Issue #13032

Signed-off-by: TheSaturn <saturn@thesaturn.me>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 09:50:19 +01:00
Fenn-CS
297aec9ab1 Added definitions for result and message variable-update methods still missing 
Fixes #12349

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 09:46:57 +01:00
Michal Čihař
2e448d46e3 Fixed setting password on recent MariaDB with non working plugins 
When the plugins are not working (eg. the plugins directory does not
exist), we should still allow to change the password.

Fixes #12757

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 08:23:06 +01:00
Michal Čihař
211541f56e Changelog entry for #13105 and #13107 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 16:19:40 +01:00
Raghuram
c1b9c83b76 Fixes adding attribute while updating virtual col 
Fixes #13105

Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-20 16:19:33 +01:00
Weblate
548b6b4d0e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-20 16:13:19 +01:00
tmtisfree
21741c5edd Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-20 16:13:16 +01:00
Michal Čihař
cb691faf76 Do not try to sync favorite tables if configuration storage is not enabled 
Fixes #13092

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 16:12:32 +01:00
Володимир
528fb46331 Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3191 of 3192 strings)

[CI skip]
 2017-03-19 21:47:27 +01:00