Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c63a993279a533ec404407a17db9b333a2e751cd
https://github.com/phpmyadmin/phpmyadmin/commit/c63a993279a533ec404407a17db…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-11 (Tue, 11 Jul 2017)
Changed paths:
M js/common.js
Log Message:
-----------
Bring back token parameter
This is needed here as the request is called with processData=false.
This reverts commit 9b627d685b373f0bd006246596e20b56d6b0c18e.
Fixes #13473
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 59d0a9fe8670e0ff01e4a38f991f4a71cd118f99
https://github.com/phpmyadmin/phpmyadmin/commit/59d0a9fe8670e0ff01e4a38f991…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Add sanity checking for max_count
We use it later for division, so make sure it's good for it.
Fixes #13470
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: bd2a0ec3079cd5dc9595622cdd641ae503ff91b2
https://github.com/phpmyadmin/phpmyadmin/commit/bd2a0ec3079cd5dc9595622cdd6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M libraries/Config.php
M libraries/DisplayResults.php
M libraries/Footer.php
M libraries/Template.php
M libraries/Theme.php
M libraries/ThemeManager.php
M libraries/common.inc.php
M libraries/export.lib.php
M libraries/plugins/auth/AuthenticationSignon.php
M libraries/plugins/import/ImportShp.php
M prefs_manage.php
M setup/index.php
Log Message:
-----------
Wrap file_exists calls with @
It can produce warnings in case open_basedir is enabled.
Fixes #13467
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 18c7e718ed72e38f6e4f91e0873a905c23f22743
https://github.com/phpmyadmin/phpmyadmin/commit/18c7e718ed72e38f6e4f91e0873…
Author: test <ebe37302(a)tqosi.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M po/hr.po
Log Message:
-----------
Translated using Weblate (Croatian)
Currently translated at 27.7% (888 of 3203 strings)
[CI skip]
Commit: 91d3d0953e2c9290b38e2a18180bc2ed5b9cb100
https://github.com/phpmyadmin/phpmyadmin/commit/91d3d0953e2c9290b38e2a18180…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.php
M libraries/ListDatabase.php
M libraries/controllers/table/TableRelationController.php
M templates/table/relation/foreign_key_row.phtml
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: bd2a0ec3079cd5dc9595622cdd641ae503ff91b2
https://github.com/phpmyadmin/phpmyadmin/commit/bd2a0ec3079cd5dc9595622cdd6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M libraries/Config.php
M libraries/DisplayResults.php
M libraries/Footer.php
M libraries/Template.php
M libraries/Theme.php
M libraries/ThemeManager.php
M libraries/common.inc.php
M libraries/export.lib.php
M libraries/plugins/auth/AuthenticationSignon.php
M libraries/plugins/import/ImportShp.php
M prefs_manage.php
M setup/index.php
Log Message:
-----------
Wrap file_exists calls with @
It can produce warnings in case open_basedir is enabled.
Fixes #13467
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: f8b5fd14526c13544e1bd55ba8aed901eb3a8f34
https://github.com/phpmyadmin/phpmyadmin/commit/f8b5fd14526c13544e1bd55ba8a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_7'
Commit: dc420e2872a881c947ca3f09f20eb7e39398593d
https://github.com/phpmyadmin/phpmyadmin/commit/dc420e2872a881c947ca3f09f20…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M libraries/classes/Config.php
M libraries/classes/DisplayResults.php
M libraries/classes/Footer.php
M libraries/classes/Template.php
M libraries/classes/Theme.php
M libraries/classes/ThemeManager.php
M libraries/common.inc.php
M libraries/export.lib.php
M libraries/plugins/auth/AuthenticationSignon.php
M libraries/plugins/import/ImportShp.php
M prefs_manage.php
M setup/index.php
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5f21c8dbc64f...dc420e2872a8
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 85747b9ae99bd6110578c7f467ee99ad91324b7a
https://github.com/phpmyadmin/phpmyadmin/commit/85747b9ae99bd6110578c7f467e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.php
M libraries/ListDatabase.php
M libraries/controllers/table/TableRelationController.php
M templates/table/relation/foreign_key_row.phtml
Log Message:
-----------
Use usort() instead of natsort()
The natsoft has side effect of producit associated array, what is later
represented as object if encoded to JSON and breaking code expect array
instead.
Fixes #13465
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 5f21c8dbc64ffab4f8b08affcc946ca06460bdbb
https://github.com/phpmyadmin/phpmyadmin/commit/5f21c8dbc64ffab4f8b08affcc9…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M ChangeLog
M libraries/classes/DatabaseInterface.php
M libraries/classes/ListDatabase.php
M libraries/controllers/table/TableRelationController.php
M templates/table/relation/foreign_key_row.phtml
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7f7af4c646e4...5f21c8dbc64f
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 85747b9ae99bd6110578c7f467ee99ad91324b7a
https://github.com/phpmyadmin/phpmyadmin/commit/85747b9ae99bd6110578c7f467e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-07-10 (Mon, 10 Jul 2017)
Changed paths:
M ChangeLog
M libraries/DatabaseInterface.php
M libraries/ListDatabase.php
M libraries/controllers/table/TableRelationController.php
M templates/table/relation/foreign_key_row.phtml
Log Message:
-----------
Use usort() instead of natsort()
The natsoft has side effect of producit associated array, what is later
represented as object if encoded to JSON and breaking code expect array
instead.
Fixes #13465
Signed-off-by: Michal Čihař <michal(a)cihar.com>