[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dac317: Bug-4388 Disable database expansion when enabled t...

Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: dac31757cf23d3aa1c2d92ce1ab6f221d2ccb230 https://github.com/phpmyadmin/phpmyadmin/commit/dac31757cf23d3aa1c2d92ce1ab… Author: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Date: 2014-05-09 (Fri, 09 May 2014) Changed paths: M js/navigation.js Log Message: ----------- Bug-4388 Disable database expansion when enabled throws Error 500 Signed-off-by: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Commit: 0d4d696957c2eccc4c6a8b90655d56563ec55585 https://github.com/phpmyadmin/phpmyadmin/commit/0d4d696957c2eccc4c6a8b90655… Author: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Date: 2014-05-10 (Sat, 10 May 2014) Changed paths: M libraries/navigation/NavigationTree.class.php Log Message: ----------- Bug #4392: Cannot see databases in nav panel on databases grouping when disabled database expansion Signed-off-by: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Commit: 6be855a6c6c13f5f0b9c6d1ffa0941e326a7690c https://github.com/phpmyadmin/phpmyadmin/commit/6be855a6c6c13f5f0b9c6d1ffa0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.2-dev Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: f23ae333146feccc8a203e7875640f1915c92743 https://github.com/phpmyadmin/phpmyadmin/commit/f23ae333146feccc8a203e78756… Author: Marcin Kozioł <lord_dark(a)wp.pl> Date: 2014-05-12 (Mon, 12 May 2014) Changed paths: M po/pl.po Log Message: ----------- Translated using Weblate (Polish) Currently translated at 84.6% (2342 of 2768) Commit: 9f9d85c382a78c78d992d4e6edcfdaee414a662c https://github.com/phpmyadmin/phpmyadmin/commit/9f9d85c382a78c78d992d4e6edc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: M ChangeLog Log Message: ----------- 4.2.1 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 00d1d9c2928586b3392e9c661057bfa2c94ffac9 https://github.com/phpmyadmin/phpmyadmin/commit/00d1d9c2928586b3392e9c66105… Author: Erwin Bronkhorst <erwinbronkhorst(a)yahoo.com> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (2768 of 2768) Commit: 1a901987a3e0b3a18e7c92d39e307cd76592b428 https://github.com/phpmyadmin/phpmyadmin/commit/1a901987a3e0b3a18e7c92d39e3… Author: Marcin Kozioł <lord_dark(a)wp.pl> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: M po/pl.po Log Message: ----------- Translated using Weblate (Polish) Currently translated at 94.7% (2624 of 2768) Commit: 06c57c48201bc67e7f6b31e47838bb00ead32558 https://github.com/phpmyadmin/phpmyadmin/commit/06c57c48201bc67e7f6b31e4783… Author: Júlio Sebastião <j38600(a)gmail.com> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: M po/pt.po Log Message: ----------- Translated using Weblate (Portuguese) Currently translated at 63.2% (1751 of 2768) Commit: 78c2022199b28d5cd4ddeca531fc6e8af339f0bc https://github.com/phpmyadmin/phpmyadmin/commit/78c2022199b28d5cd4ddeca531f… Author: Weblate <noreply(a)weblate.org> Date: 2014-05-13 (Tue, 13 May 2014) Changed paths: M ChangeLog Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 3d98d33037963d0b2bf629b0451facf7210945c5 https://github.com/phpmyadmin/phpmyadmin/commit/3d98d33037963d0b2bf629b0451… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M js/navigation.js Log Message: ----------- Merge pull request #1167 from D-storm/bug-4388 Bug-4388 Disable database expansion when enabled throws Error 500 Commit: 3ba9fef03ce13306b2c21f764073161f5a13fc3c https://github.com/phpmyadmin/phpmyadmin/commit/3ba9fef03ce13306b2c21f76407… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M po/nl.po Log Message: ----------- Translated using Weblate (Dutch) Currently translated at 100.0% (2768 of 2768) Commit: 0d4c91ba33675fa94a722c3299e76b93c8d0aae8 https://github.com/phpmyadmin/phpmyadmin/commit/0d4c91ba33675fa94a722c3299e… Author: Weblate <noreply(a)weblate.org> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M js/navigation.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: cf743642a860b01b2561b71e7a0336df864e18f6 https://github.com/phpmyadmin/phpmyadmin/commit/cf743642a860b01b2561b71e7a0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 1deac8fa43e836a134dc2e856583909c491777ef https://github.com/phpmyadmin/phpmyadmin/commit/1deac8fa43e836a134dc2e85658… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-14 (Wed, 14 May 2014) Changed paths: M po/nl.po Log Message: ----------- Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 Commit: aa2c9cd5d60ae1b4e87036ec9579a7af3835bbbc https://github.com/phpmyadmin/phpmyadmin/commit/aa2c9cd5d60ae1b4e87036ec957… Author: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M libraries/structure.lib.php Log Message: ----------- Bug fix #4414 table display of performance_schema DB structure Signed-off-by: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Commit: 7f445f99e362aa97f3ac7f8f0663418f6a2f339d https://github.com/phpmyadmin/phpmyadmin/commit/7f445f99e362aa97f3ac7f8f066… Author: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M libraries/insert_edit.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Bug fix #4411 Protect Binary when set to no in settings still does not allow insert binary data Signed-off-by: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> test case fix Signed-off-by: Chirayu Chiripal <chirayu.chiripal(a)gmail.com> Commit: 95aab308e9d8770db36183ef3ca19692a77df4e4 https://github.com/phpmyadmin/phpmyadmin/commit/95aab308e9d8770db36183ef3ca… Author: Edie Johnny <edie.eu(a)gmail.com> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2768 of 2768) Commit: fcd437cd21a66a6e0e48bbcd2f83733c014b9aee https://github.com/phpmyadmin/phpmyadmin/commit/fcd437cd21a66a6e0e48bbcd2f8… Author: Anders Jonsson <anders.jonsson(a)norsjovallen.se> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 99.9% (2767 of 2768) Commit: 1a3c958f394e1aa214321b3f4a87d52eee65d555 https://github.com/phpmyadmin/phpmyadmin/commit/1a3c958f394e1aa214321b3f4a8… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M js/server_status_monitor.js Log Message: ----------- Add datepicker to monmitor log analyzer Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: ebad795ac51cd7a617b5a5e83f4dab95f82b741c https://github.com/phpmyadmin/phpmyadmin/commit/ebad795ac51cd7a617b5a5e83f4… Author: Weblate <noreply(a)weblate.org> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 1fd2567e2375d7080c5e5b244bca32001b2a577a https://github.com/phpmyadmin/phpmyadmin/commit/1fd2567e2375d7080c5e5b244bc… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M libraries/structure.lib.php Log Message: ----------- Merge remote-tracking branch 'D-storm/Bug-4414' into QA_4_2 Commit: 13654357ffed30087c5ed4e92a840a234fbb5faa https://github.com/phpmyadmin/phpmyadmin/commit/13654357ffed30087c5ed4e92a8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-15 (Thu, 15 May 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: fa1a290948d85fbb10b1be0a6d9a1821cfc1e484 https://github.com/phpmyadmin/phpmyadmin/commit/fa1a290948d85fbb10b1be0a6d9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M libraries/insert_edit.lib.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Merge pull request #1183 from D-storm/bug-4411 Bug fix #4411 : Fixed ProtectBinary behaviour on insert operation Commit: 453178b9cda3d2a9fa5d9b5d7752df728004a485 https://github.com/phpmyadmin/phpmyadmin/commit/453178b9cda3d2a9fa5d9b5d775… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 0dbbab8fdcf2140429f01684579bcb91025e164f https://github.com/phpmyadmin/phpmyadmin/commit/0dbbab8fdcf2140429f01684579… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M libraries/navigation/NavigationTree.class.php Log Message: ----------- Merge pull request #1169 from D-storm/bug-4392 Bug #4392: Cannot see databases in nav panel on databases grouping when ... Commit: 0ee881da71a210fda2459417a85d605f4e73ae6b https://github.com/phpmyadmin/phpmyadmin/commit/0ee881da71a210fda2459417a85… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M ChangeLog M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M test/classes/plugin/transformations/Image_Link_test.php Log Message: ----------- bug #4395 BLOB link transformation is broken Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: e2817dfdfd89bdf5af33ee5cce00f060c122b773 https://github.com/phpmyadmin/phpmyadmin/commit/e2817dfdfd89bdf5af33ee5cce0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M libraries/navigation/NavigationTree.class.php Log Message: ----------- Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 Commit: 99dca5d7a6e4e9a9037013ff7443a3e75e2fb02e https://github.com/phpmyadmin/phpmyadmin/commit/99dca5d7a6e4e9a9037013ff744… Author: Petr Tomášek <tomy(a)tomy.cz> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M libraries/navigation/Nodes/Node_Database_Container.class.php Log Message: ----------- Respect ['ShowCreateDb'] in the navi panel Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 52cf4a6491d1376b7facfbc7ab6e7f8baf79510a https://github.com/phpmyadmin/phpmyadmin/commit/52cf4a6491d1376b7facfbc7ab6… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-16 (Fri, 16 May 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: a0397557fc17777eb1126a7f20fc108365749f47 https://github.com/phpmyadmin/phpmyadmin/commit/a0397557fc17777eb1126a7f20f… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-05-17 (Sat, 17 May 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: a0140e7aae1f3c2ad409a4462f45df91f9f56de2 https://github.com/phpmyadmin/phpmyadmin/commit/a0140e7aae1f3c2ad409a4462f4… Author: Sorawee Porncharoenwase <nullzero.free(a)gmail.com> Date: 2014-05-17 (Sat, 17 May 2014) Changed paths: M po/th.po Log Message: ----------- Translated using Weblate (Thai) Currently translated at 38.6% (1069 of 2768) Commit: 41c8f76eeb568f61a5eef5592d0b3d4348466247 https://github.com/phpmyadmin/phpmyadmin/commit/41c8f76eeb568f61a5eef5592d0… Author: Weblate <noreply(a)weblate.org> Date: 2014-05-17 (Sat, 17 May 2014) Changed paths: M ChangeLog Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 2986cdcd8ad182b9072824b19998f507b4e871d7 https://github.com/phpmyadmin/phpmyadmin/commit/2986cdcd8ad182b9072824b1999… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-17 (Sat, 17 May 2014) Changed paths: M ChangeLog M libraries/TableSearch.class.php Log Message: ----------- bug #4419 No more calendar into search tab Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 33343fbdf489043286b2413803d63b1298ebb20f https://github.com/phpmyadmin/phpmyadmin/commit/33343fbdf489043286b2413803d… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/server_status_monitor.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- bug #4398 Monitor should fit into screen width Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 117490393a533fe29e9bc73ca23a0d99e700b472 https://github.com/phpmyadmin/phpmyadmin/commit/117490393a533fe29e9bc73ca23… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/TableSearch.class.php M libraries/insert_edit.lib.php M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database_Container.class.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M libraries/structure.lib.php M po/pt_BR.po M po/sv.po M po/th.po M test/classes/plugin/transformations/Image_Link_test.php M test/libraries/PMA_insert_edit_test.php Log Message: ----------- Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 Conflicts: ChangeLog Commit: 47399d82fdfed347820362fd67c233e3318a0c2f https://github.com/phpmyadmin/phpmyadmin/commit/47399d82fdfed347820362fd67c… Author: Rahoz Yaseen <rahoz.kirkuky(a)hotmail.com> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M po/ckb.po Log Message: ----------- Translated using Weblate (Kurdish Sorani) Currently translated at 17.9% (496 of 2768) Commit: ec9f73c4b5ce8b77ef52e94ec7ccf6ebda32d07d https://github.com/phpmyadmin/phpmyadmin/commit/ec9f73c4b5ce8b77ef52e94ec7c… Author: Weblate <noreply(a)weblate.org> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/server_status_monitor.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: e813cab608d86b689cac37e548a844295dae99bd https://github.com/phpmyadmin/phpmyadmin/commit/e813cab608d86b689cac37e548a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M ChangeLog M libraries/Table.class.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.class.php Log Message: ----------- bug #4418 When copying databases, primary key attributes get lost Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 0780e97f3b7821999fa69647125deb6a5758f3e9 https://github.com/phpmyadmin/phpmyadmin/commit/0780e97f3b7821999fa69647125… Author: Yungu Kim <crimsonpi(a)gmail.com> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 81.1% (2247 of 2768) Commit: a941632ad88375541ffbbc25b2076fe13e6629f8 https://github.com/phpmyadmin/phpmyadmin/commit/a941632ad88375541ffbbc25b20… Author: Weblate <noreply(a)weblate.org> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M ChangeLog M libraries/Table.class.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: 17b085148c1688c5e96007c0608c4c59e46e13db https://github.com/phpmyadmin/phpmyadmin/commit/17b085148c1688c5e96007c0608… Author: Todd Crane <todd.crane(a)n5tech.com> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M js/messages.php Log Message: ----------- bug #4421 empty maxInputVars on js/messages.php Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 67901f390e43efe968f03e035d5ab53c34f0faa4 https://github.com/phpmyadmin/phpmyadmin/commit/67901f390e43efe968f03e035d5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-18 (Sun, 18 May 2014) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 486dd3b4e3053ae8063f8c92f2ed7dc008fcf81b https://github.com/phpmyadmin/phpmyadmin/commit/486dd3b4e3053ae8063f8c92f2e… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/server_status_monitor.lib.php Log Message: ----------- Monitor: Check for possibly undefined memory usage values Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: b3dbec11072c92fe2b1fe9605ae9bb4c9e27657b https://github.com/phpmyadmin/phpmyadmin/commit/b3dbec11072c92fe2b1fe9605ae… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Advisor: Check for possibly undefined memory usage values Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 8838d586660cb36080372507c68c97b8ba21102c https://github.com/phpmyadmin/phpmyadmin/commit/8838d586660cb36080372507c68… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Advisor.class.php Log Message: ----------- Advisor class: Drop unnecessary initialization Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 6743e78ea48d3b056e713e3437cd58d2f253e41c https://github.com/phpmyadmin/phpmyadmin/commit/6743e78ea48d3b056e713e3437c… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M import.php M libraries/bookmark.lib.php M libraries/sql.lib.php M test/libraries/PMA_bookmark_test.php Log Message: ----------- PMA_Bookmark_delete: Drop unnecessary $db param Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: ec5292fb313467a203b9da0e6d0f920d57dc8a70 https://github.com/phpmyadmin/phpmyadmin/commit/ec5292fb313467a203b9da0e6d0… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Config.class.php Log Message: ----------- Config class: Drop dead initializations Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 5cab1dfbf2e1d9907c0b51cb4705423343a70e9e https://github.com/phpmyadmin/phpmyadmin/commit/5cab1dfbf2e1d9907c0b51cb470… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/SavedSearches.class.php Log Message: ----------- Add string check for json_decode in SavedSearches::setCriterias Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 69ddb299890f75879cbc0763f4d8b5220b782e90 https://github.com/phpmyadmin/phpmyadmin/commit/69ddb299890f75879cbc0763f4d… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/DBQbe.class.php M libraries/DbSearch.class.php M libraries/DisplayResults.class.php M libraries/build_html_for_db.lib.php M libraries/core.lib.php M libraries/gis/GIS_Linestring.class.php M libraries/gis/GIS_Multilinestring.class.php M libraries/gis/GIS_Multipoint.class.php M libraries/gis/GIS_Multipolygon.class.php M libraries/gis/GIS_Point.class.php M libraries/gis/GIS_Polygon.class.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: d9bd81a2a199812b3743c567472e4ef34793f673 https://github.com/phpmyadmin/phpmyadmin/commit/d9bd81a2a199812b3743c567472… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/insert_edit.lib.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportYaml.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/pmd_common.php M libraries/relation.lib.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 9207203a5663cf2aaab007b484e5c2e7bb6372f2 https://github.com/phpmyadmin/phpmyadmin/commit/9207203a5663cf2aaab007b484e… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Scripts.class.php M libraries/TableSearch.class.php M libraries/replication_gui.lib.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/server_status.lib.php M libraries/sqlparser.lib.php M libraries/structure.lib.php M libraries/sysinfo.lib.php M libraries/tbl_columns_definition_form.lib.php M libraries/tbl_relation.lib.php Log Message: ----------- Code style fixes Signed-off-by: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Commit: 7937cbde62f287edb22715d2c6124a4783ca51ef https://github.com/phpmyadmin/phpmyadmin/commit/7937cbde62f287edb22715d2c61… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Table.class.php Log Message: ----------- Complete the fix for bug #4418 Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: fda047361d81f73d1488b028e00c70fa9bf689b9 https://github.com/phpmyadmin/phpmyadmin/commit/fda047361d81f73d1488b028e00… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M libraries/relation.lib.php Log Message: ----------- Fix notice Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 7979f6b28eb83b5c280ac25da08a7806dc6b7df3 https://github.com/phpmyadmin/phpmyadmin/commit/7979f6b28eb83b5c280ac25da08… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.2 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 5d09e427e12dc66771ec607f1d3f51efb91b74e6 https://github.com/phpmyadmin/phpmyadmin/commit/5d09e427e12dc66771ec607f1d3… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-05-20 (Tue, 20 May 2014) Changed paths: M ChangeLog M README M doc/conf.py M import.php M js/messages.php M js/navigation.js M js/server_status_monitor.js M libraries/Advisor.class.php M libraries/Config.class.php M libraries/DBQbe.class.php M libraries/DbSearch.class.php M libraries/DisplayResults.class.php M libraries/SavedSearches.class.php M libraries/Scripts.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/bookmark.lib.php M libraries/build_html_for_db.lib.php M libraries/core.lib.php M libraries/gis/GIS_Linestring.class.php M libraries/gis/GIS_Multilinestring.class.php M libraries/gis/GIS_Multipoint.class.php M libraries/gis/GIS_Multipolygon.class.php M libraries/gis/GIS_Point.class.php M libraries/gis/GIS_Polygon.class.php M libraries/insert_edit.lib.php M libraries/navigation/NavigationTree.class.php M libraries/navigation/Nodes/Node_Database_Container.class.php M libraries/operations.lib.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportYaml.class.php M libraries/plugins/export/PMA_ExportPdf.class.php M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/replication_gui.lib.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/server_status.lib.php M libraries/server_status_monitor.lib.php M libraries/sql.lib.php M libraries/sqlparser.lib.php M libraries/structure.lib.php M libraries/sysinfo.lib.php M libraries/tbl_columns_definition_form.lib.php M libraries/tbl_relation.lib.php M po/ckb.po M po/ko.po M po/nl.po M po/pl.po M po/pt.po M po/pt_BR.po M po/sv.po M po/th.po M test/classes/plugin/transformations/Image_Link_test.php M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_insert_edit_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'MAINT_4_2_2' into STABLE Compare: https://github.com/phpmyadmin/phpmyadmin/compare/de89fca0cdce...5d09e427e12d