Branch: refs/heads/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style Home: https://github.com/phpmyadmin/phpmyadmin Commit: 319aac3c761142ab00e3e6016e594d4b84079efc https://github.com/phpmyadmin/phpmyadmin/commit/319aac3c761142ab00e3e6016e59... Author: Marc Delisle marc@infomarc.info Date: 2014-10-11 (Sat, 11 Oct 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.10 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 27637d9ca0dd3d23b4db7f2d10761fbaf60e043a https://github.com/phpmyadmin/phpmyadmin/commit/27637d9ca0dd3d23b4db7f2d1076... Author: julianladisch github.com-t3if@ladisch.de Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 100.0% (2768 of 2768 strings)
[CI skip]
Commit: ac27cd2026ec4ac0802d0ebf85f76ba317cb8bd7 https://github.com/phpmyadmin/phpmyadmin/commit/ac27cd2026ec4ac0802d0ebf85f7... Author: Tor Stokkan danorse@gmail.com Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 65.4% (1811 of 2768 strings)
[CI skip]
Commit: 8785ea0e345eba957137bcb01f872be15dda1e4d https://github.com/phpmyadmin/phpmyadmin/commit/8785ea0e345eba957137bcb01f87... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M test/classes/plugin/export/PMA_ExportHtmlword_test.php
Log Message: ----------- Adjust tests for commit 3ec96cb038853f0f6d8198461b20c4a784cc9bf0
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: e67abc737a5c2031eea635e4017cf297a330f80a https://github.com/phpmyadmin/phpmyadmin/commit/e67abc737a5c2031eea635e4017c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message: ----------- Fix tests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: af6e87f27885fe9b8008f3e63612508490799b29 https://github.com/phpmyadmin/phpmyadmin/commit/af6e87f27885fe9b8008f3e63612... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 62.4% (1728 of 2768 strings)
[CI skip]
Commit: 331d89c0bcbaadd29ddac5db6c0ca35f6792a453 https://github.com/phpmyadmin/phpmyadmin/commit/331d89c0bcbaadd29ddac5db6c0c... Author: Tor Stokkan danorse@gmail.com Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 65.4% (1813 of 2768 strings)
[CI skip]
Commit: 8186a0e462dbad074e8ec6fb90f14921ac095996 https://github.com/phpmyadmin/phpmyadmin/commit/8186a0e462dbad074e8ec6fb90f1... Author: Weblate noreply@weblate.org Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: b21314179b265e490cbf02c506cdf86b07167b29 https://github.com/phpmyadmin/phpmyadmin/commit/b21314179b265e490cbf02c506cd... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M libraries/tbl_columns_definition_form.lib.php
Log Message: ----------- phpdoc variable type fix
Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com
Commit: 9680410019dcfdd49c536d1b4608a85671ce2dfa https://github.com/phpmyadmin/phpmyadmin/commit/9680410019dcfdd49c536d1b4608... Author: Marc Delisle marc@infomarc.info Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M db_datadict.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/relation.lib.php
Log Message: ----------- Refactor code duplication
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: d2aec03f2b0ef8bfc8d45fe582b9580ce14bf29f https://github.com/phpmyadmin/phpmyadmin/commit/d2aec03f2b0ef8bfc8d45fe582b9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M js/navigation.js
Log Message: ----------- Do not remove throbber in case of aborted ajax filter calls
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 03b84715f66eba027c6bdbcb0456b986ab013314 https://github.com/phpmyadmin/phpmyadmin/commit/03b84715f66eba027c6bdbcb0456... Author: josep constanti jconstanti@ovi.com Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M po/ca.po
Log Message: ----------- Translated using Weblate (Catalan)
Currently translated at 83.5% (2484 of 2973 strings)
[CI skip]
Commit: c541114ddbbe89877f5a0c73fbc2923c79bb6403 https://github.com/phpmyadmin/phpmyadmin/commit/c541114ddbbe89877f5a0c73fbc2... Author: Weblate noreply@weblate.org Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M js/navigation.js
Log Message: ----------- Merge remote-tracking branch 'origin/master'
Commit: 8a3bf5af9f3333ac7bd526a1d945c0ebf47c3815 https://github.com/phpmyadmin/phpmyadmin/commit/8a3bf5af9f3333ac7bd526a1d945... Author: Marc Delisle marc@infomarc.info Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M import.php M libraries/core.lib.php M server_privileges.php
Log Message: ----------- Refactor code duplication
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: a4546feda10327d6a79e644026adba38d1569bbf https://github.com/phpmyadmin/phpmyadmin/commit/a4546feda10327d6a79e644026ad... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M libraries/Config.class.php
Log Message: ----------- Fix #4559: don't use multibytes to read hash.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 270d2a0ceefedc348cedb598ffda6e6c536d7169 https://github.com/phpmyadmin/phpmyadmin/commit/270d2a0ceefedc348cedb598ffda... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M libraries/Config.class.php
Log Message: ----------- Merge pull request #1382 from Tithugues/b4559_master
Fix #4559: don't use multibytes to read hash.
Commit: f5c271667b61b51de2258cde11cbe30ab484ebdd https://github.com/phpmyadmin/phpmyadmin/commit/f5c271667b61b51de2258cde11cb... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M ChangeLog
Log Message: ----------- Update ChangeLog.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 20d7e0c71ea88ef6c4cdd966005b8f3062f2bc26 https://github.com/phpmyadmin/phpmyadmin/commit/20d7e0c71ea88ef6c4cdd966005b... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-10-20 (Mon, 20 Oct 2014)
Changed paths: M libraries/Config.class.php
Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Commit: bd68c54d1beeef79d237e8bfda44690834012a76 https://github.com/phpmyadmin/phpmyadmin/commit/bd68c54d1beeef79d237e8bfda44... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php
Log Message: ----------- bug #4562 [security] XSS in debug SQL output
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 7b8962dede7631298c81e2c1cd267b81f1e08a8c https://github.com/phpmyadmin/phpmyadmin/commit/7b8962dede7631298c81e2c1cd26... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/server_status_monitor.js
Log Message: ----------- bug #4563 [security] XSS in monitor query analyzer
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: d0e3ab3bc9da5a4ed24e485632471fef65cdb556 https://github.com/phpmyadmin/phpmyadmin/commit/d0e3ab3bc9da5a4ed24e48563247... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.10.1 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: b75e19f8df919144a3febd21b0a3098e89d41ff6 https://github.com/phpmyadmin/phpmyadmin/commit/b75e19f8df919144a3febd21b0a3... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit '319aac3' into QA_4_2
Commit: 873ffa3ffed233754b69ba5df7a2ee3d8ea0025f https://github.com/phpmyadmin/phpmyadmin/commit/873ffa3ffed233754b69ba5df7a2... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/DatabaseInterface.class.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: d8d4a8062aea09023d3950691a5a8ce1312ab1a4 https://github.com/phpmyadmin/phpmyadmin/commit/d8d4a8062aea09023d3950691a5a... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit 'd0e3ab3' into QA_4_2
Commit: 4e7fbc287c0cb366b41ffecf9af667b67778cf1c https://github.com/phpmyadmin/phpmyadmin/commit/4e7fbc287c0cb366b41ffecf9af6... Author: josep constanti jconstanti@ovi.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M po/ca.po
Log Message: ----------- Translated using Weblate (Catalan)
Currently translated at 88.3% (2446 of 2768 strings)
[CI skip]
Commit: a5516f3b3470d94328bda52376811926d77cddef https://github.com/phpmyadmin/phpmyadmin/commit/a5516f3b3470d94328bda5237681... Author: Weblate noreply@weblate.org Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/DatabaseInterface.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 83e322352401cbe18c6674dd489a1a3704466820 https://github.com/phpmyadmin/phpmyadmin/commit/83e322352401cbe18c6674dd489a... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit '8186a0e'
Commit: 1ca706fd1ec74f88aa61ed4345c9be0617ca3486 https://github.com/phpmyadmin/phpmyadmin/commit/1ca706fd1ec74f88aa61ed4345c9... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit '319aac3'
Commit: a00cc2b106177127973bd856d6901886d8c57641 https://github.com/phpmyadmin/phpmyadmin/commit/a00cc2b106177127973bd856d690... Author: Michal Čihař michal@cihar.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 93.7% (2787 of 2973 strings)
[CI skip]
Commit: dde9ca7c7911868251776d4c42ee4f7ba70cd872 https://github.com/phpmyadmin/phpmyadmin/commit/dde9ca7c7911868251776d4c42ee... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/DatabaseInterface.class.php
Log Message: ----------- Fix merge conflicts
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: b906e511128d19107be04f44a1343099f834a1bc https://github.com/phpmyadmin/phpmyadmin/commit/b906e511128d19107be04f44a134... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit 'd8d4a80'
Commit: 387f6aa273541d04fdbc69a0bacd5df442d1bfd4 https://github.com/phpmyadmin/phpmyadmin/commit/387f6aa273541d04fdbc69a0bacd... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M po/cs.po
Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Commit: ef33a839fb8536ecbfc19be243e5b3e20bd0c5eb https://github.com/phpmyadmin/phpmyadmin/commit/ef33a839fb8536ecbfc19be243e5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M libraries/relation.lib.php
Log Message: ----------- Avoid accessing undefined indexes
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 3334ca3ce6e7542ed5ac26e27a86a3d2b3d5d41b https://github.com/phpmyadmin/phpmyadmin/commit/3334ca3ce6e7542ed5ac26e27a86... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M libraries/db_designer.lib.php
Log Message: ----------- bug #4564 Designer: spaces in table name with edit table link generates bad links
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: e28912d49e50071cba9632047ed3704f57d4c652 https://github.com/phpmyadmin/phpmyadmin/commit/e28912d49e50071cba9632047ed3... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M libraries/core.lib.php
Log Message: ----------- bug #4557 PHP fatal error, undefined function __()
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 35b228d534a6db8d3de266c9eb22ed7706378be5 https://github.com/phpmyadmin/phpmyadmin/commit/35b228d534a6db8d3de266c9eb22... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M libraries/core.lib.php
Log Message: ----------- Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 1e21d7b0dad85dac0e1ca8c6852510e2d178e2dc https://github.com/phpmyadmin/phpmyadmin/commit/1e21d7b0dad85dac0e1ca8c68525... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/tbl_chart.js
Log Message: ----------- bug #4568 Date displayed incorrectly when charting a timeline
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: c678cc5bb09d2477671ff33f71655f726abf1764 https://github.com/phpmyadmin/phpmyadmin/commit/c678cc5bb09d2477671ff33f7165... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/tbl_chart.js
Log Message: ----------- Merge branch 'QA_4_2'
Commit: 29ec69c849e1db90724a3c3ed62356ea5fe96a59 https://github.com/phpmyadmin/phpmyadmin/commit/29ec69c849e1db90724a3c3ed623... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths: M ChangeLog M db_datadict.php M import.php M js/navigation.js M js/server_status_monitor.js M js/tbl_chart.js M libraries/Config.class.php M libraries/DatabaseInterface.class.php M libraries/core.lib.php M libraries/db_designer.lib.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportLatex.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/relation.lib.php M libraries/tbl_columns_definition_form.lib.php M po/ca.po M po/cs.po M server_privileges.php M test/classes/plugin/export/PMA_ExportHtmlword_test.php
Log Message: ----------- Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a540e6ba878b...29ec69c849e1
-
Ann + J.M