[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 821a13: Merge branch 'MAINT_4_0_4' into QA_4_0
Marc Delisle
marc at infomarc.info
Sun Aug 4 12:40:58 CEST 2013
Branch: refs/heads/STABLE
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 821a1373d7238f69018bec3d426ba5a73f159945
https://github.com/phpmyadmin/phpmyadmin/commit/821a1373d7238f69018bec3d426ba5a73f159945
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_4' into QA_4_0
Commit: 18b7f4e4d0deb26092c38e938728f98372ada4c4
https://github.com/phpmyadmin/phpmyadmin/commit/18b7f4e4d0deb26092c38e938728f98372ada4c4
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.0.5-dev
Commit: 6036015aa13564fb814eb5517c36729239128969
https://github.com/phpmyadmin/phpmyadmin/commit/6036015aa13564fb814eb5517c36729239128969
Author: Dadan Setia <da2n_s at yahoo.co.id>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M po/id.po
Log Message:
-----------
Translated using Weblate (Indonesian)
Currently translated at 75.6% (1967 of 2603)
Commit: 4243b56ad3d66c51441094a2418fec8a46fbd447
https://github.com/phpmyadmin/phpmyadmin/commit/4243b56ad3d66c51441094a2418fec8a46fbd447
Author: Muhammad Kamran <kamran.usman at gmail.com>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M po/ur.po
Log Message:
-----------
Translated using Weblate (Urdu)
Currently translated at 25.3% (659 of 2603)
Commit: 96f0c2c52fef735cd128f22539be4b77adc7f479
https://github.com/phpmyadmin/phpmyadmin/commit/96f0c2c52fef735cd128f22539be4b77adc7f479
Author: Weblate <noreply at weblate.org>
Date: 2013-06-13 (Thu, 13 Jun 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: 0717e360179312f98442219c6ce9474f116a614a
https://github.com/phpmyadmin/phpmyadmin/commit/0717e360179312f98442219c6ce9474f116a614a
Author: Aputsiaq Niels Janussen <aj at isit.gl>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 100.0% (2603 of 2603)
Commit: c6d568d4f3fa48e22a6be22430008deaeaef0372
https://github.com/phpmyadmin/phpmyadmin/commit/c6d568d4f3fa48e22a6be22430008deaeaef0372
Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M ChangeLog
M libraries/RecentTable.class.php
Log Message:
-----------
Fix bug 3977 - Not detected configuration storage
Commit: bee8d2f00d54e759f584544830dba416c5db4e6d
https://github.com/phpmyadmin/phpmyadmin/commit/bee8d2f00d54e759f584544830dba416c5db4e6d
Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M ChangeLog
M js/navigation.js
Log Message:
-----------
Fix bug 3970 - Pressing enter in the filter field reloads page
Commit: ce102b976359dd49fcf16c43513716536fbb3ae2
https://github.com/phpmyadmin/phpmyadmin/commit/ce102b976359dd49fcf16c43513716536fbb3ae2
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M ChangeLog
M libraries/RecentTable.class.php
Log Message:
-----------
Merge pull request #427 from kasunchathuranga/Bug3977
Fix bug 3977 - Not detected configuration storage
Commit: 4d7a77b8df345407005477e98f4a642c24159cf6
https://github.com/phpmyadmin/phpmyadmin/commit/4d7a77b8df345407005477e98f4a642c24159cf6
Author: Aputsiaq Niels Janussen <aj at isit.gl>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 100.0% (2603 of 2603)
Commit: 9ce33efe496a0aea8f2101b037d6b5fbf640c81d
https://github.com/phpmyadmin/phpmyadmin/commit/9ce33efe496a0aea8f2101b037d6b5fbf640c81d
Author: Weblate <noreply at weblate.org>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M ChangeLog
M libraries/RecentTable.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 61df52ccdd5a1114784f4bbc1e0706772adcea4f
https://github.com/phpmyadmin/phpmyadmin/commit/61df52ccdd5a1114784f4bbc1e0706772adcea4f
Author: Kasun Chathuranga <chathuranga.jayaneththi at gmail.com>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M ChangeLog
M libraries/RecentTable.class.php
M po/da.po
Log Message:
-----------
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into Bug3970
Conflicts:
ChangeLog
Commit: e3f0dcc423ed53eb928cc48e9b40bd5f4c4712b6
https://github.com/phpmyadmin/phpmyadmin/commit/e3f0dcc423ed53eb928cc48e9b40bd5f4c4712b6
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M ChangeLog
M js/navigation.js
Log Message:
-----------
Merge pull request #424 from kasunchathuranga/Bug3970
Fix bug 3970 - Pressing enter in the filter field reloads page
Commit: 178f83f9159dd0ff79464a35905023fe3d508097
https://github.com/phpmyadmin/phpmyadmin/commit/178f83f9159dd0ff79464a35905023fe3d508097
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M ChangeLog
M libraries/Util.class.php
Log Message:
-----------
bug #3984 Cannot insert in this table (PHP < 5.4)
Commit: ccaea8d0a7e3adbbc563a2f9dad68b36aa58c28b
https://github.com/phpmyadmin/phpmyadmin/commit/ccaea8d0a7e3adbbc563a2f9dad68b36aa58c28b
Author: Bilal Ćatić <bilal.the.best at hotmail.com>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M po/bs.po
Log Message:
-----------
Translated using Weblate (Bosnian)
Currently translated at 18.7% (487 of 2603)
Commit: 3d1d73d5fa4e00129c53fcd8c8ace245fe7ccb1c
https://github.com/phpmyadmin/phpmyadmin/commit/3d1d73d5fa4e00129c53fcd8c8ace245fe7ccb1c
Author: Tae-rok Hwang <hwangti at hwangti.kr>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M po/ko.po
Log Message:
-----------
Translated using Weblate (Korean)
Currently translated at 69.7% (1813 of 2603)
Commit: 8944a21c350a03fddc43e6af560a8ad9e510db39
https://github.com/phpmyadmin/phpmyadmin/commit/8944a21c350a03fddc43e6af560a8ad9e510db39
Author: Weblate <noreply at weblate.org>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M ChangeLog
M libraries/Util.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 8e16352b52bef3b8f66a066b5fa26055e9270ade
https://github.com/phpmyadmin/phpmyadmin/commit/8e16352b52bef3b8f66a066b5fa26055e9270ade
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M po/bs.po
Log Message:
-----------
Translated using Weblate (Bosnian)
Currently translated at 18.7% (486 of 2603)
Commit: 5f3960680ee4458f4b476260a61f9c0ea61db62c
https://github.com/phpmyadmin/phpmyadmin/commit/5f3960680ee4458f4b476260a61f9c0ea61db62c
Author: Ádám Papp-Kuster <pkadam at kuster.hu>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 79.2% (2062 of 2603)
Commit: d28fbdcf92824bc9389ee7c1faa674559ed3340b
https://github.com/phpmyadmin/phpmyadmin/commit/d28fbdcf92824bc9389ee7c1faa674559ed3340b
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_4' into QA_4_0
Commit: 5e9a436e3921002caff8f66d32c8185d17fbc00e
https://github.com/phpmyadmin/phpmyadmin/commit/5e9a436e3921002caff8f66d32c8185d17fbc00e
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-17 (Mon, 17 Jun 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
4.0.4 release date
Commit: 228a9b8421ffb3fe1b5f2a0943f0c57613664038
https://github.com/phpmyadmin/phpmyadmin/commit/228a9b8421ffb3fe1b5f2a0943f0c57613664038
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 85.4% (2224 of 2603)
Commit: 192c96047fbd6de88edfc81e7c5d5b9b576b9c7f
https://github.com/phpmyadmin/phpmyadmin/commit/192c96047fbd6de88edfc81e7c5d5b9b576b9c7f
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 85.4% (2224 of 2603)
Commit: b6fe8177071af936b21aae76461ca0796aa75173
https://github.com/phpmyadmin/phpmyadmin/commit/b6fe8177071af936b21aae76461ca0796aa75173
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Fix translation
Commit: f0dafa6c6bf56b2fc96eff993e231b36c232acbd
https://github.com/phpmyadmin/phpmyadmin/commit/f0dafa6c6bf56b2fc96eff993e231b36c232acbd
Author: Yungu Kim <crimsonpi at gmail.com>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/ko.po
Log Message:
-----------
Translated using Weblate (Korean)
Currently translated at 69.7% (1813 of 2603)
Commit: ac901d86c4f2ecef21a8e1a4554520e98f5b279d
https://github.com/phpmyadmin/phpmyadmin/commit/ac901d86c4f2ecef21a8e1a4554520e98f5b279d
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 85.6% (2227 of 2603)
Commit: 024bd979a8889a06cd8510774dc3ea58cae6c1de
https://github.com/phpmyadmin/phpmyadmin/commit/024bd979a8889a06cd8510774dc3ea58cae6c1de
Author: Weblate <noreply at weblate.org>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 90acaecf44a8376ff986e258f4e6b28a3c3ea695
https://github.com/phpmyadmin/phpmyadmin/commit/90acaecf44a8376ff986e258f4e6b28a3c3ea695
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 85.6% (2227 of 2603)
Commit: 8f5622fa30e1b4e0716aaf94c3527bfb0bfea748
https://github.com/phpmyadmin/phpmyadmin/commit/8f5622fa30e1b4e0716aaf94c3527bfb0bfea748
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M ChangeLog
M js/server_privileges.js
M libraries/server_privileges.lib.php
Log Message:
-----------
bug #3989 Reloading privileges does not update the interface
Commit: 2d73023175d8be1a8c457be8b7cee40aed4c711b
https://github.com/phpmyadmin/phpmyadmin/commit/2d73023175d8be1a8c457be8b7cee40aed4c711b
Author: Dadan Setia <da2n_s at yahoo.co.id>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/id.po
Log Message:
-----------
Translated using Weblate (Indonesian)
Currently translated at 76.0% (1978 of 2603)
Commit: 3288b545d9fd5e7e2feefce630dee623d079d939
https://github.com/phpmyadmin/phpmyadmin/commit/3288b545d9fd5e7e2feefce630dee623d079d939
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 89.2% (2322 of 2603)
Commit: de153362d16a2b327ecaa51a5f551cb9b1681a56
https://github.com/phpmyadmin/phpmyadmin/commit/de153362d16a2b327ecaa51a5f551cb9b1681a56
Author: Weblate <noreply at weblate.org>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M ChangeLog
M js/server_privileges.js
M libraries/server_privileges.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: d6f49a65f66108532b591f3524058dac8201580b
https://github.com/phpmyadmin/phpmyadmin/commit/d6f49a65f66108532b591f3524058dac8201580b
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 89.2% (2322 of 2603)
Commit: d4d5a037660dbd2b37813843c702f92ad9e5a524
https://github.com/phpmyadmin/phpmyadmin/commit/d4d5a037660dbd2b37813843c702f92ad9e5a524
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-21 (Fri, 21 Jun 2013)
Changed paths:
M ChangeLog
M db_tracking.php
M doc/config.rst
M libraries/DisplayResults.class.php
M libraries/Footer.class.php
M libraries/Menu.class.php
M libraries/Util.class.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/FormDisplay.class.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/display_create_table.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/operations.lib.php
M libraries/schema/User_Schema.class.php
M libraries/sql_query_form.lib.php
M libraries/structure.lib.php
M server_binlog.php
M server_databases.php
M tbl_structure.php
M tbl_tracking.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/common/PMA_buildActionTitles_test.php
M test/libraries/common/PMA_getIcon_test.php
Log Message:
-----------
Bug #3960 NavigationBarIconic config not honored
Commit: e8b7a6e7326825e076d84c559c0a68e755484b07
https://github.com/phpmyadmin/phpmyadmin/commit/e8b7a6e7326825e076d84c559c0a68e755484b07
Author: Dadan Setia <da2n_s at yahoo.co.id>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M po/id.po
Log Message:
-----------
Translated using Weblate (Indonesian)
Currently translated at 77.7% (2023 of 2603)
Commit: 93a80c97059aadb73e4ef931c1911d3e0abf6b82
https://github.com/phpmyadmin/phpmyadmin/commit/93a80c97059aadb73e4ef931c1911d3e0abf6b82
Author: J.M <me at mynetx.net>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Better visible upload progress bar background color
Commit: 5cefd0fe8fa2e7915da205118c7449debd7f7299
https://github.com/phpmyadmin/phpmyadmin/commit/5cefd0fe8fa2e7915da205118c7449debd7f7299
Author: asdf sasd <ashkgwithu at mailinator.com>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M po/hi.po
Log Message:
-----------
Translated using Weblate (Hindi)
Currently translated at 57.0% (1484 of 2603)
Commit: 48a366ab85f0ba3f6ec0d16ef99f9d5e2824cf9c
https://github.com/phpmyadmin/phpmyadmin/commit/48a366ab85f0ba3f6ec0d16ef99f9d5e2824cf9c
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 98.3% (2559 of 2603)
Commit: d7e90ed1bc74da488320f4776a08e5442a039a5b
https://github.com/phpmyadmin/phpmyadmin/commit/d7e90ed1bc74da488320f4776a08e5442a039a5b
Author: gheni <gheni at yahoo.cn>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M po/ug.po
Log Message:
-----------
Translated using Weblate (Uighur)
Currently translated at 14.9% (388 of 2603)
Commit: c900872cf0013c0d35a52ab1893d48b9e14a66cd
https://github.com/phpmyadmin/phpmyadmin/commit/c900872cf0013c0d35a52ab1893d48b9e14a66cd
Author: Weblate <noreply at weblate.org>
Date: 2013-06-22 (Sat, 22 Jun 2013)
Changed paths:
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 5c0d3e84676dc13362987441428871e9dad9bde2
https://github.com/phpmyadmin/phpmyadmin/commit/5c0d3e84676dc13362987441428871e9dad9bde2
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M ChangeLog
M db_tracking.php
M doc/config.rst
M libraries/DisplayResults.class.php
M libraries/Footer.class.php
M libraries/Menu.class.php
M libraries/Util.class.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/FormDisplay.class.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/display_create_table.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/operations.lib.php
M libraries/schema/User_Schema.class.php
M libraries/sql_query_form.lib.php
M libraries/structure.lib.php
M server_binlog.php
M server_databases.php
M tbl_structure.php
M tbl_tracking.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/common/PMA_buildActionTitles_test.php
M test/libraries/common/PMA_getIcon_test.php
Log Message:
-----------
Merge pull request #440 from lem9/bug_3960_B
Bug #3960 NavigationBarIconic config not honored
Commit: 3788e016adf76040ea5371e5ebf42f6563e23860
https://github.com/phpmyadmin/phpmyadmin/commit/3788e016adf76040ea5371e5ebf42f6563e23860
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2603 of 2603)
Commit: e6b1a3acd40a02e4c495a909958d6f06b7c55d30
https://github.com/phpmyadmin/phpmyadmin/commit/e6b1a3acd40a02e4c495a909958d6f06b7c55d30
Author: Weblate <noreply at weblate.org>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M ChangeLog
M db_tracking.php
M doc/config.rst
M libraries/DisplayResults.class.php
M libraries/Footer.class.php
M libraries/Menu.class.php
M libraries/Util.class.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/FormDisplay.class.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/display_create_table.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/operations.lib.php
M libraries/schema/User_Schema.class.php
M libraries/sql_query_form.lib.php
M libraries/structure.lib.php
M server_binlog.php
M server_databases.php
M tbl_structure.php
M tbl_tracking.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/common/PMA_buildActionTitles_test.php
M test/libraries/common/PMA_getIcon_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 968cec7833860c78ded2064135fcf79a99080963
https://github.com/phpmyadmin/phpmyadmin/commit/968cec7833860c78ded2064135fcf79a99080963
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be at 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 at 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 at latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: e1f6a9274cae1d3e581424f767b48c8211c33112
https://github.com/phpmyadmin/phpmyadmin/commit/e1f6a9274cae1d3e581424f767b48c8211c33112
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/nl.po
Log Message:
-----------
Translated using Weblate (Dutch)
Currently translated at 100.0% (2607 of 2607)
Commit: d0c0d0d2074e610c34542a5969d63d78128ee515
https://github.com/phpmyadmin/phpmyadmin/commit/d0c0d0d2074e610c34542a5969d63d78128ee515
Author: Dieter Adriaenssens <Dieter.Adriaenssens at UGent.be>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M libraries/plugins/import/ImportOds.class.php
Log Message:
-----------
fix typo
Commit: f0232c3cda257510a3214098421527c3c663c5c2
https://github.com/phpmyadmin/phpmyadmin/commit/f0232c3cda257510a3214098421527c3c663c5c2
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M ChangeLog
M libraries/common.inc.php
Log Message:
-----------
bug #3985 Call to undefined function mb_detect_encoding
Commit: fae5e7d992510b2674a32a2ce56facfb30fb90d7
https://github.com/phpmyadmin/phpmyadmin/commit/fae5e7d992510b2674a32a2ce56facfb30fb90d7
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M libraries/plugins/import/ImportOds.class.php
Log Message:
-----------
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
Commit: 43ad7caed9dfb5d32d70f7493b231275764b0e43
https://github.com/phpmyadmin/phpmyadmin/commit/43ad7caed9dfb5d32d70f7493b231275764b0e43
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be at 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/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 at 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 at latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
update po files
Commit: e93f7c2dd600c0691906730d601a6a4f3a8966f3
https://github.com/phpmyadmin/phpmyadmin/commit/e93f7c2dd600c0691906730d601a6a4f3a8966f3
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/tr.po
Log Message:
-----------
Translated using Weblate (Turkish)
Currently translated at 100.0% (2607 of 2607)
Commit: fc43b5a29f43d6f1e5291e19a377f3293903eba0
https://github.com/phpmyadmin/phpmyadmin/commit/fc43b5a29f43d6f1e5291e19a377f3293903eba0
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/et.po
Log Message:
-----------
Translated using Weblate (Estonian)
Currently translated at 99.8% (2603 of 2607)
Commit: 6b4a4d8a126b0781e6c6f02a96738cceb48a3adb
https://github.com/phpmyadmin/phpmyadmin/commit/6b4a4d8a126b0781e6c6f02a96738cceb48a3adb
Author: Mathieu Terroba <mathieu.terroba at gmail.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 100.0% (2607 of 2607)
Commit: 04c5730c50056024eeb974dadac87fcf65809c15
https://github.com/phpmyadmin/phpmyadmin/commit/04c5730c50056024eeb974dadac87fcf65809c15
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 100.0% (2607 of 2607)
Commit: eecc5451107c338667dd810d7bfa048b9978fba1
https://github.com/phpmyadmin/phpmyadmin/commit/eecc5451107c338667dd810d7bfa048b9978fba1
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/el.po
Log Message:
-----------
Translated using Weblate (Greek)
Currently translated at 100.0% (2607 of 2607)
Commit: d34d0190014e2146b8c62a439a5b12e69d9827c3
https://github.com/phpmyadmin/phpmyadmin/commit/d34d0190014e2146b8c62a439a5b12e69d9827c3
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/sl.po
Log Message:
-----------
Translated using Weblate (Slovenian)
Currently translated at 100.0% (2607 of 2607)
Commit: c5fb3f33d92dcfc161b76941d3757fe7557553be
https://github.com/phpmyadmin/phpmyadmin/commit/c5fb3f33d92dcfc161b76941d3757fe7557553be
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/sv.po
Log Message:
-----------
Translated using Weblate (Swedish)
Currently translated at 99.8% (2601 of 2607)
Commit: 4e5a88cd6049a0a8475ef5fef25c3bd644be00b6
https://github.com/phpmyadmin/phpmyadmin/commit/4e5a88cd6049a0a8475ef5fef25c3bd644be00b6
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/es.po
Log Message:
-----------
Translated using Weblate (Spanish)
Currently translated at 100.0% (2607 of 2607)
Commit: 58a7ae03e1fc465bb13bb860137f7881d8c8ec10
https://github.com/phpmyadmin/phpmyadmin/commit/58a7ae03e1fc465bb13bb860137f7881d8c8ec10
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 99.9% (2604 of 2607)
Commit: 9815a2650ea7861bc098d6a35977e9286b2e03cf
https://github.com/phpmyadmin/phpmyadmin/commit/9815a2650ea7861bc098d6a35977e9286b2e03cf
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/ko.po
Log Message:
-----------
Translated using Weblate (Korean)
Currently translated at 69.6% (1814 of 2607)
Commit: 19f503619e543fc506403bab0aaf502fb25f9838
https://github.com/phpmyadmin/phpmyadmin/commit/19f503619e543fc506403bab0aaf502fb25f9838
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (2603 of 2607)
Commit: e42f04694ec9d4ce5d49333201994c223f61c7e1
https://github.com/phpmyadmin/phpmyadmin/commit/e42f04694ec9d4ce5d49333201994c223f61c7e1
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/si.po
Log Message:
-----------
Translated using Weblate (Sinhala)
Currently translated at 81.6% (2127 of 2607)
Commit: 8e4184f7fd8833142637d5822a38f154883ff337
https://github.com/phpmyadmin/phpmyadmin/commit/8e4184f7fd8833142637d5822a38f154883ff337
Author: Anders Jonsson <anders.jonsson at norsjovallen.se>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/sv.po
Log Message:
-----------
Translated using Weblate (Swedish)
Currently translated at 99.8% (2602 of 2607)
Commit: 36c24274da430dfbc529a5ae95f787cd21acc426
https://github.com/phpmyadmin/phpmyadmin/commit/36c24274da430dfbc529a5ae95f787cd21acc426
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/tt.po
Log Message:
-----------
Translated using Weblate (Tatar)
Currently translated at 23.6% (615 of 2603)
Commit: 315075b0aacb693bf31fd841cba922ffe1b213ed
https://github.com/phpmyadmin/phpmyadmin/commit/315075b0aacb693bf31fd841cba922ffe1b213ed
Author: Michal Čihař <michal at cihar.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 99.9% (2604 of 2607)
Commit: 73b8f45a2eeb79d493f6a94f1d7ff882fe8e4a22
https://github.com/phpmyadmin/phpmyadmin/commit/73b8f45a2eeb79d493f6a94f1d7ff882fe8e4a22
Author: Kristjan Räts <kristjanrats at gmail.com>
Date: 2013-06-24 (Mon, 24 Jun 2013)
Changed paths:
M po/et.po
Log Message:
-----------
Translated using Weblate (Estonian)
Currently translated at 100.0% (2607 of 2607)
Commit: 6c99ac168087f8e234cbee91d9bb9be32481f09d
https://github.com/phpmyadmin/phpmyadmin/commit/6c99ac168087f8e234cbee91d9bb9be32481f09d
Author: Kyeong Su Shin <ksshin at uwaterloo.ca>
Date: 2013-06-26 (Wed, 26 Jun 2013)
Changed paths:
M po/ko.po
Log Message:
-----------
Translated using Weblate (Korean)
Currently translated at 69.9% (1822 of 2607)
Commit: 443a6043577f44cbeef1c6a3f970dd47662d0876
https://github.com/phpmyadmin/phpmyadmin/commit/443a6043577f44cbeef1c6a3f970dd47662d0876
Author: Tony Chen <tonychen at finenet.com.tw>
Date: 2013-06-27 (Thu, 27 Jun 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2607 of 2607)
Commit: a16600ddb8c965c00cc251beda99206cee8b90dd
https://github.com/phpmyadmin/phpmyadmin/commit/a16600ddb8c965c00cc251beda99206cee8b90dd
Author: Mehbooob Khan <mehboobbugti at gmail.com>
Date: 2013-06-30 (Sun, 30 Jun 2013)
Changed paths:
M po/ur.po
Log Message:
-----------
Translated using Weblate (Urdu)
Currently translated at 25.9% (675 of 2607)
Commit: 42d6983d062b5900e251ece107b75802a41c4792
https://github.com/phpmyadmin/phpmyadmin/commit/42d6983d062b5900e251ece107b75802a41c4792
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-30 (Sun, 30 Jun 2013)
Changed paths:
M ChangeLog
M import.php
Log Message:
-----------
Fix merge conflict
Commit: ab6901a837a38f6eaee09b781cb0a0e9828d330f
https://github.com/phpmyadmin/phpmyadmin/commit/ab6901a837a38f6eaee09b781cb0a0e9828d330f
Author: Aputsiaq Niels Janussen <aj at isit.gl>
Date: 2013-06-30 (Sun, 30 Jun 2013)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 100.0% (2607 of 2607)
Commit: cdb5fd839788c651eeda0b8a3d7fe4c69945bbb6
https://github.com/phpmyadmin/phpmyadmin/commit/cdb5fd839788c651eeda0b8a3d7fe4c69945bbb6
Author: Weblate <noreply at weblate.org>
Date: 2013-06-30 (Sun, 30 Jun 2013)
Changed paths:
M ChangeLog
M import.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 08566b81757b83d1ab23f283a06fb88bf4b1cbd7
https://github.com/phpmyadmin/phpmyadmin/commit/08566b81757b83d1ab23f283a06fb88bf4b1cbd7
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-06-30 (Sun, 30 Jun 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_4' into QA_4_0
Commit: a0cf5b3de15e3606aa1e9cfa83d032d29b3832b6
https://github.com/phpmyadmin/phpmyadmin/commit/a0cf5b3de15e3606aa1e9cfa83d032d29b3832b6
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-01 (Mon, 01 Jul 2013)
Changed paths:
M libraries/opendocument.lib.php
Log Message:
-----------
Include missing number namespace from our ODS export
Commit: e2e71a5f8a75f9fc27e8f553a66529e62c408633
https://github.com/phpmyadmin/phpmyadmin/commit/e2e71a5f8a75f9fc27e8f553a66529e62c408633
Author: Hamid Rohani <tazzeh2004 at yahoo.com>
Date: 2013-07-01 (Mon, 01 Jul 2013)
Changed paths:
M po/fa.po
Log Message:
-----------
Translated using Weblate (Persian)
Currently translated at 36.9% (963 of 2607)
Commit: 19631babfa3fb35f5e2d6c3177098c6ff127ddc1
https://github.com/phpmyadmin/phpmyadmin/commit/19631babfa3fb35f5e2d6c3177098c6ff127ddc1
Author: Weblate <noreply at weblate.org>
Date: 2013-07-01 (Mon, 01 Jul 2013)
Changed paths:
M libraries/opendocument.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 3eabbcd45c1bf892b9d8a76874cb3939ae42b72f
https://github.com/phpmyadmin/phpmyadmin/commit/3eabbcd45c1bf892b9d8a76874cb3939ae42b72f
Author: Jean Nunes <jeannunes at outlook.com>
Date: 2013-07-01 (Mon, 01 Jul 2013)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2607 of 2607)
Commit: e606583a7d76ad778bcd4b2fc22824ad705a89ab
https://github.com/phpmyadmin/phpmyadmin/commit/e606583a7d76ad778bcd4b2fc22824ad705a89ab
Author: Syed Mahbub ul Alam <syedmahbubulalam at gmail.com>
Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 20.3% (529 of 2607)
Commit: 0bb210521944db4ddffdca6f1d1b50fa7eff748d
https://github.com/phpmyadmin/phpmyadmin/commit/0bb210521944db4ddffdca6f1d1b50fa7eff748d
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 94.7% (2470 of 2607)
Commit: 9b2cf23dc244a03632f29cc2836b55d9a095b2ec
https://github.com/phpmyadmin/phpmyadmin/commit/9b2cf23dc244a03632f29cc2836b55d9a095b2ec
Author: G. S <somogyig at gmail.com>
Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 82.1% (2140 of 2607)
Commit: 5cc416d73ff8bf9029f3ea5c7f98678ccaa19d44
https://github.com/phpmyadmin/phpmyadmin/commit/5cc416d73ff8bf9029f3ea5c7f98678ccaa19d44
Author: G. S <somogyig at gmail.com>
Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 82.1% (2140 of 2607)
Commit: 03e5f9bb6f2d677f1d42d402f9cdb77837c63486
https://github.com/phpmyadmin/phpmyadmin/commit/03e5f9bb6f2d677f1d42d402f9cdb77837c63486
Author: G. S <somogyig at gmail.com>
Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 82.1% (2141 of 2607)
Commit: a5a2bae7dc9a2791524234ba50ba388343a18872
https://github.com/phpmyadmin/phpmyadmin/commit/a5a2bae7dc9a2791524234ba50ba388343a18872
Author: G. S <somogyig at gmail.com>
Date: 2013-07-02 (Tue, 02 Jul 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 82.2% (2143 of 2607)
Commit: a2a7c798721329af75499ac2c0674e7d4aa1366f
https://github.com/phpmyadmin/phpmyadmin/commit/a2a7c798721329af75499ac2c0674e7d4aa1366f
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths:
M po/ur.po
Log Message:
-----------
Translated using Weblate (Urdu)
Currently translated at 25.9% (675 of 2607)
Commit: 62080af180f807c42633408cb84e106b7f5b1e4f
https://github.com/phpmyadmin/phpmyadmin/commit/62080af180f807c42633408cb84e106b7f5b1e4f
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 94.7% (2470 of 2607)
Commit: e209d264bbbbd074854b47e9467ff21e5b5e9c60
https://github.com/phpmyadmin/phpmyadmin/commit/e209d264bbbbd074854b47e9467ff21e5b5e9c60
Author: Syed Mahbub ul Alam <syedmahbubulalam at gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 94.7% (2470 of 2607)
Commit: 374ede7f974347ba99cb945a8eb098437a0c413c
https://github.com/phpmyadmin/phpmyadmin/commit/374ede7f974347ba99cb945a8eb098437a0c413c
Author: Hao Chen <hao.chen.jobs at gmail.com>
Date: 2013-07-06 (Sat, 06 Jul 2013)
Changed paths:
M po/ja.po
Log Message:
-----------
Translated using Weblate (Japanese)
Currently translated at 95.6% (2491 of 2607)
Commit: 192eace403b1c3a80440e3f1ca3d568aae6ddb8d
https://github.com/phpmyadmin/phpmyadmin/commit/192eace403b1c3a80440e3f1ca3d568aae6ddb8d
Author: G. S <somogyig at gmail.com>
Date: 2013-07-07 (Sun, 07 Jul 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 100.0% (2607 of 2607)
Commit: 25c9a187be46820bff4cd10e5696312c8d442967
https://github.com/phpmyadmin/phpmyadmin/commit/25c9a187be46820bff4cd10e5696312c8d442967
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M js/config.js
Log Message:
-----------
Use jQuery.datepicker date formatting instead of own code
Conflicts:
js/config.js
Commit: fb803c07ea186fefdf48782f3583298f7f28df4e
https://github.com/phpmyadmin/phpmyadmin/commit/fb803c07ea186fefdf48782f3583298f7f28df4e
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M js/tbl_zoom_plot_jqplot.js
Log Message:
-----------
Use jQuery UI for parsing date strings
Commit: db5e0e65e9ba3c5830ed4514d712a15f56c06a0b
https://github.com/phpmyadmin/phpmyadmin/commit/db5e0e65e9ba3c5830ed4514d712a15f56c06a0b
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
Use jQuery UI for formatting date strings
Commit: 57fcc1d6b5233a0d3408a827113b0bc4b38b4588
https://github.com/phpmyadmin/phpmyadmin/commit/57fcc1d6b5233a0d3408a827113b0bc4b38b4588
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
R js/date.js
M server_status_monitor.php
M tbl_zoom_select.php
Log Message:
-----------
Drop no longer needed date.js
Conflicts:
js/date.js
Commit: fad8d76f6884bf181b9b5bbf37d0c569093e0e2d
https://github.com/phpmyadmin/phpmyadmin/commit/fad8d76f6884bf181b9b5bbf37d0c569093e0e2d
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
R js/jquery/jquery-1.8.3.js
A js/jquery/jquery-1.8.3.min.js
R js/jquery/jquery-ui-1.9.2.custom.js
A js/jquery/jquery-ui-1.9.2.custom.min.js
M libraries/Header.class.php
M setup/index.php
Log Message:
-----------
Include minified versions JS in git of jQuery and jQuery-UI
Commit: 9d0a1f61dbef25eaf59c591b8db75286722eef16
https://github.com/phpmyadmin/phpmyadmin/commit/9d0a1f61dbef25eaf59c591b8db75286722eef16
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
R scripts/compress-js
Log Message:
-----------
Drop javascript compression on release time
Commit: 6120e01a3fe97984d1e552bca2faac3792fcdd1c
https://github.com/phpmyadmin/phpmyadmin/commit/6120e01a3fe97984d1e552bca2faac3792fcdd1c
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M js/config.js
M js/functions.js
M js/server_status_monitor.js
Log Message:
-----------
Add wrapper function for formatting datetime
This makes it easier to use and correctly converts params which
formatTime expects.
Conflicts:
js/functions.js
Commit: fb0bb3e47232c3045747716ff8cde10eaff92415
https://github.com/phpmyadmin/phpmyadmin/commit/fb0bb3e47232c3045747716ff8cde10eaff92415
Author: Syed Mahbub ul Alam <syedmahbubulalam at gmail.com>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 97.1% (2531 of 2607)
Commit: 9fe1b4286d9566c3bff5b601d731c03feaf4646a
https://github.com/phpmyadmin/phpmyadmin/commit/9fe1b4286d9566c3bff5b601d731c03feaf4646a
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M js/config.js
R js/date.js
M js/functions.js
R js/jquery/jquery-1.8.3.js
A js/jquery/jquery-1.8.3.min.js
R js/jquery/jquery-ui-1.9.2.custom.js
A js/jquery/jquery-ui-1.9.2.custom.min.js
M js/server_status_monitor.js
M js/tbl_zoom_plot_jqplot.js
M libraries/Header.class.php
R scripts/compress-js
M server_status_monitor.php
M setup/index.php
M tbl_zoom_select.php
Log Message:
-----------
Merge pull request #485 from nijel/licensing
Fixed possible licensing issues
Commit: b2e5b66848aa202aaa594351e5f44a34a8a3d934
https://github.com/phpmyadmin/phpmyadmin/commit/b2e5b66848aa202aaa594351e5f44a34a8a3d934
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M po/bn.po
M po/hu.po
Log Message:
-----------
Format string fixups
Commit: 6c622abb5eae2ac47494a50683bbf72a6226f1fb
https://github.com/phpmyadmin/phpmyadmin/commit/6c622abb5eae2ac47494a50683bbf72a6226f1fb
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 97.5% (2543 of 2607)
Commit: c796045e2b2af98b9dd257851d583c0a8c04dc99
https://github.com/phpmyadmin/phpmyadmin/commit/c796045e2b2af98b9dd257851d583c0a8c04dc99
Author: Weblate <noreply at weblate.org>
Date: 2013-07-08 (Mon, 08 Jul 2013)
Changed paths:
M po/bn.po
M po/hu.po
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 07f9442caf714c439f1a586061ae995f76d14d43
https://github.com/phpmyadmin/phpmyadmin/commit/07f9442caf714c439f1a586061ae995f76d14d43
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M ChangeLog
M libraries/operations.lib.php
Log Message:
-----------
bug #4007 Analyze option not shown for InnoDB tables
Commit: 3889ad227a9eeaadae81a86dd86ef3c759af2b98
https://github.com/phpmyadmin/phpmyadmin/commit/3889ad227a9eeaadae81a86dd86ef3c759af2b98
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 99.0% (2580 of 2607)
Commit: bbaaed66f6e65e421f20a2162b59e494d9d38a97
https://github.com/phpmyadmin/phpmyadmin/commit/bbaaed66f6e65e421f20a2162b59e494d9d38a97
Author: Jouni Kähkönen <asdfsdf at asdfasdfasdf.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M po/fi.po
Log Message:
-----------
Translated using Weblate (Finnish)
Currently translated at 69.7% (1818 of 2607)
Commit: 5a38a9b717b24371115a7be594d2cf4efe282ca9
https://github.com/phpmyadmin/phpmyadmin/commit/5a38a9b717b24371115a7be594d2cf4efe282ca9
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 100.0% (2606 of 2607)
Commit: 01b5830abf25047377e69b52fabf60ed2f5565d6
https://github.com/phpmyadmin/phpmyadmin/commit/01b5830abf25047377e69b52fabf60ed2f5565d6
Author: Weblate <noreply at weblate.org>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M ChangeLog
M libraries/operations.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 28e8b5e25af0ef744125b239ff8d3927d66e08e8
https://github.com/phpmyadmin/phpmyadmin/commit/28e8b5e25af0ef744125b239ff8d3927d66e08e8
Author: Syed Mahbub ul Alam <syedmahbubulalam at gmail.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 99.0% (2580 of 2607)
Commit: 0be7f0e642a0b803907791a543ad33e2438afd8e
https://github.com/phpmyadmin/phpmyadmin/commit/0be7f0e642a0b803907791a543ad33e2438afd8e
Author: Syed Mahbub ul Alam <syedmahbubulalam at gmail.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 99.1% (2583 of 2607)
Commit: eab6ca338b8459890da3f0a2cbc40deec134a0b8
https://github.com/phpmyadmin/phpmyadmin/commit/eab6ca338b8459890da3f0a2cbc40deec134a0b8
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M po/bn.po
Log Message:
-----------
Translated using Weblate (Bengali)
Currently translated at 99.1% (2583 of 2607)
Commit: 3cede7cbac68c8b3c1831cd4bd970b13a9964d37
https://github.com/phpmyadmin/phpmyadmin/commit/3cede7cbac68c8b3c1831cd4bd970b13a9964d37
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-12 (Fri, 12 Jul 2013)
Changed paths:
M ChangeLog
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
Log Message:
-----------
bug #4015 Forcing a storage engine for configuration storage
Commit: 2e26347e422bc64acedc0f11216e2bcd916dddef
https://github.com/phpmyadmin/phpmyadmin/commit/2e26347e422bc64acedc0f11216e2bcd916dddef
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M po/uz.po
Log Message:
-----------
Translated using Weblate (Uzbek)
Currently translated at 49.5% (1291 of 2607)
Commit: 65240d5c0cd030a7943e920c1f7463ab165da97a
https://github.com/phpmyadmin/phpmyadmin/commit/65240d5c0cd030a7943e920c1f7463ab165da97a
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M po/eu.po
Log Message:
-----------
Translated using Weblate (Basque)
Currently translated at 22.7% (592 of 2607)
Commit: 0f766a837ec36d94cb9979a99cfbd0ab9d8ee64f
https://github.com/phpmyadmin/phpmyadmin/commit/0f766a837ec36d94cb9979a99cfbd0ab9d8ee64f
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-14 (Sun, 14 Jul 2013)
Changed paths:
M po/br.po
Log Message:
-----------
Translated using Weblate (Breton)
Currently translated at 26.4% (689 of 2607)
Commit: 9dc4bd28752ad284e27b295977cf500b6f78344e
https://github.com/phpmyadmin/phpmyadmin/commit/9dc4bd28752ad284e27b295977cf500b6f78344e
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 100.0% (2607 of 2607)
Commit: dc65e51879d9498afb549b56e58c250cd2da25f2
https://github.com/phpmyadmin/phpmyadmin/commit/dc65e51879d9498afb549b56e58c250cd2da25f2
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M po/tr.po
Log Message:
-----------
Translated using Weblate (Turkish)
Currently translated at 100.0% (2607 of 2607)
Commit: 5693cab14cc067dfb998c3936e7df2d2b6776729
https://github.com/phpmyadmin/phpmyadmin/commit/5693cab14cc067dfb998c3936e7df2d2b6776729
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M po/kk.po
Log Message:
-----------
Translated using Weblate (Kazakh)
Currently translated at 13.7% (357 of 2607)
Commit: 47911c4266c1ad093061b771f9eb64ea09c7fb3a
https://github.com/phpmyadmin/phpmyadmin/commit/47911c4266c1ad093061b771f9eb64ea09c7fb3a
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)
Changed paths:
M po/uz at latin.po
Log Message:
-----------
Translated using Weblate (Uzbek (latin))
Currently translated at 48.8% (1271 of 2607)
Commit: 5720fb3843dc620c99c1dd29d473b02a5f6c180a
https://github.com/phpmyadmin/phpmyadmin/commit/5720fb3843dc620c99c1dd29d473b02a5f6c180a
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ChangeLog
M libraries/database_interface.lib.php
Log Message:
-----------
Incorrect Drizzle 7 detection (backport from 37781045)
Commit: 6db676924283d4f232b9e91e6eca9a0d941681c1
https://github.com/phpmyadmin/phpmyadmin/commit/6db676924283d4f232b9e91e6eca9a0d941681c1
Author: Bug Me Not <abcdefg at mailinator.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M po/he.po
Log Message:
-----------
Translated using Weblate (Hebrew)
Currently translated at 23.6% (616 of 2607)
Commit: 16506af716dff43bd5e4c268d93aae4444d72bce
https://github.com/phpmyadmin/phpmyadmin/commit/16506af716dff43bd5e4c268d93aae4444d72bce
Author: Weblate <noreply at weblate.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ChangeLog
M libraries/database_interface.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 77e67c3f2cb1e7cda9255128b779335bd9af80ff
https://github.com/phpmyadmin/phpmyadmin/commit/77e67c3f2cb1e7cda9255128b779335bd9af80ff
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M ChangeLog
M export.php
M libraries/config.default.php
M libraries/plugins/export/ExportSql.class.php
Log Message:
-----------
- bug #4019 Create database if not exists (export): add an option to the
interface to enable generating CREATE DATABASE and USE (false by default)
Commit: 883d272841648b8b61e3cc3f570f144df188e76f
https://github.com/phpmyadmin/phpmyadmin/commit/883d272841648b8b61e3cc3f570f144df188e76f
Author: Ballen Abdulkarim <ballen.angel at yahoo.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M po/ckb.po
Log Message:
-----------
Translated using Weblate (Kurdish Sorani)
Currently translated at 21.1% (551 of 2607)
Commit: 12571ab7353e49ab38c28ed970d5be1f6265e009
https://github.com/phpmyadmin/phpmyadmin/commit/12571ab7353e49ab38c28ed970d5be1f6265e009
Author: Weblate <noreply at weblate.org>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M ChangeLog
M export.php
M libraries/config.default.php
M libraries/plugins/export/ExportSql.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: a24e9739636e4fae79327a96c39b051c468ccc47
https://github.com/phpmyadmin/phpmyadmin/commit/a24e9739636e4fae79327a96c39b051c468ccc47
Author: Michal Čihař <michal at cihar.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M po/pt.po
Log Message:
-----------
Translated using Weblate (Portuguese)
Currently translated at 50.5% (1317 of 2607)
Commit: 620953331924a16a6ec374d4cad358b96d87cfdf
https://github.com/phpmyadmin/phpmyadmin/commit/620953331924a16a6ec374d4cad358b96d87cfdf
Author: Telma Gonzaga <novawebproject at gmail.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M po/pt.po
Log Message:
-----------
Translated using Weblate (Portuguese)
Currently translated at 50.6% (1318 of 2607)
Commit: cd421e018c29b7ffbf85a1eb6c80c2435f8487cd
https://github.com/phpmyadmin/phpmyadmin/commit/cd421e018c29b7ffbf85a1eb6c80c2435f8487cd
Author: Dmitriy Buldakov <dmitriybuldakov at users.sourceforge.net>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M libraries/import.lib.php
Log Message:
-----------
Bug #4012 Crash on CSV file import
Commit: 6ac33adc1523139d7e8d10203fd77089d5507b67
https://github.com/phpmyadmin/phpmyadmin/commit/6ac33adc1523139d7e8d10203fd77089d5507b67
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M ChangeLog
M libraries/import.lib.php
Log Message:
-----------
ChangeLog entry for bug 4012 fix
Fix another case of parameter incorrectly passed by reference
Adjust functions parameter doc
Commit: 8e18a98440509d117253aed540dd6bbed7fc0873
https://github.com/phpmyadmin/phpmyadmin/commit/8e18a98440509d117253aed540dd6bbed7fc0873
Author: Telma Gonzaga <novawebproject at gmail.com>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M po/pt.po
Log Message:
-----------
Translated using Weblate (Portuguese)
Currently translated at 50.6% (1319 of 2607)
Commit: 6ff96fe06237d4b7905c0bb009dd845c7f71e930
https://github.com/phpmyadmin/phpmyadmin/commit/6ff96fe06237d4b7905c0bb009dd845c7f71e930
Author: ProUser <stefan at inkopsforum.se>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M po/sv.po
Log Message:
-----------
Translated using Weblate (Swedish)
Currently translated at 100.0% (2607 of 2607)
Commit: 71c26bcec2df4245af2dfe2ab41f167994177f0d
https://github.com/phpmyadmin/phpmyadmin/commit/71c26bcec2df4245af2dfe2ab41f167994177f0d
Author: Weblate <noreply at weblate.org>
Date: 2013-07-20 (Sat, 20 Jul 2013)
Changed paths:
M ChangeLog
M libraries/import.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Commit: 81dba57b6a655997aa3584e34ac1003277970404
https://github.com/phpmyadmin/phpmyadmin/commit/81dba57b6a655997aa3584e34ac1003277970404
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M libraries/Advisor.class.php
Log Message:
-----------
Better injection of variables into eval'd code
Commit: 2f48cd69eb74f48565b7505e4dd3cb6ce8844683
https://github.com/phpmyadmin/phpmyadmin/commit/2f48cd69eb74f48565b7505e4dd3cb6ce8844683
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-23 (Tue, 23 Jul 2013)
Changed paths:
M libraries/advisory_rules.txt
Log Message:
-----------
Fix rule definition (value and check were mixed)
Commit: dacec69d3e9d373895c408fccf0f01c622a67a4b
https://github.com/phpmyadmin/phpmyadmin/commit/dacec69d3e9d373895c408fccf0f01c622a67a4b
Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M js/server_status_monitor.js
Log Message:
-----------
Format values in Questions/Connections chart
Commit: a206fa87e9256b13e3b71d78cb7b7aac005aee7a
https://github.com/phpmyadmin/phpmyadmin/commit/a206fa87e9256b13e3b71d78cb7b7aac005aee7a
Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Fix bug#4009, y-axis ticks invisible in Questions chart
Commit: c598c59d8ac2432798647e5854960461f4053648
https://github.com/phpmyadmin/phpmyadmin/commit/c598c59d8ac2432798647e5854960461f4053648
Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
changelog entry for bug#4009
Commit: e8d85ade30a2b0c1ca0fbdda00c9730ba7cd25ce
https://github.com/phpmyadmin/phpmyadmin/commit/e8d85ade30a2b0c1ca0fbdda00c9730ba7cd25ce
Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M js/server_status_monitor.js
M themes/pmahomme/css/common.css.php
Log Message:
-----------
allow tooltip overflow, hide axis overflow explicitly
Commit: 6c5426a3fb688d8018aeb01929db048216ecc5c0
https://github.com/phpmyadmin/phpmyadmin/commit/6c5426a3fb688d8018aeb01929db048216ecc5c0
Author: Xosé Calvo <xosecalvo at gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M po/gl.po
Log Message:
-----------
Translated using Weblate (Galician)
Currently translated at 98.8% (2577 of 2607)
Commit: 70bcb1184c00d2db9d28c612a349491a43b756d5
https://github.com/phpmyadmin/phpmyadmin/commit/70bcb1184c00d2db9d28c612a349491a43b756d5
Author: Xosé Calvo <xosecalvo at gmail.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M po/gl.po
Log Message:
-----------
Translated using Weblate (Galician)
Currently translated at 100.0% (2606 of 2607)
Commit: 4a6b6bda90d35fb9b9462db713b45b4f8325ff02
https://github.com/phpmyadmin/phpmyadmin/commit/4a6b6bda90d35fb9b9462db713b45b4f8325ff02
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ChangeLog
M libraries/relation.lib.php
Log Message:
-----------
bug #3998 Non-permanent SQL history not working
Commit: 3fde4efd51f3c92ff0369f1047c1b5b858d334e1
https://github.com/phpmyadmin/phpmyadmin/commit/3fde4efd51f3c92ff0369f1047c1b5b858d334e1
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
Log Message:
-----------
#3578 transformations for text/plain on a BLOB column
Commit: bf79ce9101616efa7fd2f490676d3ac6a491d842
https://github.com/phpmyadmin/phpmyadmin/commit/bf79ce9101616efa7fd2f490676d3ac6a491d842
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2013-07-27 (Sat, 27 Jul 2013)
Changed paths:
M themes/.gitignore
Log Message:
-----------
Add metro theme to ignore list
Commit: 836529be425c5a309549ef440ee4d3bd6b30ca29
https://github.com/phpmyadmin/phpmyadmin/commit/836529be425c5a309549ef440ee4d3bd6b30ca29
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
R libraries/.htaccess
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Error.class.php
M libraries/Error_Handler.class.php
M libraries/List_Database.class.php
M libraries/PMA.php
M libraries/RecentTable.class.php
M libraries/bookmark.lib.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config/validate.lib.php
M libraries/engines/bdb.lib.php
M libraries/engines/berkeleydb.lib.php
M libraries/engines/binlog.lib.php
M libraries/engines/innobase.lib.php
M libraries/engines/innodb.lib.php
M libraries/engines/memory.lib.php
M libraries/engines/merge.lib.php
M libraries/engines/mrg_myisam.lib.php
M libraries/engines/myisam.lib.php
M libraries/engines/ndbcluster.lib.php
M libraries/engines/pbxt.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
M libraries/pmd_common.php
M libraries/schema/Export_Relation_Schema.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M pmd_pdf.php
M schema_export.php
M server_status.php
R setup/frames/.htaccess
R setup/lib/.htaccess
M version_check.php
Log Message:
-----------
Fix merge conflicts
Commit: f5136aea9ec3910e09df477683644f6212baa89a
https://github.com/phpmyadmin/phpmyadmin/commit/f5136aea9ec3910e09df477683644f6212baa89a
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_4' into QA_4_0
Commit: af5ca358d2e21422f7af1b8054ac6ed5d071ab4f
https://github.com/phpmyadmin/phpmyadmin/commit/af5ca358d2e21422f7af1b8054ac6ed5d071ab4f
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflicts
Commit: 0e9e7f28a21eb352f6d85db84c4d5a8a397ad26e
https://github.com/phpmyadmin/phpmyadmin/commit/0e9e7f28a21eb352f6d85db84c4d5a8a397ad26e
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflicts
Commit: 52b9b6c81f6e62858c9e3d495925d5e2ab65ff75
https://github.com/phpmyadmin/phpmyadmin/commit/52b9b6c81f6e62858c9e3d495925d5e2ab65ff75
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-28 (Sun, 28 Jul 2013)
Changed paths:
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.0.5-rc1
Commit: 240b8332db53dedc27baeec5306dabad3bdece3b
https://github.com/phpmyadmin/phpmyadmin/commit/240b8332db53dedc27baeec5306dabad3bdece3b
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M doc/config.rst
A js/cross_framing_protection.js
M libraries/Header.class.php
M libraries/Scripts.class.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
Log Message:
-----------
Readd AllowThirdPartyFraming option
We want by default no framing of phpMyAdmin, but still some sites might
need to embed it, so configuration option (with appropriate security
warning) is there.
This basically reverts d7e0bed28443e6cf8f41965cc2f27be19c667fa6.
Commit: 24d0eb55203b029f250c77d63f2900ffbe099e8b
https://github.com/phpmyadmin/phpmyadmin/commit/24d0eb55203b029f250c77d63f2900ffbe099e8b
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M js/cross_framing_protection.js
M libraries/Header.class.php
Log Message:
-----------
Improved protection against cross framing
We now include CSS to hide the page and display it conditionally after
checking we're in top frame. This adds extra protection for clients who
do not support X-Frame-Options.
See also http://en.wikipedia.org/wiki/Framekiller and
https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
Commit: 3d8a6156124d310a727a7ec2802ae4204d57fd79
https://github.com/phpmyadmin/phpmyadmin/commit/3d8a6156124d310a727a7ec2802ae4204d57fd79
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be at 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 at 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 at latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: 66fe475d4f51b1761719cb0cab360748800373f7
https://github.com/phpmyadmin/phpmyadmin/commit/66fe475d4f51b1761719cb0cab360748800373f7
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for Improved protection against cross framing
Commit: da4042fb6c4365dc8187765c3bf525043687c66f
https://github.com/phpmyadmin/phpmyadmin/commit/da4042fb6c4365dc8187765c3bf525043687c66f
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M libraries/Header.class.php
Log Message:
-----------
Display none only if protection is enabled
Commit: 4da684e7b67f51c245103a0bbb2096938ba2df0b
https://github.com/phpmyadmin/phpmyadmin/commit/4da684e7b67f51c245103a0bbb2096938ba2df0b
Author: Michal Čihař <mcihar at suse.cz>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M index.php
Log Message:
-----------
Fixed escaping in error message asking for translations
Commit: 9e59203274322dbac29eb1b1b59066bbf2e70273
https://github.com/phpmyadmin/phpmyadmin/commit/9e59203274322dbac29eb1b1b59066bbf2e70273
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.0.5-rc2
Commit: 2fecc279f5d51e00a203cd400ace24b6053969a4
https://github.com/phpmyadmin/phpmyadmin/commit/2fecc279f5d51e00a203cd400ace24b6053969a4
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.0.5 release
Commit: 15c158ccb34d0c29dc713ff6986c3ae49e8daa16
https://github.com/phpmyadmin/phpmyadmin/commit/15c158ccb34d0c29dc713ff6986c3ae49e8daa16
Author: Marc Delisle <marc at infomarc.info>
Date: 2013-08-04 (Sun, 04 Aug 2013)
Changed paths:
M ChangeLog
M README
M db_tracking.php
M doc/conf.py
M doc/config.rst
M examples/create_tables.sql
M examples/create_tables_drizzle.sql
M export.php
M index.php
M js/config.js
A js/cross_framing_protection.js
R js/date.js
M js/functions.js
R js/jquery/jquery-1.8.3.js
A js/jquery/jquery-1.8.3.min.js
R js/jquery/jquery-ui-1.9.2.custom.js
A js/jquery/jquery-ui-1.9.2.custom.min.js
M js/navigation.js
M js/server_privileges.js
M js/server_status_monitor.js
M js/tbl_zoom_plot_jqplot.js
M libraries/Advisor.class.php
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Footer.class.php
M libraries/Header.class.php
M libraries/Menu.class.php
M libraries/RecentTable.class.php
M libraries/Scripts.class.php
M libraries/Util.class.php
M libraries/advisory_rules.txt
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/FormDisplay.class.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
M libraries/database_interface.lib.php
M libraries/display_create_table.lib.php
M libraries/import.lib.php
M libraries/navigation/NavigationHeader.class.php
M libraries/navigation/NavigationTree.class.php
M libraries/opendocument.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/plugins/import/ImportOds.class.php
M libraries/relation.lib.php
M libraries/schema/User_Schema.class.php
M libraries/server_privileges.lib.php
M libraries/sql_query_form.lib.php
M libraries/structure.lib.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be at 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 at 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 at latin.po
M po/zh_CN.po
M po/zh_TW.po
R scripts/compress-js
M server_binlog.php
M server_databases.php
M server_status_monitor.php
M setup/index.php
M tbl_structure.php
M tbl_tracking.php
M tbl_zoom_select.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_Menu_test.php
M test/classes/PMA_Table_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/common/PMA_buildActionTitles_test.php
M test/libraries/common/PMA_getIcon_test.php
M themes/.gitignore
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'MAINT_4_0_5' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1c5fc019bb03...15c158ccb34d
More information about the Git
mailing list