May 2013 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 56108f: Merge commit 0e23451efa4f0ac700c2773c996fec969b985...
by Atul Pratap Singh 25 May '13

25 May '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 56108fece28c499ceb735a048fdf74613ced8258 https://github.com/phpmyadmin/phpmyadmin/commit/56108fece28c499ceb735a048fd… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit 0e23451efa4f0ac700c2773c996fec969b985401 Commit: 1647fa300959e54ba5e9d3ea384507e8f4d80794 https://github.com/phpmyadmin/phpmyadmin/commit/1647fa300959e54ba5e9d3ea384… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Show log analyze dialog if timespan width more than zero Commit: faa3d2c24cfc414090c4f4c3901c4723e7b2789e https://github.com/phpmyadmin/phpmyadmin/commit/faa3d2c24cfc414090c4f4c3901… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit e2163b39e9a5d17cab5c1ad4372ae491f08ae1fa Commit: ce3922ab4b2220c08c486d9032129afcc9c760d5 https://github.com/phpmyadmin/phpmyadmin/commit/ce3922ab4b2220c08c486d90321… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Improved tooltip for monitor charts Commit: ffd2826a8bdeee7dd3acb4b28524615489ebc7c6 https://github.com/phpmyadmin/phpmyadmin/commit/ffd2826a8bdeee7dd3acb4b2852… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Log Message: ----------- Merge branch 'QA_4_0' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d3cc2619e2ae...ffd2826a8bde

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b82e10: Translated using Weblate (German)
by Weblate 25 May '13

25 May '13

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b82e109d22c541f57c0644a1dd7c89950b99bcc1 https://github.com/phpmyadmin/phpmyadmin/commit/b82e109d22c541f57c0644a1dd7… Author: Jan Erik Zassenhaus <jan.zassenhaus(a)jgerman.de> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.9% (2600 of 2603) Commit: e7f8a06b32ee97b3c57c69b9a2ab1559152e494c https://github.com/phpmyadmin/phpmyadmin/commit/e7f8a06b32ee97b3c57c69b9a2a… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ce3922ab4b22...e7f8a06b32ee

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 56108f: Merge commit 0e23451efa4f0ac700c2773c996fec969b985...
by Atul Pratap Singh 25 May '13

25 May '13

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 56108fece28c499ceb735a048fdf74613ced8258 https://github.com/phpmyadmin/phpmyadmin/commit/56108fece28c499ceb735a048fd… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit 0e23451efa4f0ac700c2773c996fec969b985401 Commit: 1647fa300959e54ba5e9d3ea384507e8f4d80794 https://github.com/phpmyadmin/phpmyadmin/commit/1647fa300959e54ba5e9d3ea384… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Show log analyze dialog if timespan width more than zero Commit: faa3d2c24cfc414090c4f4c3901c4723e7b2789e https://github.com/phpmyadmin/phpmyadmin/commit/faa3d2c24cfc414090c4f4c3901… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge commit e2163b39e9a5d17cab5c1ad4372ae491f08ae1fa Commit: ce3922ab4b2220c08c486d9032129afcc9c760d5 https://github.com/phpmyadmin/phpmyadmin/commit/ce3922ab4b2220c08c486d90321… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Improved tooltip for monitor charts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ebe2a3181917...ce3922ab4b22

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d3cc26: Translated using Weblate (Slovenian)
by Domen 24 May '13

24 May '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d3cc2619e2ae2e48f1a3e5820d2c7c11da2dd2bb https://github.com/phpmyadmin/phpmyadmin/commit/d3cc2619e2ae2e48f1a3e5820d2… Author: Domen <dbc334(a)gmail.com> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 100.0% (2666 of 2666)

1 0

[Phpmyadmin-git] [phpmyadmin/website] a100f5: Improve wording and mention MariaDB and Drizzle
by Marc Delisle 24 May '13

24 May '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: a100f598671a09bb8f0ef5d85aadbf842ee957af https://github.com/phpmyadmin/website/commit/a100f598671a09bb8f0ef5d85aadbf… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M templates/index.tpl Log Message: ----------- Improve wording and mention MariaDB and Drizzle

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 874f2a: Merge branch 'MAINT_4_0_1' into QA_4_0
by Marc Delisle 24 May '13

24 May '13

Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 874f2a67a226c0f41c55935cee2af5c0109f5ce9 https://github.com/phpmyadmin/phpmyadmin/commit/874f2a67a226c0f41c55935cee2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-10 (Fri, 10 May 2013) Log Message: ----------- Merge branch 'MAINT_4_0_1' into QA_4_0 Commit: 9fa18175fd842dfdf5a8a6643931b2b0ab82e7ae https://github.com/phpmyadmin/phpmyadmin/commit/9fa18175fd842dfdf5a8a664393… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-10 (Fri, 10 May 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.2-dev Commit: 141141af7314a4eefa0ff05b33ed7555baf0bab2 https://github.com/phpmyadmin/phpmyadmin/commit/141141af7314a4eefa0ff05b33e… Author: Jan Erik Zassenhaus <jan.zassenhaus(a)jgerman.de> Date: 2013-05-10 (Fri, 10 May 2013) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 100.0% (2606 of 2607) Commit: 2d9ca2645af72778d4de14679a71ad8cd3cccda9 https://github.com/phpmyadmin/phpmyadmin/commit/2d9ca2645af72778d4de14679a7… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-10 (Fri, 10 May 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 75205f167581fc56ba73703886595c9966dfad5c https://github.com/phpmyadmin/phpmyadmin/commit/75205f167581fc56ba737038865… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-11 (Sat, 11 May 2013) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'MAINT_4_0_1' into QA_4_0 Commit: 4724e4420b8ecf2838f333cf4e34e00b9228a963 https://github.com/phpmyadmin/phpmyadmin/commit/4724e4420b8ecf2838f333cf4e3… Author: Marek J <forusak(a)gmail.com> Date: 2013-05-11 (Sat, 11 May 2013) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 75.4% (1965 of 2607) Commit: c1bb060ee374ced7b9390e5803286443132aa23e https://github.com/phpmyadmin/phpmyadmin/commit/c1bb060ee374ced7b9390e58032… Author: J.M <me(a)mynetx.net> Date: 2013-05-11 (Sat, 11 May 2013) Changed paths: M ChangeLog M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- center loading indicator for navigation refresh, related to bug #3920 Commit: 8fd07ac7cabf440d23359f8c1291eae80c3e6255 https://github.com/phpmyadmin/phpmyadmin/commit/8fd07ac7cabf440d23359f8c129… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-11 (Sat, 11 May 2013) Changed paths: M ChangeLog M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: aeaaa790d47dc6fb20c584046990ff7ebbe0633c https://github.com/phpmyadmin/phpmyadmin/commit/aeaaa790d47dc6fb20c58404699… Author: J.M <me(a)mynetx.net> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M ChangeLog M libraries/navigation/NavigationTree.class.php Log Message: ----------- fix bug #3925 Table sorting in navigation panel is case-sensitive Commit: 9a12fb70e4e27163a4f6e4e5ab5ccb922a456421 https://github.com/phpmyadmin/phpmyadmin/commit/9a12fb70e4e27163a4f6e4e5ab5… Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 100.0% (2607 of 2607) Commit: 1977e02d230be34c21642af8b5e2a9ff651924d4 https://github.com/phpmyadmin/phpmyadmin/commit/1977e02d230be34c21642af8b5e… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M ChangeLog M libraries/navigation/NavigationTree.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 4113d9e98b9b46cb440e4c928c92719f0e090c58 https://github.com/phpmyadmin/phpmyadmin/commit/4113d9e98b9b46cb440e4c928c9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M ChangeLog M export.php M libraries/plugins/import/ImportCsv.class.php Log Message: ----------- bug #3915 Import of CSV file (Replace table data with file) with duplicate values Commit: db6af26e474101857756904a94890db6c4ca3f8c https://github.com/phpmyadmin/phpmyadmin/commit/db6af26e474101857756904a948… Author: ayusun <ayush.choubey(a)gmail.com> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M js/tbl_structure.js M libraries/Index.class.php M tbl_structure.php Log Message: ----------- Bug fix 3898-Structure/page not refreshed. Updating Table stats Commit: 839b1a606e5599323bd5ffc31cb1bafc2d824637 https://github.com/phpmyadmin/phpmyadmin/commit/839b1a606e5599323bd5ffc31cb… Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M ChangeLog M libraries/Table.class.php M sql.php Log Message: ----------- Fix bug #3926 View is not updatable Commit: 3caafb302d66af8854c2bd6227f0cff35b2278cd https://github.com/phpmyadmin/phpmyadmin/commit/3caafb302d66af8854c2bd6227f… Author: Chanaka Indrajith <pe.chanaka.ck(a)gmail.com> Date: 2013-05-12 (Sun, 12 May 2013) Changed paths: M ChangeLog M sql.php Log Message: ----------- Fixed #3902: Cannot browse when table name contains keyword 'call' Commit: 529903e0dd9f5585a92118838928afba79c35147 https://github.com/phpmyadmin/phpmyadmin/commit/529903e0dd9f5585a9211883892… Author: J.M <me(a)mynetx.net> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M changelog.php M import.php M index.php M libraries/DBQbe.class.php M libraries/DisplayResults.class.php M libraries/TableSearch.class.php M libraries/config/ConfigFile.class.php M libraries/dbi/dummy.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/operations.lib.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportShp.class.php M libraries/replication_gui.lib.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/sql_query_form.lib.php M libraries/sqlvalidator.class.php M libraries/transformations.lib.php M server_replication.php M server_status_advisor.php M server_status_monitor.php Log Message: ----------- Fix bug #3907 undefined variables, function parameter problems Thanks Rasmus Lerdorf for analyzing! Commit: 76e99e1e88d6be86bb8ce45ef4203728315aa2a5 https://github.com/phpmyadmin/phpmyadmin/commit/76e99e1e88d6be86bb8ce45ef42… Author: J.M <me(a)mynetx.net> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M ChangeLog Log Message: ----------- Add changelog entry for bug #3907 Commit: 2301fd651bca6ea96fce761f077ab300a5a49bb0 https://github.com/phpmyadmin/phpmyadmin/commit/2301fd651bca6ea96fce761f077… Author: J.M <me(a)mynetx.net> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M libraries/php-gettext/gettext.inc Log Message: ----------- Update PHP-gettext to 1.0.11 Commit: 44dd0e8405c326d848e2982b76c23b6248c5edc4 https://github.com/phpmyadmin/phpmyadmin/commit/44dd0e8405c326d848e2982b76c… Author: ayusun <ayush.choubey(a)gmail.com> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M libraries/plugins/export/ExportPhparray.class.php Log Message: ----------- Bug fix 3910. Updated Export plugin to support zero rows Commit: 35f12c9ac741ade2884a253f145e53a535a14ac3 https://github.com/phpmyadmin/phpmyadmin/commit/35f12c9ac741ade2884a253f145… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M js/tbl_structure.js M libraries/Index.class.php M tbl_structure.php Log Message: ----------- Merge pull request #374 from ayusun/bug3898_att2 Bug fix 3898-Structure/page not refreshed. Updating Table stats Commit: 837b79472355f79ab4350faf986ffe4749564513 https://github.com/phpmyadmin/phpmyadmin/commit/837b79472355f79ab4350faf986… Author: Lassi Ruonavaara <lassi(a)ruonavaara.fi> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M po/fi.po Log Message: ----------- Translated using Weblate (Finnish) Currently translated at 70.1% (1827 of 2607) Commit: 48c42179f821aa4853218bc1f651fa0afabeb403 https://github.com/phpmyadmin/phpmyadmin/commit/48c42179f821aa4853218bc1f65… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M js/tbl_structure.js M libraries/Index.class.php M tbl_structure.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 8a4f44f6ebe81b11756fa79c67e2a81ad55a250c https://github.com/phpmyadmin/phpmyadmin/commit/8a4f44f6ebe81b11756fa79c67e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for bug #3898 Structure not refreshed after column drop Commit: a24b4ae33a878424293b2cc0ea4eeb8166641bd8 https://github.com/phpmyadmin/phpmyadmin/commit/a24b4ae33a878424293b2cc0ea4… Author: Kasun Chathuranga <chathuranga.jayaneththi(a)gmail.com> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M libraries/DisplayResults.class.php M libraries/Table.class.php M sql.php M tbl_change.php Log Message: ----------- PMA_Table::analyzeStructure() method to centralize the analysis of the structure of a view/table Commit: d5add05ba598e2c33b7915cc0f3973ac69d8a15f https://github.com/phpmyadmin/phpmyadmin/commit/d5add05ba598e2c33b7915cc0f3… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-13 (Mon, 13 May 2013) Changed paths: M ChangeLog M libraries/DisplayResults.class.php M libraries/Table.class.php M sql.php M tbl_change.php Log Message: ----------- Fix merge conflicts Commit: 22ba2d81479446d1e1b41027c828a420f9a4e136 https://github.com/phpmyadmin/phpmyadmin/commit/22ba2d81479446d1e1b41027c82… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M libraries/Util.class.php M test/libraries/common/PMA_getIcon_test.php Log Message: ----------- Bug #3919 PropertiesIconic not honored fixed (cherry picked from commit 01c57f71ca535e853dbb0c3a3a03cdfc3ea49b6b) Commit: 04ee24ffd933a944d24e15a1e40fcf9517fb11f1 https://github.com/phpmyadmin/phpmyadmin/commit/04ee24ffd933a944d24e15a1e40… Author: Randall Fan <fanrandall(a)gmail.com> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Simplified Chinese) Currently translated at 99.7% (2600 of 2607) Commit: 8473a5f78915f1b25dcdb2c8fc51428744cfb678 https://github.com/phpmyadmin/phpmyadmin/commit/8473a5f78915f1b25dcdb2c8fc5… Author: J.M <me(a)mynetx.net> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog Log Message: ----------- add changelog entry for bug #3919 PropertiesIconic not honored Commit: 159927a74232b94f069e6eab754fa54e43d2bc72 https://github.com/phpmyadmin/phpmyadmin/commit/159927a74232b94f069e6eab754… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog M libraries/Util.class.php M test/libraries/common/PMA_getIcon_test.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: a1c17d7a7aa18b7dee077d07d16e7f8a1fee506a https://github.com/phpmyadmin/phpmyadmin/commit/a1c17d7a7aa18b7dee077d07d16… Author: J.M <me(a)mynetx.net> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog M js/tbl_structure.js M libraries/DisplayResults.class.php M libraries/Index.class.php M libraries/Table.class.php M libraries/Util.class.php M po/fi.po M po/zh_CN.po M sql.php M tbl_change.php M tbl_structure.php M test/libraries/common/PMA_getIcon_test.php Log Message: ----------- Merge branch 'QA_4_0' into bug-3907 Conflicts: ChangeLog Commit: e2ea214267ef6777a2a5334a07f4a27d0f46362d https://github.com/phpmyadmin/phpmyadmin/commit/e2ea214267ef6777a2a5334a07f… Author: J.M <me(a)mynetx.net> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix bug #3930 Databases to choose for specific privileges show up escaped Commit: 3f7bd7f8a759d0ad52b04448c6fbb91e08c2908d https://github.com/phpmyadmin/phpmyadmin/commit/3f7bd7f8a759d0ad52b04448c6f… Author: J.M <me(a)mynetx.net> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Use PEAR standard in PMA_getHtmlForDisplaySelectDbInEditPrivs function name Commit: f8e90174a06300a8504b972a647aea34bbbf3fe1 https://github.com/phpmyadmin/phpmyadmin/commit/f8e90174a06300a8504b972a647… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog M sql.php Log Message: ----------- Merge pull request #375 from Chanaka/QA_4_0 Fixed #3902: Cannot browse when table name contains keyword 'call' Commit: be4f24265bfa494c0f9f30a6098351c6de1867ee https://github.com/phpmyadmin/phpmyadmin/commit/be4f24265bfa494c0f9f30a6098… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M sql.php Log Message: ----------- Fix typo Commit: 25e71b71dab323f8135ea1411d46de956413e054 https://github.com/phpmyadmin/phpmyadmin/commit/25e71b71dab323f8135ea1411d4… Author: ayusun <ayush.choubey(a)gmail.com> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M libraries/plugins/export/ExportPhparray.class.php Log Message: ----------- Bug fix #3910 with updated code indentation Commit: 818e15bfc9dde6add60d087dc541fe68109f399d https://github.com/phpmyadmin/phpmyadmin/commit/818e15bfc9dde6add60d087dc54… Author: ayusun <ayush.choubey(a)gmail.com> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog Log Message: ----------- Updated ChangeLog for bug #3910 Commit: f1df54b99c14f137ba93c35f2da00f10a16e7698 https://github.com/phpmyadmin/phpmyadmin/commit/f1df54b99c14f137ba93c35f2da… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog M libraries/plugins/export/ExportPhparray.class.php Log Message: ----------- Merge pull request #376 from ayusun/bug3910 Bug fix 3910. Updated Export plugin to support zero rows Commit: 84d7995680b0f5c1c00b772ebf8c4057efe42cb8 https://github.com/phpmyadmin/phpmyadmin/commit/84d7995680b0f5c1c00b772ebf8… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog Log Message: ----------- Move ChangeLog entry Commit: 7b819aa6d175f7a581ad6a738de3fb6505d4f072 https://github.com/phpmyadmin/phpmyadmin/commit/7b819aa6d175f7a581ad6a738de… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-14 (Tue, 14 May 2013) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflict Commit: 920d827c37f4aee7dac6479f9f51488ee6fb4c73 https://github.com/phpmyadmin/phpmyadmin/commit/920d827c37f4aee7dac6479f9f5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M ChangeLog M changelog.php M import.php M index.php M libraries/DBQbe.class.php M libraries/DisplayResults.class.php M libraries/TableSearch.class.php M libraries/config/ConfigFile.class.php M libraries/dbi/dummy.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/operations.lib.php M libraries/php-gettext/gettext.inc M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportShp.class.php M libraries/replication_gui.lib.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/sql_query_form.lib.php M libraries/sqlvalidator.class.php M libraries/transformations.lib.php M server_replication.php M server_status_advisor.php M server_status_monitor.php Log Message: ----------- Merge pull request #379 from mynetx/bug-3907 Fix most analysis results discovered in bug 3907 Commit: 50ca35576f0009729309390aed037631691feb09 https://github.com/phpmyadmin/phpmyadmin/commit/50ca35576f0009729309390aed0… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Use live here, fix bug#3936 Commit: 5681279f3473bb6d63ea070d4bd46a286e366fda https://github.com/phpmyadmin/phpmyadmin/commit/5681279f3473bb6d63ea070d4bd… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-15 (Wed, 15 May 2013) Changed paths: M libraries/replication.inc.php Log Message: ----------- Remove dead code Commit: d8b9a0b28caa7e19849f84721a58f76c4b3e161f https://github.com/phpmyadmin/phpmyadmin/commit/d8b9a0b28caa7e19849f84721a5… Author: ayusun <ayush.choubey(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M export.php M libraries/plugins/export/ExportSql.class.php Log Message: ----------- creating database while exporting at database level Commit: a8e5a455f457115bab09a2503ba3395cc034a3d9 https://github.com/phpmyadmin/phpmyadmin/commit/a8e5a455f457115bab09a2503ba… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M libraries/Config.class.php Log Message: ----------- $HTTP_USER_AGENT no longer exists Commit: a6856cec9bd7821bc51a55d3dccde00ca41ef880 https://github.com/phpmyadmin/phpmyadmin/commit/a6856cec9bd7821bc51a55d3dcc… Author: Rytis Slatkevičius <rytis.s(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M po/lt.po Log Message: ----------- Translated using Weblate (Lithuanian) Currently translated at 67.7% (1764 of 2607) Commit: adb236894a37d1909a9f046432db487694fce9bb https://github.com/phpmyadmin/phpmyadmin/commit/adb236894a37d1909a9f046432d… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M libraries/Config.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 435dc9c74ae4accee927a2e571716aea80fd5a6c https://github.com/phpmyadmin/phpmyadmin/commit/435dc9c74ae4accee927a2e5717… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M sql.php Log Message: ----------- left while fixing bug#3936 Commit: 1be72f7f78ca5c9c5799460b54ae2decd6d51272 https://github.com/phpmyadmin/phpmyadmin/commit/1be72f7f78ca5c9c5799460b54a… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M libraries/Config.class.php M libraries/replication.inc.php M po/lt.po Log Message: ----------- Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 Commit: c26572b491bf6c5f4343e4b9c0fca4921f143c67 https://github.com/phpmyadmin/phpmyadmin/commit/c26572b491bf6c5f4343e4b9c0f… Author: Yungu Kim <crimsonpi(a)gmail.com> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 63.8% (1662 of 2605) Commit: 44422eb4d2f2a11b187b22824ec184d4eac2d7d5 https://github.com/phpmyadmin/phpmyadmin/commit/44422eb4d2f2a11b187b22824ec… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-16 (Thu, 16 May 2013) Changed paths: M sql.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 25237088c9422851ef169233dc0d197c52491a22 https://github.com/phpmyadmin/phpmyadmin/commit/25237088c9422851ef169233dc0… Author: Yungu Kim <crimsonpi(a)gmail.com> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 64.5% (1679 of 2605) Commit: 9b61212b4818e2760e48b63d32e5808409808bad https://github.com/phpmyadmin/phpmyadmin/commit/9b61212b4818e2760e48b63d32e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php Log Message: ----------- bug #3946 Missing CSV import option "Do not abort on INSERT error" Commit: 47813fb8dd8b9dfec1b2a70f84686cccd9597fc6 https://github.com/phpmyadmin/phpmyadmin/commit/47813fb8dd8b9dfec1b2a70f846… Author: Andrea Falco <fox91fox(a)gmail.com> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M po/it.po Log Message: ----------- Translated using Weblate (Italian) Currently translated at 93.6% (2439 of 2607) Commit: 04d8928137a840e5a27c5d8d9e0771f3530399af https://github.com/phpmyadmin/phpmyadmin/commit/04d8928137a840e5a27c5d8d9e0… Author: Andrew Choi <andrew(a)tophk.net> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Traditional Chinese) Currently translated at 78.7% (2051 of 2607) Commit: cc5c41722d21d1b9ccc4581339ab72901d7604e2 https://github.com/phpmyadmin/phpmyadmin/commit/cc5c41722d21d1b9ccc4581339a… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 77960d193c5f17ae7a4336f7e256b2432eb47839 https://github.com/phpmyadmin/phpmyadmin/commit/77960d193c5f17ae7a4336f7e25… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-19 (Sun, 19 May 2013) Changed paths: M ChangeLog M libraries/operations.lib.php Log Message: ----------- bug #3943 Missing Operations>Table options>AUTO_INCREMENT Commit: 6713c0b3320d40ad785941e92f1d8aa296381701 https://github.com/phpmyadmin/phpmyadmin/commit/6713c0b3320d40ad785941e92f1… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M js/tbl_structure.js Log Message: ----------- Bug #3947 Missing Sql Query after modify structure fixed Commit: e72f1a0daa4f20511b581a90587a55fdec203c24 https://github.com/phpmyadmin/phpmyadmin/commit/e72f1a0daa4f20511b581a90587… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M export.php M libraries/plugins/export/ExportSql.class.php Log Message: ----------- Merge pull request #395 from ayusun/exportsqlupdate creating database while exporting at database level Commit: a13b1f41f563f1a12fbcdcc2c4ec9906e90100c3 https://github.com/phpmyadmin/phpmyadmin/commit/a13b1f41f563f1a12fbcdcc2c4e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for Missing CREATE DATABASE statement when exporting at database level Commit: b3e6f8cee775a20c10ceeaa3302beb7ec5564744 https://github.com/phpmyadmin/phpmyadmin/commit/b3e6f8cee775a20c10ceeaa3302… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php Log Message: ----------- bug #3924 Show warning when CSV file does not contain data for all columns Commit: 84f54d596bb9c4374821c14a10aa486f579923a3 https://github.com/phpmyadmin/phpmyadmin/commit/84f54d596bb9c4374821c14a10a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M js/tbl_structure.js Log Message: ----------- Merge pull request #396 from scnakandala/QA_4_0 Bug #3947 Missing Sql Query after modify structure fixed Commit: 9c6632441d936ab28e9ce81c6882604973484351 https://github.com/phpmyadmin/phpmyadmin/commit/9c6632441d936ab28e9ce81c688… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for bug #3947 Missing Sql Query after modify structure Commit: b7508e237b6f9f4df6e0db4ca425d75639375e08 https://github.com/phpmyadmin/phpmyadmin/commit/b7508e237b6f9f4df6e0db4ca42… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M libraries/List_Database.class.php M test/classes/PMA_List_Database_test.php Log Message: ----------- Dead code Commit: 19d1efd90bb50e9d19602ae52d2ebe982e7df56a https://github.com/phpmyadmin/phpmyadmin/commit/19d1efd90bb50e9d19602ae52d2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M libraries/List_Database.class.php Log Message: ----------- Dead code Commit: b5dd9e2d040e6b767aeeebd9ae2b5b998db34e32 https://github.com/phpmyadmin/phpmyadmin/commit/b5dd9e2d040e6b767aeeebd9ae2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M libraries/List_Database.class.php M test/classes/PMA_List_Database_test.php Log Message: ----------- Dead code Commit: 5a251b8b07ff444f42f83823a90fced86d492d0e https://github.com/phpmyadmin/phpmyadmin/commit/5a251b8b07ff444f42f83823a90… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M libraries/List_Database.class.php M test/classes/PMA_List_Database_test.php Log Message: ----------- Dead code Commit: 6d890c362698ca74b9aa5c928923c5f8aa22267b https://github.com/phpmyadmin/phpmyadmin/commit/6d890c362698ca74b9aa5c92892… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-20 (Mon, 20 May 2013) Changed paths: M ChangeLog M doc/config.rst M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php Log Message: ----------- bug #3917 CountTables directive is deprecated Commit: ef4d9361d13d3d8ff04c29cd4c4b3c60deb7607e https://github.com/phpmyadmin/phpmyadmin/commit/ef4d9361d13d3d8ff04c29cd4c4… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M ChangeLog M db_export.php M export.php M server_export.php Log Message: ----------- bug #3948 Server export problems Commit: 203a406c3e62553aa7a96850bd21b9a4e805f03a https://github.com/phpmyadmin/phpmyadmin/commit/203a406c3e62553aa7a96850bd2… Author: Domen <dbc334(a)gmail.com> Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 100.0% (2607 of 2607) Commit: 7c641c364694f889874605ff7961a0522bfc12da https://github.com/phpmyadmin/phpmyadmin/commit/7c641c364694f889874605ff796… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M ChangeLog M db_export.php M export.php M server_export.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: a638fc863e61def64e8efbe260387b3bcf91a328 https://github.com/phpmyadmin/phpmyadmin/commit/a638fc863e61def64e8efbe2603… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M ChangeLog M doc/config.rst M libraries/List_Database.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M test/classes/PMA_List_Database_test.php Log Message: ----------- Merge commit '6d890c362698ca74b9aa5c928923c5f8aa22267b' into QA_4_0 Conflicts: ChangeLog Commit: dfbe8616b4fbc39d0f2fefabb766fb4b32b30af1 https://github.com/phpmyadmin/phpmyadmin/commit/dfbe8616b4fbc39d0f2fefabb76… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files Commit: 1876ca7c3af45fa9ef0f85b14d9d9f84461f73ae https://github.com/phpmyadmin/phpmyadmin/commit/1876ca7c3af45fa9ef0f85b14d9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-21 (Tue, 21 May 2013) Changed paths: M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.2-rc2 Commit: 2189c875356fc1af21c6da32235bf24f60f53b96 https://github.com/phpmyadmin/phpmyadmin/commit/2189c875356fc1af21c6da32235… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.0.2 release Commit: 77257015cfc1a73fec2e04725dd858f44375b846 https://github.com/phpmyadmin/phpmyadmin/commit/77257015cfc1a73fec2e04725dd… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M ChangeLog M README M changelog.php M db_export.php M doc/conf.py M doc/config.rst M export.php M import.php M index.php M js/functions.js M js/tbl_structure.js M libraries/Config.class.php M libraries/DBQbe.class.php M libraries/DisplayResults.class.php M libraries/Index.class.php M libraries/List_Database.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config/ConfigFile.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/dbi/dummy.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/navigation/NavigationTree.class.php M libraries/operations.lib.php M libraries/php-gettext/gettext.inc M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPhparray.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportLdi.class.php M libraries/plugins/import/ImportShp.class.php M libraries/replication.inc.php M libraries/replication_gui.lib.php M libraries/schema/Visio_Relation_Schema.class.php M libraries/server_privileges.lib.php M libraries/sql_query_form.lib.php M libraries/sqlvalidator.class.php M libraries/transformations.lib.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/zh_CN.po M po/zh_TW.po M server_export.php M server_replication.php M server_status_advisor.php M server_status_monitor.php M sql.php M tbl_change.php M tbl_structure.php M test/classes/PMA_List_Database_test.php M test/libraries/common/PMA_getIcon_test.php M themes/original/css/navigation.css.php M themes/pmahomme/css/navigation.css.php Log Message: ----------- Merge branch 'MAINT_4_0_2' into STABLE Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ec3106e8c0c...77257015cfc1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]
by lem9 24 May '13

24 May '13

Branch: refs/tags/RELEASE_4_0_2 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 75a613: Translated using Weblate (Spanish)
by Weblate 24 May '13

24 May '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 75a6135f3f0ce3f060959c6042785cf489aa3e63 https://github.com/phpmyadmin/phpmyadmin/commit/75a6135f3f0ce3f060959c60427… Author: Matías Bellone <matiasbellone+weblate(a)gmail.com> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 100.0% (2666 of 2666) Commit: 920dd14ae5f5ab1e0540d8dcc37835c734b12cd7 https://github.com/phpmyadmin/phpmyadmin/commit/920dd14ae5f5ab1e0540d8dcc37… Author: Anders Jonsson <jonars03(a)student.umu.se> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 99.4% (2651 of 2666) Commit: a963447f0c64a5629bd8dd2c1ebf508a14ab02f4 https://github.com/phpmyadmin/phpmyadmin/commit/a963447f0c64a5629bd8dd2c1eb… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (2666 of 2666) Commit: 590cb028caf97595628f731e7067f0f764a1df5b https://github.com/phpmyadmin/phpmyadmin/commit/590cb028caf97595628f731e706… Author: Weblate <noreply(a)weblate.org> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M ChangeLog Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3c71a700ec11...590cb028caf9

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dff31f: Translated using Weblate (Spanish)
by Marc Delisle 24 May '13

24 May '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dff31f429d53906544ab9da27b43b45d2e8f309a https://github.com/phpmyadmin/phpmyadmin/commit/dff31f429d53906544ab9da27b4… Author: Matías Bellone <matiasbellone+weblate(a)gmail.com> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 100.0% (2603 of 2603) Commit: ebe2a318191706381dc4a03a8a612944786abfa2 https://github.com/phpmyadmin/phpmyadmin/commit/ebe2a318191706381dc4a03a8a6… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflict Commit: a984f06604d136ef0de460324c6e6f817cdc14d5 https://github.com/phpmyadmin/phpmyadmin/commit/a984f06604d136ef0de460324c6… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Log Message: ----------- Merge commit 'dff31f4' Commit: 3c71a700ec119db4ca6614c9ebd2e43639adf958 https://github.com/phpmyadmin/phpmyadmin/commit/3c71a700ec119db4ca6614c9ebd… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_0' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ecd00dfac633...3c71a700ec11

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ebe2a3: Fix merge conflict
by Marc Delisle 24 May '13

24 May '13

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ebe2a318191706381dc4a03a8a612944786abfa2 https://github.com/phpmyadmin/phpmyadmin/commit/ebe2a318191706381dc4a03a8a6… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-05-24 (Fri, 24 May 2013) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflict

1 0