Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: cb7c703c03f656debcea2a16468bd53660fc888e https://github.com/phpmyadmin/phpmyadmin/commit/cb7c703c03f656debcea2a16468b... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php M libraries/structure.lib.php
Log Message: ----------- Fix XSS in recent/favorite tables list feature
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 42a65a5ab6166c4ce15cf4e74e80b7acca7c8e08 https://github.com/phpmyadmin/phpmyadmin/commit/42a65a5ab6166c4ce15cf4e74e80... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-06 (Fri, 06 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php
Log Message: ----------- Trim some trailing space
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 199982f0d0c418f9913f83c6808cdec5976bdb7f https://github.com/phpmyadmin/phpmyadmin/commit/199982f0d0c418f9913f83c6808c... Author: Marc Delisle marc@infomarc.info Date: 2014-06-08 (Sun, 08 Jun 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.4-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 82e682899f10ec52da899059f20a921584497e17 https://github.com/phpmyadmin/phpmyadmin/commit/82e682899f10ec52da899059f20a... Author: Marco Pozzato ironpotts@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M po/it.po
Log Message: ----------- Translated using Weblate (Italian)
Currently translated at 87.3% (2419 of 2770)
Commit: e78abd44751b881d1777946bbc1fc7a78ac34b27 https://github.com/phpmyadmin/phpmyadmin/commit/e78abd44751b881d1777946bbc1f... Author: Weblate noreply@weblate.org Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: b55719206b702438e0e57d71c5cf5e974188a959 https://github.com/phpmyadmin/phpmyadmin/commit/b55719206b702438e0e57d71c5cf... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M libraries/plugin_interface.lib.php
Log Message: ----------- Remove SQL format for multi-table queries.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 4a10628d8179a18f09b0ba4c489c946c77e83981 https://github.com/phpmyadmin/phpmyadmin/commit/4a10628d8179a18f09b0ba4c489c... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Update ChangeLog.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: b95aa6cdfddbb4e4bf0c771f692631b09a14601b https://github.com/phpmyadmin/phpmyadmin/commit/b95aa6cdfddbb4e4bf0c771f6926... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M js/functions.js
Log Message: ----------- Remove trailing whitespaces.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 8295af58b592a422e950dee9961accce0c8063db https://github.com/phpmyadmin/phpmyadmin/commit/8295af58b592a422e950dee9961a... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Update ChangeLog.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 307dd3b79898f8d8fcd8edc0a84e8ff8aa8c412f https://github.com/phpmyadmin/phpmyadmin/commit/307dd3b79898f8d8fcd8edc0a84e... Author: Isaac Bennetch bennetch@gmail.com Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths: M ChangeLog M export.php M libraries/plugins/export/ExportMediawiki.class.php
Log Message: ----------- Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings
Signed-off-by: Isaac Bennetch bennetch@gmail.com
Commit: d2c184a3c655db811a4a1eccb47205dceab27434 https://github.com/phpmyadmin/phpmyadmin/commit/d2c184a3c655db811a4a1eccb472... Author: Michal Čihař michal@cihar.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M ChangeLog M export.php M libraries/plugins/export/ExportMediawiki.class.php
Log Message: ----------- Merge pull request #1216 from ibennetch/4449
Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings
Commit: 14d66a013772b8669132e3d5079c288a294f0fbf https://github.com/phpmyadmin/phpmyadmin/commit/14d66a013772b8669132e3d5079c... Author: Yasar yashha2@gmail.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 93.9% (2603 of 2770)
Commit: 85d3b08ba7a45fc39e447818d2ec5807bbcd4c79 https://github.com/phpmyadmin/phpmyadmin/commit/85d3b08ba7a45fc39e447818d2ec... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 50.5% (1400 of 2770)
Commit: 2cb47afab9f65a5dbcc2b1c61cd35c2407c90308 https://github.com/phpmyadmin/phpmyadmin/commit/2cb47afab9f65a5dbcc2b1c61cd3... Author: கணேஷ் குமார் GANESHTHEONE@gmail.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M po/ta.po
Log Message: ----------- Translated using Weblate (Tamil)
Currently translated at 31.0% (860 of 2770)
Commit: 5a6dad0aba320e29edee5df0526b7afd234d6cde https://github.com/phpmyadmin/phpmyadmin/commit/5a6dad0aba320e29edee5df0526b... Author: Weblate noreply@weblate.org Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M ChangeLog M export.php M libraries/plugins/export/ExportMediawiki.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 15b5051928ffc4dd994f0c94a26c00a3f73e6fb7 https://github.com/phpmyadmin/phpmyadmin/commit/15b5051928ffc4dd994f0c94a26c... Author: Michal Čihař michal@cihar.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- Merge branch 'b4442_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2
Conflicts: ChangeLog
Commit: e71869daf150bac82b4f2547d929630fe30a82ea https://github.com/phpmyadmin/phpmyadmin/commit/e71869daf150bac82b4f2547d929... Author: Michal Čihař michal@cihar.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M ChangeLog M libraries/plugin_interface.lib.php
Log Message: ----------- Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2
Conflicts: ChangeLog
Commit: ff688b18fb4083c6c18043f207c0f6015a54d0f4 https://github.com/phpmyadmin/phpmyadmin/commit/ff688b18fb4083c6c18043f207c0... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M ChangeLog M export.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php
Log Message: ----------- Bug-4448: Dump binary columns in hexadecimal notation not working and hex_for_blob -> hex_for_binary
Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com
Commit: 478a105ed6eb69d00d11a3961c6fc8b1eee1b946 https://github.com/phpmyadmin/phpmyadmin/commit/478a105ed6eb69d00d11a3961c6f... Author: Marc Delisle marc@infomarc.info Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M ChangeLog M export.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php
Log Message: ----------- Merge pull request #1218 from D-storm/bug-4448
Bug-4448: Dump binary columns in hexadecimal notation not working
Commit: 92aaa7f9003029eec9401a611291e2c4cefa5b06 https://github.com/phpmyadmin/phpmyadmin/commit/92aaa7f9003029eec9401a611291... Author: Marc Delisle marc@infomarc.info Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@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
Log Message: ----------- Update po files
Commit: e9f7dafd21f0c4c8e8e594191d837c32e9b5dfca https://github.com/phpmyadmin/phpmyadmin/commit/e9f7dafd21f0c4c8e8e594191d83... Author: Domen mitenem@outlook.com Date: 2014-06-10 (Tue, 10 Jun 2014)
Changed paths: M po/sl.po
Log Message: ----------- Translated using Weblate (Slovenian)
Currently translated at 100.0% (2770 of 2770)
Commit: 59bb241cf13fd9a02626eb73daf5a5ca8476b29e https://github.com/phpmyadmin/phpmyadmin/commit/59bb241cf13fd9a02626eb73daf5... Author: Kristjan Räts kristjanrats@gmail.com Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths: M po/et.po
Log Message: ----------- Translated using Weblate (Estonian)
Currently translated at 100.0% (2770 of 2770)
Commit: b252cb99812f33f76a27e596fa559a14c5a4b6e6 https://github.com/phpmyadmin/phpmyadmin/commit/b252cb99812f33f76a27e596fa55... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Use better source of entropy for mcrypt IV
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 7cba81de271d62bdf93ded7598709702a96f92d7 https://github.com/phpmyadmin/phpmyadmin/commit/7cba81de271d62bdf93ded759870... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Regenerate cookie encryption IV for every session
The IV for cookie encryption was generated just once for every browser and kept in a cookie. Generating it for every session is much better to avoid information leaks (eg. that same user has logged in).
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 29094da2043956059bd4eb897db4f033912869b7 https://github.com/phpmyadmin/phpmyadmin/commit/29094da2043956059bd4eb897db4... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M po/cs.po
Log Message: ----------- Translated using Weblate (Czech)
Currently translated at 100.0% (2770 of 2770)
Commit: 88910393e5e2b1d7cbc5c64cd8b68febaf524b4d https://github.com/phpmyadmin/phpmyadmin/commit/88910393e5e2b1d7cbc5c64cd8b6... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 99.9% (2768 of 2770)
Commit: ffb543b6e347e49d73142c52112edf1a44d1464a https://github.com/phpmyadmin/phpmyadmin/commit/ffb543b6e347e49d73142c52112e... Author: Marc Delisle marc@infomarc.info Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (2770 of 2770)
Commit: bfb0f98a918589227023bfb0e6185241fdb01b49 https://github.com/phpmyadmin/phpmyadmin/commit/bfb0f98a918589227023bfb0e618... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 51.1% (1417 of 2770)
Commit: 480b992aae4e0a312c64f90ebb2b994b082bf16d https://github.com/phpmyadmin/phpmyadmin/commit/480b992aae4e0a312c64f90ebb2b... Author: Matías Bellone matiasbellone+weblate@gmail.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M po/es.po
Log Message: ----------- Translated using Weblate (Spanish)
Currently translated at 100.0% (2770 of 2770)
Commit: e664c931d27d65ee62d84d957126fadcb4fa3337 https://github.com/phpmyadmin/phpmyadmin/commit/e664c931d27d65ee62d84d957126... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (2770 of 2770)
Commit: 76c051bcea0bcb5d897c8dc16a4718e3a14da134 https://github.com/phpmyadmin/phpmyadmin/commit/76c051bcea0bcb5d897c8dc16a47... Author: Weblate noreply@weblate.org Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 953c7415ad548820f605c3beea9c556629f137e2 https://github.com/phpmyadmin/phpmyadmin/commit/953c7415ad548820f605c3beea9c... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Separate check for password cookie
Otherwise it would not be possible to recall user name.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: bc603150239888637f21b3fef821d9cde8f65565 https://github.com/phpmyadmin/phpmyadmin/commit/bc603150239888637f21b3fef821... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message: ----------- Adjust tests to new IV logic
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 2bd95448787239e66ab87e4f9cd3cb47d603f5dc https://github.com/phpmyadmin/phpmyadmin/commit/2bd95448787239e66ab87e4f9cd3... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M libraries/DatabaseInterface.class.php
Log Message: ----------- bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys
Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com
Commit: 2b8bb91bc3a66e2014ea078a68a0962708609eee https://github.com/phpmyadmin/phpmyadmin/commit/2b8bb91bc3a66e2014ea078a68a0... Author: Michal Čihař michal@cihar.com Date: 2014-06-12 (Thu, 12 Jun 2014)
Changed paths: M libraries/DatabaseInterface.class.php
Log Message: ----------- Merge pull request #1223 from D-storm/bug-4454
bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no da...
Commit: 4c4cee598a4c4a332424340ce1833213f70ea2ff https://github.com/phpmyadmin/phpmyadmin/commit/4c4cee598a4c4a332424340ce183... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths: M ChangeLog M libraries/sqlparser.lib.php
Log Message: ----------- bugfix: insert queries not showing affected row counts
Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com
Commit: 0306e2bd887454fa4e200142416ea4dea2adbfd1 https://github.com/phpmyadmin/phpmyadmin/commit/0306e2bd887454fa4e200142416e... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths: M js/functions.js
Log Message: ----------- Fix bug#4450 Query is duplicated on Ctrl+Enter
Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com
Commit: 531fff09fe4ba8ae50022edfb35d5b6f3fdb8281 https://github.com/phpmyadmin/phpmyadmin/commit/531fff09fe4ba8ae50022edfb35d... Author: Marc Delisle marc@infomarc.info Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths: M ChangeLog M import.php
Log Message: ----------- bug #4405 Cannot import (open_basedir): fix another case
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: ddadc4853ed2f58f59883965c983dc2d2a6b76f9 https://github.com/phpmyadmin/phpmyadmin/commit/ddadc4853ed2f58f59883965c983... Author: Isaac Bennetch bennetch@gmail.com Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths: M ChangeLog M libraries/sqlparser.lib.php
Log Message: ----------- Merge branch 'D-storm-so' into QA_4_2
bug-fix: 4457 SQL tab - Insert queries not showing affected row count
Conflicts: ChangeLog
Commit: a7703a36441f764f7cdadc0a1b9ee74b477df546 https://github.com/phpmyadmin/phpmyadmin/commit/a7703a36441f764f7cdadc0a1b9e... Author: Panagiotis Papazoglou papaz_p@yahoo.com Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths: M po/el.po
Log Message: ----------- Translated using Weblate (Greek)
Currently translated at 100.0% (2770 of 2770)
Commit: 47709d414ef88a5ff63c0069c23e9d8b427bb68e https://github.com/phpmyadmin/phpmyadmin/commit/47709d414ef88a5ff63c0069c23e... Author: Christian Simon simon@swine.de Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths: M js/error_report.js M js/server_privileges.js
Log Message: ----------- Fix 'token mismatch' due to missing server parameter for some AJAX requests
* server_privileges user duplicate request * js error_reporting * cf. https://sourceforge.net/p/phpmyadmin/bugs/3893
Signed-off-by: Christian Simon simon@swine.de Signed-off-by: Marc Delisle marc@infomarc.info
Commit: a33fcad037f58ddddb9714f186f12b49753062be https://github.com/phpmyadmin/phpmyadmin/commit/a33fcad037f58ddddb9714f186f1... Author: Marc Delisle marc@infomarc.info Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: aaeed7099738e5696b86f44ca81f6725e541985e https://github.com/phpmyadmin/phpmyadmin/commit/aaeed7099738e5696b86f44ca81f... Author: Haval Abdulkarim haval.abdulkarim@gmail.com Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths: M po/en_GB.po
Log Message: ----------- Translated using Weblate (English (United Kingdom))
Currently translated at 89.6% (2483 of 2770)
Commit: 6c7efa1db71560534061941036f82c8ba80db07d https://github.com/phpmyadmin/phpmyadmin/commit/6c7efa1db71560534061941036f8... Author: Haval Abdulkarim haval.abdulkarim@gmail.com Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths: M po/ckb.po
Log Message: ----------- Translated using Weblate (Kurdish Sorani)
Currently translated at 18.6% (517 of 2770)
Commit: 7279e1b7f84e47838113bd9a5b5c85ce63d3eefd https://github.com/phpmyadmin/phpmyadmin/commit/7279e1b7f84e47838113bd9a5b5c... Author: Weblate noreply@weblate.org Date: 2014-06-14 (Sat, 14 Jun 2014)
Changed paths: M ChangeLog M js/error_report.js M js/server_privileges.js
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 7e5e4d026d09f80c2ad4cbbb9de1dac4ebe1d54b https://github.com/phpmyadmin/phpmyadmin/commit/7e5e4d026d09f80c2ad4cbbb9de1... Author: Marc Delisle marc@infomarc.info Date: 2014-06-15 (Sun, 15 Jun 2014)
Changed paths: M ChangeLog M libraries/sql.lib.php
Log Message: ----------- bug #4435 WHERE clause can be undefined
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 9ca37845681f05c1aef5e8a62254fd2271441a80 https://github.com/phpmyadmin/phpmyadmin/commit/9ca37845681f05c1aef5e8a62254... Author: Chirayu Chiripal chirayu.chiripal@gmail.com Date: 2014-06-15 (Sun, 15 Jun 2014)
Changed paths: M ChangeLog M export.php
Log Message: ----------- fix: sql export views as tables getting ignored
Signed-off-by: Chirayu Chiripal chirayu.chiripal@gmail.com
Commit: 875df37df2b2f67fe5e77164e49565168f91bd31 https://github.com/phpmyadmin/phpmyadmin/commit/875df37df2b2f67fe5e77164e495... Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: 2014-06-17 (Tue, 17 Jun 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2770 of 2770)
Commit: 1b56db7dafc4b5978300849f04f7c87ebca77b14 https://github.com/phpmyadmin/phpmyadmin/commit/1b56db7dafc4b5978300849f04f7... Author: Marc Delisle marc@infomarc.info Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths: M ChangeLog M export.php
Log Message: ----------- Merge pull request #1231 from D-storm/sql_views
fix: sql export views as tables getting ignored
Commit: eeed348ddc4bc28e909a1187879735441f715af9 https://github.com/phpmyadmin/phpmyadmin/commit/eeed348ddc4bc28e909a11878797... Author: cherbib mehdi mehdi.cherbib@live.fr Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths: M po/ar.po
Log Message: ----------- Translated using Weblate (Arabic)
Currently translated at 41.0% (1138 of 2770)
Commit: 7b2d66f08c565a7a474a985ebafe9f3a04811f9e https://github.com/phpmyadmin/phpmyadmin/commit/7b2d66f08c565a7a474a985ebafe... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 52.0% (1441 of 2770)
Commit: 8b9386467003b6c87097e4df7d24d1561b05abe2 https://github.com/phpmyadmin/phpmyadmin/commit/8b9386467003b6c87097e4df7d24... Author: Rui Ralha geral@prodiag.pt Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths: M po/pt.po
Log Message: ----------- Translated using Weblate (Portuguese)
Currently translated at 63.2% (1751 of 2770)
Commit: c01de87ef6825754f0ab09eb08f1bbc72c1ed295 https://github.com/phpmyadmin/phpmyadmin/commit/c01de87ef6825754f0ab09eb08f1... Author: Weblate noreply@weblate.org Date: 2014-06-18 (Wed, 18 Jun 2014)
Changed paths: M ChangeLog M export.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: d18a2dd9faad7e0e96df799b59e16ef587afb838 https://github.com/phpmyadmin/phpmyadmin/commit/d18a2dd9faad7e0e96df799b59e1... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php
Log Message: ----------- Fix XSS in PMA_RecentFavoriteTable::getHtmlList()
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: d4f754c937f9e2c0beadff5b2e38215dde1d6a79 https://github.com/phpmyadmin/phpmyadmin/commit/d4f754c937f9e2c0beadff5b2e38... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths: M libraries/navigation/Navigation.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php
Log Message: ----------- Fix XSS in Hide navigation items feature
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: c68ed5c51ba836f3beb1deec29d91d158acbde3d https://github.com/phpmyadmin/phpmyadmin/commit/c68ed5c51ba836f3beb1deec29d9... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-06-19 (Thu, 19 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Add Changelog section for 4.2.4.0, list bugs 4464, 4465
Signed-off-by: Ann + J.M phpMyAdmin@ZweiSteinSoft.de
Commit: 767dfebed2190f5994ccff67b48d8863b8a95750 https://github.com/phpmyadmin/phpmyadmin/commit/767dfebed2190f5994ccff67b48d... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths: M libraries/RecentFavoriteTable.class.php M libraries/navigation/Navigation.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php M libraries/structure.lib.php
Log Message: ----------- Merge commit 'd4f754c' into MAINT_4_2_4
Commit: 02aff9dbeade29fcb39eca34aab4a80f9e2608e4 https://github.com/phpmyadmin/phpmyadmin/commit/02aff9dbeade29fcb39eca34aab4... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 07d1b055892efecee2554b20583ec0e0d80de46f https://github.com/phpmyadmin/phpmyadmin/commit/07d1b055892efecee2554b20583e... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.4 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 6a69234939054d53e9a4b62a7c231a9e1f8443e8 https://github.com/phpmyadmin/phpmyadmin/commit/6a69234939054d53e9a4b62a7c23... Author: Marc Delisle marc@infomarc.info Date: 2014-06-20 (Fri, 20 Jun 2014)
Changed paths: M ChangeLog M README M doc/conf.py M export.php M import.php M js/error_report.js M js/functions.js M js/server_privileges.js M libraries/Config.class.php M libraries/DatabaseInterface.class.php M libraries/RecentFavoriteTable.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/navigation/Navigation.class.php M libraries/navigation/Nodes/Node_DatabaseChild.class.php M libraries/plugin_interface.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportSql.class.php M libraries/sql.lib.php M libraries/sqlparser.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@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
Log Message: ----------- Merge branch 'MAINT_4_2_4' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9d13e8c60646...6a6923493905