Branch: refs/heads/STABLE
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 496602674cd8ce849a543e9452b12ed727e26831
https://github.com/phpmyadmin/phpmyadmin/commit/496602674cd8ce849a543e9452b12ed727e26831
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-26 (Wed, 26 Nov 2014)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.3.1-dev
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 0446f3c29468e2d071dce1742e5c7cf4f961c079
https://github.com/phpmyadmin/phpmyadmin/commit/0446f3c29468e2d071dce1742e5c7cf4f961c079
Author: Jan Erik Zassenhaus <jan.zassenh...@jgerman.de>
Date: 2014-11-26 (Wed, 26 Nov 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 99.8% (2974 of 2978 strings)
[CI skip]
Commit: ee22c7efa217ad1c11482bfd8d419525c86272f5
https://github.com/phpmyadmin/phpmyadmin/commit/ee22c7efa217ad1c11482bfd8d419525c86272f5
Author: Weblate <nore...@weblate.org>
Date: 2014-11-26 (Wed, 26 Nov 2014)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: e08383ba2541a9c596bb51fe6f4d56789e63fab4
https://github.com/phpmyadmin/phpmyadmin/commit/e08383ba2541a9c596bb51fe6f4d56789e63fab4
Author: Danilo GUia <danilo....@globomail.com>
Date: 2014-11-26 (Wed, 26 Nov 2014)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.9% (2797 of 2978 strings)
[CI skip]
Commit: 10b958c1ba903e17951b9a63f22e46db29e73c97
https://github.com/phpmyadmin/phpmyadmin/commit/10b958c1ba903e17951b9a63f22e46db29e73c97
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
Log Message:
-----------
Merge branch 'QA_4_2' into QA_4_3
Commit: b215875e3ea6fc76c22c5e26fb147e0d5d36c8ad
https://github.com/phpmyadmin/phpmyadmin/commit/b215875e3ea6fc76c22c5e26fb147e0d5d36c8ad
Author: Aputsiaq Niels Janussen <a...@isit.gl>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 97.2% (2896 of 2978 strings)
[CI skip]
Commit: 6aaf98273ba251e48156969a73915a337529819d
https://github.com/phpmyadmin/phpmyadmin/commit/6aaf98273ba251e48156969a73915a337529819d
Author: Giovanni Sora <g.s...@tiscali.it>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M po/ia.po
Log Message:
-----------
Translated using Weblate (Interlingua)
Currently translated at 63.7% (1898 of 2978 strings)
[CI skip]
Commit: c9cbfec6ca083d1d3af9148cc768673831a6b700
https://github.com/phpmyadmin/phpmyadmin/commit/c9cbfec6ca083d1d3af9148cc768673831a6b700
Author: Marcos Algeri <malg...@gmail.com>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.0% (2801 of 2978 strings)
[CI skip]
Commit: 42e74273a5e5291701b2ad16003fa7f0b98ac7e5
https://github.com/phpmyadmin/phpmyadmin/commit/42e74273a5e5291701b2ad16003fa7f0b98ac7e5
Author: Weblate <nore...@weblate.org>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 3d87430aa00aa3956d7308ac1cdcda0a42fa0072
https://github.com/phpmyadmin/phpmyadmin/commit/3d87430aa00aa3956d7308ac1cdcda0a42fa0072
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
[FIX] Browse table: Make Show all label clickable
<label for> works with IDs, not names.
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: a47128ca4fccd6d3438bb12dea176af34af4e5b2
https://github.com/phpmyadmin/phpmyadmin/commit/a47128ca4fccd6d3438bb12dea176af34af4e5b2
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M js/error_report.js
Log Message:
-----------
[FIX] JS error reporting: Preserve hash fragment
The JS error reporting notification bar closing link points to href="#".
Don't allow navigating to the target, so our hash history is not
overwritten.
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: f14a051e1b1d25d3647a894309360b39890f52e6
https://github.com/phpmyadmin/phpmyadmin/commit/f14a051e1b1d25d3647a894309360b39890f52e6
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M test/classes/PMA_DisplayResults_test.php
Log Message:
-----------
[TEST] Fix failing test after 3d87430
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: 36e49e496c26a3c9828d8ed0612f8d51eced3e69
https://github.com/phpmyadmin/phpmyadmin/commit/36e49e496c26a3c9828d8ed0612f8d51eced3e69
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
[DOC] Add ChangeLog entry for bug #4609
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: b779a1881b205afa28432f728ccf92ff07ad1d28
https://github.com/phpmyadmin/phpmyadmin/commit/b779a1881b205afa28432f728ccf92ff07ad1d28
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: cb18cb64849c5acf442a080bd3add274d1cc21d5
https://github.com/phpmyadmin/phpmyadmin/commit/cb18cb64849c5acf442a080bd3add274d1cc21d5
Author: Weblate <nore...@weblate.org>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M ChangeLog
M test/classes/PMA_DisplayResults_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 2e9b80e9e325aa6135a1e26346ac5c67bf7cee87
https://github.com/phpmyadmin/phpmyadmin/commit/2e9b80e9e325aa6135a1e26346ac5c67bf7cee87
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-27 (Thu, 27 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
[DOC] Add ChangeLog entry for bug #4610
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: b92d3e104786ac58661632965e8a969a23f1983a
https://github.com/phpmyadmin/phpmyadmin/commit/b92d3e104786ac58661632965e8a969a23f1983a
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/ajax.js
M libraries/common.inc.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
Log Message:
-----------
Workaround for token mismatch error on server session timeout for config and
http authentication types
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 5e1ab952b88098f6482064499d1b8c12af54aa5a
https://github.com/phpmyadmin/phpmyadmin/commit/5e1ab952b88098f6482064499d1b8c12af54aa5a
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M js/ajax.js
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message:
-----------
Use a separate flag to avoid confusion
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: ea7ca462e56c83792ddc6c9320215a3566ffbba2
https://github.com/phpmyadmin/phpmyadmin/commit/ea7ca462e56c83792ddc6c9320215a3566ffbba2
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message:
-----------
Document what these flags do
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 5c02da89bef87ff7161914662ebb9bf9449d97b2
https://github.com/phpmyadmin/phpmyadmin/commit/5c02da89bef87ff7161914662ebb9bf9449d97b2
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for bug #4227
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 251a2aea780e0fe305ba8e0bdce2a3426e384fc4
https://github.com/phpmyadmin/phpmyadmin/commit/251a2aea780e0fe305ba8e0bdce2a3426e384fc4
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: f4c5012cc7d1aec0a8fcf58e78fc2f2f2cdc8145
https://github.com/phpmyadmin/phpmyadmin/commit/f4c5012cc7d1aec0a8fcf58e78fc2f2f2cdc8145
Author: Weblate <nore...@weblate.org>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M ChangeLog
M js/ajax.js
M libraries/common.inc.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: eb79ad9181734a77ae956a2add430a1ed08275bd
https://github.com/phpmyadmin/phpmyadmin/commit/eb79ad9181734a77ae956a2add430a1ed08275bd
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message:
-----------
Fix typo
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 3f673637b742f615dfaa83b181f995b28db5d04a
https://github.com/phpmyadmin/phpmyadmin/commit/3f673637b742f615dfaa83b181f995b28db5d04a
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-28 (Fri, 28 Nov 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 1e39ac53d02cabc5476af4371fb3c2f1952de8a7
https://github.com/phpmyadmin/phpmyadmin/commit/1e39ac53d02cabc5476af4371fb3c2f1952de8a7
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-29 (Sat, 29 Nov 2014)
Changed paths:
M ChangeLog
M libraries/Menu.class.php
Log Message:
-----------
Bug Undefined index menuswork
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: e8aa77761ec938f4cfd100d78bd6abec06264582
https://github.com/phpmyadmin/phpmyadmin/commit/e8aa77761ec938f4cfd100d78bd6abec06264582
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Log Message:
-----------
Merge commit '0ab3ee3' into QA_4_3
Commit: 1292a5337941afe18839b1362fd50c8058cd1fe8
https://github.com/phpmyadmin/phpmyadmin/commit/1292a5337941afe18839b1362fd50c8058cd1fe8
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-11-30 (Sun, 30 Nov 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Commit: c43d60d1a4e0474ba295369b6c6ffec99df5109a
https://github.com/phpmyadmin/phpmyadmin/commit/c43d60d1a4e0474ba295369b6c6ffec99df5109a
Author: Nisarg Jhaveri <nisarg.jhav...@research.iiit.ac.in>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
Bug 4614 Missing separator
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: a117cb2552823f02fd03fb75210c05fd105495e2
https://github.com/phpmyadmin/phpmyadmin/commit/a117cb2552823f02fd03fb75210c05fd105495e2
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 7662bf11ef594aadb635f015fc84ae117eddf146
https://github.com/phpmyadmin/phpmyadmin/commit/7662bf11ef594aadb635f015fc84ae117eddf146
Author: Michal Čihař <mic...@cihar.com>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 94.7% (2822 of 2978 strings)
[CI skip]
Commit: e09ff83c33e91dfd6ff5943c50c4c53879162494
https://github.com/phpmyadmin/phpmyadmin/commit/e09ff83c33e91dfd6ff5943c50c4c53879162494
Author: Weblate <nore...@weblate.org>
Date: 2014-12-01 (Mon, 01 Dec 2014)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 5d0a2298e242d03dec663862207bb6959087584a
https://github.com/phpmyadmin/phpmyadmin/commit/5d0a2298e242d03dec663862207bb6959087584a
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M ChangeLog
M js/server_status_processes.js
Log Message:
-----------
bug #4615 SQL highlighting in process list breaks on auto refresh
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 43d044e5ee97cab4eac498cb5f7e36a82b04043a
https://github.com/phpmyadmin/phpmyadmin/commit/43d044e5ee97cab4eac498cb5f7e36a82b04043a
Author: Jan Erik Zassenhaus <jan.zassenh...@jgerman.de>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: 57646991df3ddfe290e79436fdd2d894ef0a77ce
https://github.com/phpmyadmin/phpmyadmin/commit/57646991df3ddfe290e79436fdd2d894ef0a77ce
Author: Domen <mite...@outlook.com>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M po/sl.po
Log Message:
-----------
Translated using Weblate (Slovenian)
Currently translated at 99.8% (2974 of 2978 strings)
[CI skip]
Commit: 26895da3c910c8b18ed0ebf3c3c2a9769f84447e
https://github.com/phpmyadmin/phpmyadmin/commit/26895da3c910c8b18ed0ebf3c3c2a9769f84447e
Author: Weblate <nore...@weblate.org>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M ChangeLog
M js/server_status_processes.js
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 58df5ebed5df900e3fa917f969becf591fdf9517
https://github.com/phpmyadmin/phpmyadmin/commit/58df5ebed5df900e3fa917f969becf591fdf9517
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M ChangeLog
M db_printview.php
Log Message:
-----------
bug #4616 Warning in db structure print view page
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 85c866fb8f1132f84f5eb9fa1249c6aa177e4e01
https://github.com/phpmyadmin/phpmyadmin/commit/85c866fb8f1132f84f5eb9fa1249c6aa177e4e01
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-02 (Tue, 02 Dec 2014)
Changed paths:
M ChangeLog
M libraries/navigation/Nodes/Node.class.php
Log Message:
-----------
Bug Undefined index navwork
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 41c02abc41049c4a23a08c4b05b3785ca9c0c3f1
https://github.com/phpmyadmin/phpmyadmin/commit/41c02abc41049c4a23a08c4b05b3785ca9c0c3f1
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M url.php
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Commit: a23a49bf5a56dd134f2a0882672d304d5c196c81
https://github.com/phpmyadmin/phpmyadmin/commit/a23a49bf5a56dd134f2a0882672d304d5c196c81
Author: josep constanti <jconsta...@ovi.com>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 83.7% (2495 of 2978 strings)
[CI skip]
Commit: 28d163f02c52128ee7449c44dbb9ed2a6cd6d581
https://github.com/phpmyadmin/phpmyadmin/commit/28d163f02c52128ee7449c44dbb9ed2a6cd6d581
Author: Weblate <nore...@weblate.org>
Date: 2014-12-03 (Wed, 03 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M url.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 2895f6743a0dd72d7d7a9943c57f47f6efe3c34b
https://github.com/phpmyadmin/phpmyadmin/commit/2895f6743a0dd72d7d7a9943c57f47f6efe3c34b
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M js/db_central_columns.js
Log Message:
-----------
Cursor type 'move' wouldn't be appropriate for table headers that sort on
click
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 23f5a860f7508c75f10c4d8a224e6e81688ff73f
https://github.com/phpmyadmin/phpmyadmin/commit/23f5a860f7508c75f10c4d8a224e6e81688ff73f
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M libraries/common.inc.php
M libraries/navigation/Nodes/Node.class.php
M libraries/plugins/AuthenticationPlugin.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M po/ca.po
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
M url.php
Log Message:
-----------
Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 1d92e9db8740da09ae090763f796c4e73d636c62
https://github.com/phpmyadmin/phpmyadmin/commit/1d92e9db8740da09ae090763f796c4e73d636c62
Author: Akos Eros <erosako...@gmail.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 79.8% (2377 of 2978 strings)
[CI skip]
Commit: 6e71f2a72ad3558b40320d711642fe40e79364f7
https://github.com/phpmyadmin/phpmyadmin/commit/6e71f2a72ad3558b40320d711642fe40e79364f7
Author: Weblate <nore...@weblate.org>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M js/db_central_columns.js
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 680352b372b52e011c4f207961837ba4f2b11faa
https://github.com/phpmyadmin/phpmyadmin/commit/680352b372b52e011c4f207961837ba4f2b11faa
Author: Michal Čihař <mic...@cihar.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Conflicts:
README
doc/conf.py
libraries/Config.class.php
Commit: d19fe59438b346021a2d9c0e3def4a11d3aaf1b1
https://github.com/phpmyadmin/phpmyadmin/commit/d19fe59438b346021a2d9c0e3def4a11d3aaf1b1
Author: Michal Čihař <mic...@cihar.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M scripts/generate-mo
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Commit: a649ebadc246e2b128087010ee533affa7ff1e09
https://github.com/phpmyadmin/phpmyadmin/commit/a649ebadc246e2b128087010ee533affa7ff1e09
Author: Michal Čihař <mic...@cihar.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Commit: 07c4e4cae4644eb342225b2d9a97c7d160c1496e
https://github.com/phpmyadmin/phpmyadmin/commit/07c4e4cae4644eb342225b2d9a97c7d160c1496e
Author: Michal Čihař <mic...@cihar.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge branch 'MAINT_4_3_0' into QA_4_3
Commit: bd2a8b501c85d0b04dc018ebe416f9fc9e07fe72
https://github.com/phpmyadmin/phpmyadmin/commit/bd2a8b501c85d0b04dc018ebe416f9fc9e07fe72
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
Log Message:
-----------
Fix other undefined index notices in PMA_getDiagMessageForFeature()
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 3aa884ee367b100c513aa37d88a0d9efbb89f428
https://github.com/phpmyadmin/phpmyadmin/commit/3aa884ee367b100c513aa37d88a0d9efbb89f428
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M libraries/insert_edit.lib.php
Log Message:
-----------
Fix undefined index notice (fields) in PMA_getParamsForUpdateOrInsert()
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 00db138a47a53ef7cad583b6b9dc49c4a3f3e0eb
https://github.com/phpmyadmin/phpmyadmin/commit/00db138a47a53ef7cad583b6b9dc49c4a3f3e0eb
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths:
M ChangeLog
M libraries/central_columns.lib.php
M test/libraries/PMA_central_columns_test.php
Log Message:
-----------
bug #4620 Undefined index while adding to the central columns list
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: e9e4faaeb4a29db231afebe872410de3981e6da0
https://github.com/phpmyadmin/phpmyadmin/commit/e9e4faaeb4a29db231afebe872410de3981e6da0
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M ChangeLog
M js/tbl_gis_visualization.js
Log Message:
-----------
bug #4618 Page scrolls while GIS visualization is zoomed in/out with
mousewheel
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 1607167439863f18561eb58462a24687386a72b9
https://github.com/phpmyadmin/phpmyadmin/commit/1607167439863f18561eb58462a24687386a72b9
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: e07d92920b61aa552c2deddd4ac6d38f800d818b
https://github.com/phpmyadmin/phpmyadmin/commit/e07d92920b61aa552c2deddd4ac6d38f800d818b
Author: Igor <v...@yahoo.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M po/uk.po
Log Message:
-----------
Translated using Weblate (Ukrainian)
Currently translated at 91.0% (2712 of 2978 strings)
[CI skip]
Commit: 23507189d5a816e76b9fdcfd92bc4c405865f65e
https://github.com/phpmyadmin/phpmyadmin/commit/23507189d5a816e76b9fdcfd92bc4c405865f65e
Author: Weblate <nore...@weblate.org>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M ChangeLog
M js/tbl_gis_visualization.js
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 573f85f1bffb7094275874d853d452212383b002
https://github.com/phpmyadmin/phpmyadmin/commit/573f85f1bffb7094275874d853d452212383b002
Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M ChangeLog
M libraries/OutputBuffering.class.php
Log Message:
-----------
Fix bug-4613 HHVM: method ob_gzhandler not found
Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Commit: b900a521de58d56d9038d83357c4ca02ef61d8f0
https://github.com/phpmyadmin/phpmyadmin/commit/b900a521de58d56d9038d83357c4ca02ef61d8f0
Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M libraries/OutputBuffering.class.php
Log Message:
-----------
use function_exists for checking function existence
Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Commit: be806c398ce1d07233e59491a966e8ec025f3139
https://github.com/phpmyadmin/phpmyadmin/commit/be806c398ce1d07233e59491a966e8ec025f3139
Author: Igor <v...@yahoo.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M po/uk.po
Log Message:
-----------
Translated using Weblate (Ukrainian)
Currently translated at 91.3% (2720 of 2978 strings)
[CI skip]
Commit: 2741f8be038c34b2bebc3f63beb9668fd784fb43
https://github.com/phpmyadmin/phpmyadmin/commit/2741f8be038c34b2bebc3f63beb9668fd784fb43
Author: Weblate <nore...@weblate.org>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M libraries/OutputBuffering.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 71f5737c5b13a134ea16da29f99aa9716f2a2ee5
https://github.com/phpmyadmin/phpmyadmin/commit/71f5737c5b13a134ea16da29f99aa9716f2a2ee5
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
4.3.0 release
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 59b500337f291a43b31191bd1c88c89cda247dbb
https://github.com/phpmyadmin/phpmyadmin/commit/59b500337f291a43b31191bd1c88c89cda247dbb
Author: Domen <mite...@outlook.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
Changed paths:
M po/sl.po
Log Message:
-----------
Translated using Weblate (Slovenian)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: 603498a6fc9b72d3e23193d53e64950407f03d21
https://github.com/phpmyadmin/phpmyadmin/commit/603498a6fc9b72d3e23193d53e64950407f03d21
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M import.php
M js/sql.js
M libraries/Menu.class.php
M libraries/sql.lib.php
Log Message:
-----------
Fix #4593 Manual SELECT doesn't change active table
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: fc2498361bf81b08075f9ee37c24e7636390e189
https://github.com/phpmyadmin/phpmyadmin/commit/fc2498361bf81b08075f9ee37c24e7636390e189
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M test/classes/PMA_Menu_test.php
Log Message:
-----------
Add unit test for PMA_Menu::setTable().
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: f5af9d71230d2eb22cf85192a2031b66e11fe28b
https://github.com/phpmyadmin/phpmyadmin/commit/f5af9d71230d2eb22cf85192a2031b66e11fe28b
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M test/classes/PMA_Menu_test.php
Log Message:
-----------
Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 3f16b312e1ff77feefb744f0f808cf3a64e8c28c
https://github.com/phpmyadmin/phpmyadmin/commit/3f16b312e1ff77feefb744f0f808cf3a64e8c28c
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M test/classes/PMA_Menu_test.php
Log Message:
-----------
Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 35c4dbcaa1737c563288fc4234e1ad109829236a
https://github.com/phpmyadmin/phpmyadmin/commit/35c4dbcaa1737c563288fc4234e1ad109829236a
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M js/sql.js
Log Message:
-----------
Fix #4593 Refresh navigation tree on manual select into SQL tab.
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 5d911e902d73959870889d86f763c09c68122a1a
https://github.com/phpmyadmin/phpmyadmin/commit/5d911e902d73959870889d86f763c09c68122a1a
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M test/classes/PMA_Menu_test.php
Log Message:
-----------
Fix unit test.
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 732904f0f297b1f983b6b205472add8ea55bd771
https://github.com/phpmyadmin/phpmyadmin/commit/732904f0f297b1f983b6b205472add8ea55bd771
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M import.php
M js/sql.js
M libraries/Menu.class.php
M libraries/sql.lib.php
M test/classes/PMA_Menu_test.php
Log Message:
-----------
Merge pull request #1416 from Tithugues/b4593_qa43
Fix #4593 Manual SELECT doesn't change active table
Commit: f8c2658a042da43f777f89a23324782c7297ca7d
https://github.com/phpmyadmin/phpmyadmin/commit/f8c2658a042da43f777f89a23324782c7297ca7d
Author: Aputsiaĸ Niels Janussen <a...@isit.gl>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 98.0% (2921 of 2978 strings)
[CI skip]
Commit: 96c0b6d5b9339e66c13f328b7861e9161da5b1d3
https://github.com/phpmyadmin/phpmyadmin/commit/96c0b6d5b9339e66c13f328b7861e9161da5b1d3
Author: Weblate <nore...@weblate.org>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M import.php
M js/sql.js
M libraries/Menu.class.php
M libraries/sql.lib.php
M test/classes/PMA_Menu_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: e435379efdc0ad0ac1d4da4809a01266f18526ab
https://github.com/phpmyadmin/phpmyadmin/commit/e435379efdc0ad0ac1d4da4809a01266f18526ab
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-06 (Sat, 06 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 94a94c05c1494c77930ddfec8cb696b3f99fa178
https://github.com/phpmyadmin/phpmyadmin/commit/94a94c05c1494c77930ddfec8cb696b3f99fa178
Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M test/libraries/PMA_operations_test.php
Log Message:
-----------
fix tests for HHVM
Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Commit: b8e698e22f94bc8c6c1083366d5457e8dcf8b070
https://github.com/phpmyadmin/phpmyadmin/commit/b8e698e22f94bc8c6c1083366d5457e8dcf8b070
Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M .travis.yml
Log Message:
-----------
remove HHVM from allowed failures
Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>
Commit: 551e9a76b1d1a2e5daeacaeefee2363b9ec40b4f
https://github.com/phpmyadmin/phpmyadmin/commit/551e9a76b1d1a2e5daeacaeefee2363b9ec40b4f
Author: Xuan Hung <mr.hun...@gmail.com>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M po/vi.po
Log Message:
-----------
Translated using Weblate (Vietnamese)
Currently translated at 1.6% (49 of 2978 strings)
[CI skip]
Commit: e770763f2b42b1c8761d1eeb32e20f5ff4b9aadc
https://github.com/phpmyadmin/phpmyadmin/commit/e770763f2b42b1c8761d1eeb32e20f5ff4b9aadc
Author: Weblate <nore...@weblate.org>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M .travis.yml
M test/libraries/PMA_operations_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: d9468e3fff383c61fa7ab1649978b161d7ab83ec
https://github.com/phpmyadmin/phpmyadmin/commit/d9468e3fff383c61fa7ab1649978b161d7ab83ec
Author: Robert Scheck <rob...@fedoraproject.org>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message:
-----------
Bug #4623 Incomplete PHP OpenSSL support
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: a8a158e0f0045554b65bacb3e63ff301b65a2d11
https://github.com/phpmyadmin/phpmyadmin/commit/a8a158e0f0045554b65bacb3e63ff301b65a2d11
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: d4c221160a1e2d33df107ac8caf1095baea3ebb9
https://github.com/phpmyadmin/phpmyadmin/commit/d4c221160a1e2d33df107ac8caf1095baea3ebb9
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M libraries/DisplayResults.class.php
Log Message:
-----------
Fix #4619 SELECT LENGTH(`field`) FROM does not sort
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 5b6c0d069362aa8eaec07cfddea796b7c96b27ea
https://github.com/phpmyadmin/phpmyadmin/commit/5b6c0d069362aa8eaec07cfddea796b7c96b27ea
Author: Hugues Peccatte <hugues.pecca...@gmail.com>
Date: 2014-12-07 (Sun, 07 Dec 2014)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>
Commit: 669e8981d7a78c5c02b05237a1ac39111158a9ac
https://github.com/phpmyadmin/phpmyadmin/commit/669e8981d7a78c5c02b05237a1ac39111158a9ac
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M js/multi_column_sort.js
Log Message:
-----------
bug #4626 Ctrl + click on a column not in sort triggers a server call to
erroneous url
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: adceb3af89eaeaede9cfd5c838a72e24a4039b61
https://github.com/phpmyadmin/phpmyadmin/commit/adceb3af89eaeaede9cfd5c838a72e24a4039b61
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M js/multi_column_sort.js
Log Message:
-----------
Show loading message while updating sort
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 775436f70fa805073b69219a22f0d63bccc76feb
https://github.com/phpmyadmin/phpmyadmin/commit/775436f70fa805073b69219a22f0d63bccc76feb
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M libraries/export.lib.php
Log Message:
-----------
bug #4625 "Insufficient space to save the file" on export SQL to file on
server
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 6f1b4fa25953f10b9dde36b186e94f3dea46f2bd
https://github.com/phpmyadmin/phpmyadmin/commit/6f1b4fa25953f10b9dde36b186e94f3dea46f2bd
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M libraries/export.lib.php
Log Message:
-----------
A better fix for bug #4625
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: b69bb373617fd4866deb50bf86ad19e727802a77
https://github.com/phpmyadmin/phpmyadmin/commit/b69bb373617fd4866deb50bf86ad19e727802a77
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
M libraries/vendor_config.php
Log Message:
-----------
bug #4627 "file_get_contents(examples/create_tables.sql): failed to open
stream" after update
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: d475b3444c8a62045eb9acddeb20946dddf873a1
https://github.com/phpmyadmin/phpmyadmin/commit/d475b3444c8a62045eb9acddeb20946dddf873a1
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M js/server_status_sorter.js
M js/server_status_variables.js
M libraries/central_columns.lib.php
M libraries/server_status_queries.lib.php
M libraries/server_status_variables.lib.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
bug #4617 UI issues with sortable tables
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 5233ee8bb109a7da379b50af18932abf4e01b6d0
https://github.com/phpmyadmin/phpmyadmin/commit/5233ee8bb109a7da379b50af18932abf4e01b6d0
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M test/libraries/PMA_server_status_variables_test.php
Log Message:
-----------
Update tests
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 18477cc467378452a618373d141a21b2de8bd340
https://github.com/phpmyadmin/phpmyadmin/commit/18477cc467378452a618373d141a21b2de8bd340
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: aab6b291a91f63efd64bae4ef2b157626715b206
https://github.com/phpmyadmin/phpmyadmin/commit/aab6b291a91f63efd64bae4ef2b157626715b206
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M libraries/export.lib.php
Log Message:
-----------
Add comment explaining why strlen is used in place of mb_strlen
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 2d18ea2d4ca407fcb0c90224e008659950b9bade
https://github.com/phpmyadmin/phpmyadmin/commit/2d18ea2d4ca407fcb0c90224e008659950b9bade
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
Log Message:
-----------
Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 18883863a747256b68f5f37b0520188ebb5733c9
https://github.com/phpmyadmin/phpmyadmin/commit/18883863a747256b68f5f37b0520188ebb5733c9
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.3.1 release
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: a63de67e2f1fd7ba1bbefa069c59ac8502f08dcc
https://github.com/phpmyadmin/phpmyadmin/commit/a63de67e2f1fd7ba1bbefa069c59ac8502f08dcc
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths:
M .travis.yml
M ChangeLog
M README
M db_printview.php
M doc/conf.py
M import.php
M js/ajax.js
M js/db_central_columns.js
M js/error_report.js
M js/multi_column_sort.js
M js/server_status_processes.js
M js/server_status_sorter.js
M js/server_status_variables.js
M js/sql.js
M js/tbl_gis_visualization.js
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/OutputBuffering.class.php
M libraries/central_columns.lib.php
M libraries/common.inc.php
M libraries/export.lib.php
M libraries/insert_edit.lib.php
M libraries/navigation/Nodes/Node.class.php
M libraries/plugins/auth/AuthenticationConfig.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/AuthenticationHttp.class.php
M libraries/relation.lib.php
M libraries/server_status_queries.lib.php
M libraries/server_status_variables.lib.php
M libraries/sql.lib.php
M libraries/vendor_config.php
M po/ca.po
M po/cs.po
M po/da.po
M po/de.po
M po/hu.po
M po/ia.po
M po/pt_BR.po
M po/sl.po
M po/uk.po
M po/vi.po
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Menu_test.php
M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
M test/libraries/PMA_central_columns_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_server_status_variables_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'MAINT_4_3_1' into STABLE
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/39da61c0992f...a63de67e2f1f------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
