Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6b778e09d9cebe3ae05b251f60faa102413f572d https://github.com/phpmyadmin/phpmyadmin/commit/6b778e09d9cebe3ae05b251f60fa... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M db_operations.php M db_structure.php M examples/openid.php M examples/signon.php M import.php M libraries/Advisor.class.php M libraries/DBQbe.class.php M libraries/DatabaseInterface.class.php M libraries/DisplayResults.class.php M libraries/File.class.php M libraries/Message.class.php M libraries/PMA.php M libraries/Table.class.php M libraries/Util.class.php M libraries/check_user_privileges.lib.php M libraries/common.inc.php M libraries/config/ConfigFile.class.php M libraries/config/Validator.class.php M libraries/create_addfield.lib.php M libraries/dbi/DBIMysql.class.php M libraries/display_export.inc.php M libraries/display_export.lib.php M libraries/error_report.lib.php M libraries/export.lib.php M libraries/gis/GIS_Geometry.class.php M libraries/gis/GIS_Geometrycollection.class.php M libraries/gis/GIS_Linestring.class.php M libraries/gis/GIS_Multilinestring.class.php M libraries/gis/GIS_Multipoint.class.php M libraries/gis/GIS_Multipolygon.class.php M libraries/gis/GIS_Point.class.php M libraries/gis/GIS_Polygon.class.php M libraries/gis/GIS_Visualization.class.php M libraries/mysql_charsets.inc.php M libraries/mysql_charsets.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/session.inc.php M libraries/sql.lib.php M libraries/structure.lib.php M libraries/url_generating.lib.php M test/libraries/common/PMA_cache_test.php
Log Message: ----------- Fix coding style
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 72439c27df709e53b9a09b1eaf00f06b50f02810 https://github.com/phpmyadmin/phpmyadmin/commit/72439c27df709e53b9a09b1eaf00... Author: Sevdimali İsa sevdimaliisayev@mail.ru Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M po/az.po
Log Message: ----------- Translated using Weblate (Azerbaijani)
Currently translated at 29.7% (824 of 2770)
Commit: 698e790f02a9e313292e24a5023e8b5c92703248 https://github.com/phpmyadmin/phpmyadmin/commit/698e790f02a9e313292e24a5023e... Author: Yungu Kim crimsonpi@gmail.com Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 82.1% (2276 of 2770)
Commit: 82cd44a988d44a3ba05c3048f275a06e8fc2f07d https://github.com/phpmyadmin/phpmyadmin/commit/82cd44a988d44a3ba05c3048f275... Author: Richard G. Nielsen richard@plaza.no Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 61.5% (1705 of 2770)
Commit: 6fdf5e655146ec976aeefe43de6e3ed88b13b0da https://github.com/phpmyadmin/phpmyadmin/commit/6fdf5e655146ec976aeefe43de6e... Author: Weblate noreply@weblate.org Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M db_operations.php M db_structure.php M examples/openid.php M examples/signon.php M import.php M libraries/Advisor.class.php M libraries/DBQbe.class.php M libraries/DatabaseInterface.class.php M libraries/DisplayResults.class.php M libraries/File.class.php M libraries/Message.class.php M libraries/PMA.php M libraries/Table.class.php M libraries/Util.class.php M libraries/check_user_privileges.lib.php M libraries/common.inc.php M libraries/config/ConfigFile.class.php M libraries/config/Validator.class.php M libraries/create_addfield.lib.php M libraries/dbi/DBIMysql.class.php M libraries/display_export.inc.php M libraries/display_export.lib.php M libraries/error_report.lib.php M libraries/export.lib.php M libraries/gis/GIS_Geometry.class.php M libraries/gis/GIS_Geometrycollection.class.php M libraries/gis/GIS_Linestring.class.php M libraries/gis/GIS_Multilinestring.class.php M libraries/gis/GIS_Multipoint.class.php M libraries/gis/GIS_Multipolygon.class.php M libraries/gis/GIS_Point.class.php M libraries/gis/GIS_Polygon.class.php M libraries/gis/GIS_Visualization.class.php M libraries/mysql_charsets.inc.php M libraries/mysql_charsets.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/schema/Export_Relation_Schema.class.php M libraries/session.inc.php M libraries/sql.lib.php M libraries/structure.lib.php M libraries/url_generating.lib.php M test/libraries/common/PMA_cache_test.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 1fd8fde4ca149c60cb65b8be7c01458d507405a3 https://github.com/phpmyadmin/phpmyadmin/commit/1fd8fde4ca149c60cb65b8be7c01... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M libraries/Table.class.php M test/classes/PMA_Message_test.php
Log Message: ----------- Fix failing tests
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 2a5430888dd78d328204ff1ce6bb0b2d39320c5b https://github.com/phpmyadmin/phpmyadmin/commit/2a5430888dd78d328204ff1ce6bb... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M js/functions.js
Log Message: ----------- Merge pull request #1247 from Tithugues/QA_4_2_fixEmptySQL
Fix error when clicking 'Go' and having an empty textarea in SQL tab. (bug #4470)
Commit: 8b5ea8869db0c576b1c2f69c36935b010faeb972 https://github.com/phpmyadmin/phpmyadmin/commit/8b5ea8869db0c576b1c2f69c3693... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Update ChangeLog.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 46091ff2e232362642e47dd05d3465f88707fc7c https://github.com/phpmyadmin/phpmyadmin/commit/46091ff2e232362642e47dd05d34... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M libraries/insert_edit.lib.php
Log Message: ----------- Fix coding style
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 1ac64c7d75b9cfabee4714dc1a1a81252eb55cf6 https://github.com/phpmyadmin/phpmyadmin/commit/1ac64c7d75b9cfabee4714dc1a1a... Author: Sevdimali İsa sevdimaliisayev@mail.ru Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M po/az.po
Log Message: ----------- Translated using Weblate (Azerbaijani)
Currently translated at 31.0% (860 of 2770)
Commit: cee3010288b47317a969d38b52845653f5dda6f9 https://github.com/phpmyadmin/phpmyadmin/commit/cee3010288b47317a969d38b5284... Author: Weblate noreply@weblate.org Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M libraries/insert_edit.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 1fb1093d0dfe5f9c1431a2d208853b4d1d56fbc4 https://github.com/phpmyadmin/phpmyadmin/commit/1fb1093d0dfe5f9c1431a2d20885... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-22 (Sun, 22 Jun 2014)
Changed paths: M ChangeLog M libraries/config/Validator.class.php
Log Message: ----------- Add missing include. (bug #4463)
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 2a807fe07319c28356117f7c1bdf6582890535ba https://github.com/phpmyadmin/phpmyadmin/commit/2a807fe07319c28356117f7c1bdf... Author: Marc Delisle marc@infomarc.info Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths: M ChangeLog M libraries/config/Validator.class.php
Log Message: ----------- Merge pull request #1248 from Tithugues/QA_4_2_b4463
Add missing include. (bug #4463)
Commit: 26dab85f4488a7902a3ceb4740bebdbba61a723b https://github.com/phpmyadmin/phpmyadmin/commit/26dab85f4488a7902a3ceb4740be... Author: Sevdimali İsa sevdimaliisayev@mail.ru Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths: M po/az.po
Log Message: ----------- Translated using Weblate (Azerbaijani)
Currently translated at 38.4% (1066 of 2770)
Commit: e1621b890fadff01f4a237e3a5b38329ea31eba4 https://github.com/phpmyadmin/phpmyadmin/commit/e1621b890fadff01f4a237e3a5b3... Author: Kristjan Räts kristjanrats@gmail.com Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths: M po/et.po
Log Message: ----------- Translated using Weblate (Estonian)
Currently translated at 100.0% (2770 of 2770)
Commit: 0c60471ae5fc11af3b9deca40fd5ae1628989638 https://github.com/phpmyadmin/phpmyadmin/commit/0c60471ae5fc11af3b9deca40fd5... Author: Thiago Sabaia thiago.sabaia@parqueproducoes.com.br Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths: M po/pt_BR.po
Log Message: ----------- Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (2768 of 2770)
Commit: 31b439366f29471d70a8e3c8a0d965a359330ee2 https://github.com/phpmyadmin/phpmyadmin/commit/31b439366f29471d70a8e3c8a0d9... Author: Weblate noreply@weblate.org Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths: M ChangeLog M libraries/config/Validator.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 2a65e60db830820adf08587022c9455dbe84b3a9 https://github.com/phpmyadmin/phpmyadmin/commit/2a65e60db830820adf08587022c9... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Log Message: ----------- Merge commit '6b778e09d9cebe3ae05b251f60faa102413f572d'
Commit: 4f50eb14686ff3d8b97889fc10296a852d30d216 https://github.com/phpmyadmin/phpmyadmin/commit/4f50eb14686ff3d8b97889fc1029... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Log Message: ----------- Merge commit '6fdf5e655146ec976aeefe43de6e3ed88b13b0da'
Commit: 93993c3b88379891859e1ca6fe4681ff049f6f6e https://github.com/phpmyadmin/phpmyadmin/commit/93993c3b88379891859e1ca6fe46... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths: M libraries/Table.class.php M test/classes/PMA_Message_test.php
Log Message: ----------- Merge commit '8b5ea8869db0c576b1c2f69c36935b010faeb972'
Conflicts: ChangeLog libraries/Table.class.php
Commit: cae50bd5347f1a0e9f7a591f9588ccf57ee87ea7 https://github.com/phpmyadmin/phpmyadmin/commit/cae50bd5347f1a0e9f7a591f9588... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Log Message: ----------- Merge commit '46091ff2e232362642e47dd05d3465f88707fc7c'
Commit: ff45a729072b8e7c6110f4f7bf778dc88518360f https://github.com/phpmyadmin/phpmyadmin/commit/ff45a729072b8e7c6110f4f7bf77... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Log Message: ----------- Merge commit 'cee3010288b47317a969d38b52845653f5dda6f9'
Commit: 66a9eb662db16ce433dc8e9b095b7fc92ee5a3e0 https://github.com/phpmyadmin/phpmyadmin/commit/66a9eb662db16ce433dc8e9b095b... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Log Message: ----------- Merge commit '2a807fe07319c28356117f7c1bdf6582890535ba'
Commit: 77416b58aae8d513e7add0c0a1af19711f4744fa https://github.com/phpmyadmin/phpmyadmin/commit/77416b58aae8d513e7add0c0a1af... Author: Michal Čihař michal@cihar.com Date: 2014-06-24 (Tue, 24 Jun 2014)
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/40c0defb900f...77416b58aae8
-
Michal Čihař