Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2c19d17ce168b5ad1c4d3d1b8b33bd4b71bf23e4 https://github.com/phpmyadmin/phpmyadmin/commit/2c19d17ce168b5ad1c4d3d1b8b33... Author: Marc Delisle marc@infomarc.info Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.3.2-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 24d2e4fa95c598ef91d50b8269e034f102a2586a https://github.com/phpmyadmin/phpmyadmin/commit/24d2e4fa95c598ef91d50b8269e0... Author: Marc Delisle marc@infomarc.info Date: 2014-12-08 (Mon, 08 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- 4.3.1 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 3eb3ce396bbd63e2f68de655511bdb6543558382 https://github.com/phpmyadmin/phpmyadmin/commit/3eb3ce396bbd63e2f68de655511b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
Log Message: ----------- bug #4628 PHP error while exporting schema as PDF
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 55488bf86f9ae747db602d781e0a2e8b9e030f39 https://github.com/phpmyadmin/phpmyadmin/commit/55488bf86f9ae747db602d781e0a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths: M ChangeLog M libraries/select_server.lib.php
Log Message: ----------- bug #4631 Server selector submits two server parameter values
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 093be4b1ee8dac79f5d2270e72efa610ab5077bd https://github.com/phpmyadmin/phpmyadmin/commit/093be4b1ee8dac79f5d2270e72ef... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths: M test/libraries/PMA_select_server_test.php
Log Message: ----------- Fix tests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: e9b9526199577f9f1524114bc16cb1ea53d330c4 https://github.com/phpmyadmin/phpmyadmin/commit/e9b9526199577f9f1524114bc16c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths: M ChangeLog M js/functions.js
Log Message: ----------- #4629 Problem with custom SQL queries using cookie authentication
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 7deba11168a98494477de6761bcd2e756dcb0983 https://github.com/phpmyadmin/phpmyadmin/commit/7deba11168a98494477de6761bcd... Author: Marc Delisle marc@infomarc.info Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths: M libraries/Menu.class.php
Log Message: ----------- Undefined index central_columnswork
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 82c04dc0bd4274fdb9e35ae1371c1df079b8226d https://github.com/phpmyadmin/phpmyadmin/commit/82c04dc0bd4274fdb9e35ae1371c... Author: Marc Delisle marc@infomarc.info Date: 2014-12-09 (Tue, 09 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: ce2474f108e934f51b6a6e58a76ecd761db3f0b1 https://github.com/phpmyadmin/phpmyadmin/commit/ce2474f108e934f51b6a6e58a76e... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M libraries/Util.class.php
Log Message: ----------- bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query. Url may not necessarily have a query part
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 7ee1af4fc6f577fd48768230fd8b62e7e95ef812 https://github.com/phpmyadmin/phpmyadmin/commit/7ee1af4fc6f577fd48768230fd8b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M ChangeLog M libraries/Menu.class.php
Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 2483e2fab1954bb0a38b47089f3622ec332a49fa https://github.com/phpmyadmin/phpmyadmin/commit/2483e2fab1954bb0a38b47089f36... Author: Sevdimali İsa sevdimaliisayev@mail.ru Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M po/az.po
Log Message: ----------- Translated using Weblate (Azerbaijani)
Currently translated at 53.1% (1584 of 2978 strings)
[CI skip]
Commit: 52f19e25613a509df25eaa74c0eb9c5cead54c15 https://github.com/phpmyadmin/phpmyadmin/commit/52f19e25613a509df25eaa74c0eb... Author: Weblate noreply@weblate.org Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M libraries/Util.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 24e7bf07217ce1945793e95621df817522882517 https://github.com/phpmyadmin/phpmyadmin/commit/24e7bf07217ce1945793e95621df... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry for bug #4632
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: f39a4e10cd4ad8f0ee383e7c931bcf82276d7217 https://github.com/phpmyadmin/phpmyadmin/commit/f39a4e10cd4ad8f0ee383e7c931b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M ChangeLog M libraries/insert_edit.lib.php
Log Message: ----------- bug #4633 Wrong parameter in fetchValue
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: f1d9539a7dfe879593d360d8fdf5c25742382195 https://github.com/phpmyadmin/phpmyadmin/commit/f1d9539a7dfe879593d360d8fdf5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M po/az.po
Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 9f58a8188a334c7865509218a76a7c068ab16f0e https://github.com/phpmyadmin/phpmyadmin/commit/9f58a8188a334c7865509218a76a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M test/libraries/PMA_insert_edit_test.php
Log Message: ----------- Update tests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 8795f7a104e8bfa85c6df14a68927f0a9d88efaf https://github.com/phpmyadmin/phpmyadmin/commit/8795f7a104e8bfa85c6df14a6892... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M ChangeLog M js/error_report.js
Log Message: ----------- bug #4634 Error reporting creates an infinite loop
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 7a1c989b437695ed84e88bc7f80b6db6c872cdd0 https://github.com/phpmyadmin/phpmyadmin/commit/7a1c989b437695ed84e88bc7f80b... Author: Nisarg Jhaveri nisargjhaveri@gmail.com Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M libraries/relation.lib.php
Log Message: ----------- Fix bug 4635
Signed-off-by: Nisarg Jhaveri nisargjhaveri@gmail.com
Commit: ebc7e62d406cbac44b2f8f09857715c89b96f578 https://github.com/phpmyadmin/phpmyadmin/commit/ebc7e62d406cbac44b2f8f098577... Author: Marc Delisle marc@infomarc.info Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8260ae8b7507415e3dcac9d5ec2704150c79d8cb https://github.com/phpmyadmin/phpmyadmin/commit/8260ae8b7507415e3dcac9d5ec27... Author: Marc Delisle marc@infomarc.info Date: 2014-12-10 (Wed, 10 Dec 2014)
Changed paths: M ChangeLog M doc/setup.rst
Log Message: ----------- Bug #4640 Incorrect reference to PHP 6
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 3dc13b12729adb278dd768deee31d35d12940418 https://github.com/phpmyadmin/phpmyadmin/commit/3dc13b12729adb278dd768deee31... Author: Kyeong Su Shin cdac1234@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 82.6% (2461 of 2978 strings)
[CI skip]
Commit: 077916c82a1c25f45b0803b22d14bd65d08f926c https://github.com/phpmyadmin/phpmyadmin/commit/077916c82a1c25f45b0803b22d14... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/import/ImportOds.class.php
Log Message: ----------- bug #3794 failure to handle repeating empty columns when importing ODS
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: cb40e81e9ca367678eaabcdbe1dc50c4ae2ce8cd https://github.com/phpmyadmin/phpmyadmin/commit/cb40e81e9ca367678eaabcdbe1dc... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M ChangeLog M doc/setup.rst M libraries/relation.lib.php M po/ko.po
Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 9b134ebf43f018880bf8c886d3c7fd6dfc0f6565 https://github.com/phpmyadmin/phpmyadmin/commit/9b134ebf43f018880bf8c886d3c7... Author: Aputsiaĸ Niels Janussen aj@isit.gl Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M po/da.po
Log Message: ----------- Translated using Weblate (Danish)
Currently translated at 98.3% (2929 of 2978 strings)
[CI skip]
Commit: 7e90cbc8c4691966bbf50212d82ec8722f300544 https://github.com/phpmyadmin/phpmyadmin/commit/7e90cbc8c4691966bbf50212d82e... Author: Dongyoung Kim dckyoung@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M po/ko.po
Log Message: ----------- Translated using Weblate (Korean)
Currently translated at 83.0% (2473 of 2978 strings)
[CI skip]
Commit: fef9bfbde16968b2f6ce9a46c2292a588b82b947 https://github.com/phpmyadmin/phpmyadmin/commit/fef9bfbde16968b2f6ce9a46c229... Author: Weblate noreply@weblate.org Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/import/ImportOds.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 4f1ce1004eb6429c4c9c4c758a53e806609e045d https://github.com/phpmyadmin/phpmyadmin/commit/4f1ce1004eb6429c4c9c4c758a53... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M ChangeLog M js/export.js M libraries/display_export.lib.php
Log Message: ----------- bug #4638 Default Export Method setting broken
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 43db57bc19cce7f167874a902cef5b1de788d2a0 https://github.com/phpmyadmin/phpmyadmin/commit/43db57bc19cce7f167874a902cef... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M po/da.po M po/ko.po
Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 7de549b7f349311becba18b8756c918f9f4a0ecf https://github.com/phpmyadmin/phpmyadmin/commit/7de549b7f349311becba18b8756c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php
Log Message: ----------- bug #4639 Export SQL missing indentation first field
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 9555a21a3dc873844a4cb5cf59c5194eb920c3a5 https://github.com/phpmyadmin/phpmyadmin/commit/9555a21a3dc873844a4cb5cf59c5... Author: Marc Delisle marc@infomarc.info Date: 2014-12-11 (Thu, 11 Dec 2014)
Changed paths: M libraries/structure.lib.php
Log Message: ----------- Another instance of Undefined index central_columnswork
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8cb3b720ba2f58e1410faaf3a23d6490db0a9d7e https://github.com/phpmyadmin/phpmyadmin/commit/8cb3b720ba2f58e1410faaf3a23d... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M themes/pmahomme/css/common.css.php
Log Message: ----------- Fix #4637 Field Alignment
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: eb69c015ac61283e972d0821fe9cfc2c0f70e4e0 https://github.com/phpmyadmin/phpmyadmin/commit/eb69c015ac61283e972d0821fe9c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M libraries/Util.class.php
Log Message: ----------- #4644 Error when browsing tables
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 6f19a5711abb3c42bf8b25ad6152124d62219bd8 https://github.com/phpmyadmin/phpmyadmin/commit/6f19a5711abb3c42bf8b25ad6152... Author: Kushagra Pandey kushagra4296@gmail.com Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M po/hi.po
Log Message: ----------- Translated using Weblate (Hindi)
Currently translated at 42.7% (1273 of 2978 strings)
[CI skip]
Commit: 85678bf199598c7ddf9b405fcc2b71da741d4511 https://github.com/phpmyadmin/phpmyadmin/commit/85678bf199598c7ddf9b405fcc2b... Author: Weblate noreply@weblate.org Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M libraries/Util.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 5a3449b6942146b523f08c0a95277f601f63fe9d https://github.com/phpmyadmin/phpmyadmin/commit/5a3449b6942146b523f08c0a9527... Author: Marc Delisle marc@infomarc.info Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M themes/pmahomme/css/common.css.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 28477aa36d24c37d8320ce512d42d15a42e82976 https://github.com/phpmyadmin/phpmyadmin/commit/28477aa36d24c37d8320ce512d42... Author: Marc Delisle marc@infomarc.info Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.3.2 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 942b9a60c822c4899ccf5e950e0a6c932e4179bf https://github.com/phpmyadmin/phpmyadmin/commit/942b9a60c822c4899ccf5e950e0a... Author: Marc Delisle marc@infomarc.info Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M doc/setup.rst M js/error_report.js M js/export.js M js/functions.js M libraries/Config.class.php M libraries/Menu.class.php M libraries/Util.class.php M libraries/display_export.lib.php M libraries/insert_edit.lib.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/import/ImportOds.class.php M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php M libraries/relation.lib.php M libraries/select_server.lib.php M libraries/structure.lib.php M po/az.po M po/da.po M po/hi.po M po/ko.po M test/libraries/PMA_insert_edit_test.php M test/libraries/PMA_select_server_test.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'MAINT_4_3_2' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a63de67e2f1f...942b9a60c822
-
Marc Delisle