Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282 https://github.com/phpmyadmin/phpmyadmin/commit/bfdd89f63ab88a83f88ab8a2d0ae... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-12 (Fri, 12 Dec 2014)
Changed paths: M ChangeLog M js/ajax.js
Log Message: ----------- bug #4642 phpmyadmin often fails to load due to specific load order
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: b04edfe2f8492ac4e194dd8c903f4019be6ae82f https://github.com/phpmyadmin/phpmyadmin/commit/b04edfe2f8492ac4e194dd8c903f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php M libraries/Util.class.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/structure.lib.php M po/hi.po M po/ko.po M po/pl.po M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'QA_4_3' into Bug4642
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 33c819b8b46c14e1e1708bf369d5d9d149f3cd47 https://github.com/phpmyadmin/phpmyadmin/commit/33c819b8b46c14e1e1708bf369d5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-15 (Mon, 15 Dec 2014)
Changed paths: M js/ajax.js M libraries/Scripts.class.php M test/classes/PMA_Scripts_test.php
Log Message: ----------- Remove token from JS file requests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 8b695200e79e02a5731732b160746277b9c79c73 https://github.com/phpmyadmin/phpmyadmin/commit/8b695200e79e02a5731732b16074... Author: A. Voogt a.voogt@hccnet.nl Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2978 of 2978 strings)
[CI skip]
Commit: 3960df34bce1a7e03261b8e83705bc59825d4320 https://github.com/phpmyadmin/phpmyadmin/commit/3960df34bce1a7e03261b8e83705... Author: Marc Delisle marc@infomarc.info Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.3.4-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: fb731ad37bed205ef44875de0c79362e28e56bbc https://github.com/phpmyadmin/phpmyadmin/commit/fb731ad37bed205ef44875de0c79... Author: Michal Čihař michal@cihar.com Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Merge remote-tracking branch 'weblate-4.3/QA_4_3' into QA_4_3
Conflicts: po/nl.po
Commit: 2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd https://github.com/phpmyadmin/phpmyadmin/commit/2dcb1c9b0a9c6603a3bb39fb49f5... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-21 (Sun, 21 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php
Log Message: ----------- Fix #4645 Import of export created with mysqldump
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: bac38f3ef6ca06b24a650eb4361159e94157d99e https://github.com/phpmyadmin/phpmyadmin/commit/bac38f3ef6ca06b24a650eb43611... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths: M ChangeLog M libraries/config/Validator.class.php
Log Message: ----------- bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: fbe587ce7386de47f728ad8c8f167fc945e18501 https://github.com/phpmyadmin/phpmyadmin/commit/fbe587ce7386de47f728ad8c8f16... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths: M ChangeLog M import.php
Log Message: ----------- bug #4661 Drag and drop file import always fails
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fcec... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths: M ChangeLog M js/console.js
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 66c7c04582e01b0a6e1f968b98197533c0dd9efc https://github.com/phpmyadmin/phpmyadmin/commit/66c7c04582e01b0a6e1f968b9819... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths: M themes/pmahomme/css/common.css.php
Log Message: ----------- Remove borders in table browse tab (linked to #4648).
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: f735d2360b91c5cdf101cf8d103eaf9765395295 https://github.com/phpmyadmin/phpmyadmin/commit/f735d2360b91c5cdf101cf8d103e... Author: Marc Delisle marc@infomarc.info Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths: M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge pull request #1434 from Tithugues/b4648_qa43_browseTab
Remove borders in table browse tab (linked to #4648).
Commit: 0430ac63371e42fa0847ed78655b48769ba5fc6a https://github.com/phpmyadmin/phpmyadmin/commit/0430ac63371e42fa0847ed78655b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php
Log Message: ----------- #4663 Export missing back ticks for order table name
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 21b63f9af40d2fde8b88eb27c868fd369926cc1f https://github.com/phpmyadmin/phpmyadmin/commit/21b63f9af40d2fde8b88eb27c868... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M js/console.js
Log Message: ----------- Fix js reports: JSONparse Syntax Error: Unexpected token '<'
Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com
Commit: 7cf678f79df2fb017bcb74750cf1108ff4ee55f4 https://github.com/phpmyadmin/phpmyadmin/commit/7cf678f79df2fb017bcb74750cf1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M ChangeLog M libraries/sql.lib.php
Log Message: ----------- bug #4664 select min() displays 1 row, but reports the table amount of rows returned
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: c445794bde26af0374d44ac18a57f546235a9707 https://github.com/phpmyadmin/phpmyadmin/commit/c445794bde26af0374d44ac18a57... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M ChangeLog M libraries/tbl_printview.lib.php M test/libraries/PMA_tbl_printview_test.php
Log Message: ----------- bug #4666 Undefined indexes in table stucture print view of a view
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: a98ec2c16228290f213ec1a85751e058a707891f https://github.com/phpmyadmin/phpmyadmin/commit/a98ec2c16228290f213ec1a85751... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M js/error_report.js
Log Message: ----------- Fix js reports; TypeError: /([a-zA-Z]+):/.exec(...) is null
Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com
Commit: ac6657c1fd4e208e91dbb84a7e878095fbae1adf https://github.com/phpmyadmin/phpmyadmin/commit/ac6657c1fd4e208e91dbb84a7e87... Author: Marc Delisle marc@infomarc.info Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M libraries/Util.class.php M libraries/plugins/export/ExportSql.class.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php
Log Message: ----------- Merge pull request #1435 from madhuracj/Bug4663
#4663 Export missing back ticks for order table name
Commit: a6c53149be8d357283436ad409a217c7c91a3ce4 https://github.com/phpmyadmin/phpmyadmin/commit/a6c53149be8d357283436ad409a2... Author: Marc Delisle marc@infomarc.info Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: af33e8a1443a8a62987b17cca0d5c797cf5d7d6f https://github.com/phpmyadmin/phpmyadmin/commit/af33e8a1443a8a62987b17cca0d5... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M libraries/central_columns.lib.php
Log Message: ----------- fix bug #4665
Signed-off-by: Smita Kumari kumarismita62@gmail.com
Commit: b9cb88c5fc4fd72cce1d0534ad6bb5de5acde060 https://github.com/phpmyadmin/phpmyadmin/commit/b9cb88c5fc4fd72cce1d0534ad6b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M libraries/central_columns.lib.php
Log Message: ----------- Merge pull request #1436 from smita786/QA_4_3
fix bug #4665
Commit: 647078cab3bcf357de6a4cece675d219b78cab12 https://github.com/phpmyadmin/phpmyadmin/commit/647078cab3bcf357de6a4cece675... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- Update ChangeLog.
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 4db61785afde420d0ff8b6036b591fe03b5af95c https://github.com/phpmyadmin/phpmyadmin/commit/4db61785afde420d0ff8b6036b59... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-23 (Tue, 23 Dec 2014)
Changed paths: M po/vls.po
Log Message: ----------- Translated using Weblate (West Flemish)
Currently translated at 0.1% (4 of 2977 strings)
[CI skip]
Commit: 0b927efe4293b0586080f697b044d51d9e17523b https://github.com/phpmyadmin/phpmyadmin/commit/0b927efe4293b0586080f697b044... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/vls.po
Log Message: ----------- Translated using Weblate (West Flemish)
Currently translated at 3.0% (90 of 2977 strings)
[CI skip]
Commit: ec712e1810ba657e1529d4e325f3157039051e1f https://github.com/phpmyadmin/phpmyadmin/commit/ec712e1810ba657e1529d4e325f3... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/kn.po
Log Message: ----------- Translated using Weblate (Kannada)
Currently translated at 0.0% (2 of 2977 strings)
[CI skip]
Commit: 99412808a4c47b051549cf2f6074fbbf24edfeda https://github.com/phpmyadmin/phpmyadmin/commit/99412808a4c47b051549cf2f6074... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/pa.po
Log Message: ----------- Translated using Weblate (Punjabi)
Currently translated at 0.1% (5 of 2977 strings)
[CI skip]
Commit: 9864ae0babc51baaddf11c721baae1cdee518095 https://github.com/phpmyadmin/phpmyadmin/commit/9864ae0babc51baaddf11c721baa... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2977 of 2977 strings)
[CI skip]
Commit: ab1c456bb16ff2a20399d4c4909ff5913e663410 https://github.com/phpmyadmin/phpmyadmin/commit/ab1c456bb16ff2a20399d4c4909f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M libraries/central_columns.lib.php
Log Message: ----------- bug #4668 Remove from central columns error
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: c95dc6d6cb734355253ea89161ea759d64c89759 https://github.com/phpmyadmin/phpmyadmin/commit/c95dc6d6cb734355253ea89161ea... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M libraries/central_columns.lib.php
Log Message: ----------- Use default separator of space between messages
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 7d492ba0119d57042965fccea584b1d86bf3d3b4 https://github.com/phpmyadmin/phpmyadmin/commit/7d492ba0119d57042965fccea584... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M js/error_report.js M libraries/Util.class.php M libraries/central_columns.lib.php M libraries/plugins/export/ExportSql.class.php M po/kn.po M po/nl.po M po/pa.po M po/vls.po M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/common/PMA_quoting_slashing_test.php
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: 42da835e33a918d5232b536ae8f7ef77796e7541 https://github.com/phpmyadmin/phpmyadmin/commit/42da835e33a918d5232b536ae8f7... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/kn.po
Log Message: ----------- Translated using Weblate (Kannada)
Currently translated at 2.7% (83 of 2977 strings)
[CI skip]
Commit: 4f8b3e283fca4fe83fc98c05d7189d56c2a3a0df https://github.com/phpmyadmin/phpmyadmin/commit/4f8b3e283fca4fe83fc98c05d718... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/ru.po
Log Message: ----------- Translated using Weblate (Russian)
Currently translated at 99.4% (2960 of 2977 strings)
[CI skip]
Commit: 33f3976a9e62a80297f0abde86a76afaa1207181 https://github.com/phpmyadmin/phpmyadmin/commit/33f3976a9e62a80297f0abde86a7... Author: Weblate noreply@weblate.org Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M libraries/central_columns.lib.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 48570a6dbdb2de6933ae269797152341008f9539 https://github.com/phpmyadmin/phpmyadmin/commit/48570a6dbdb2de6933ae26979715... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M test/libraries/PMA_central_columns_test.php
Log Message: ----------- Update tests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: bc25daf3f7f3580478b71c2c123e06e024d2a269 https://github.com/phpmyadmin/phpmyadmin/commit/bc25daf3f7f3580478b71c2c123e... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/kn.po M po/ru.po
Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: 32f1ac4211971d80da6ac36f7ae8d1e9f2db4a9c https://github.com/phpmyadmin/phpmyadmin/commit/32f1ac4211971d80da6ac36f7ae8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/import/ImportCsv.class.php
Log Message: ----------- bug #4670 CSV import reads both commas and values into first column after first row
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5 https://github.com/phpmyadmin/phpmyadmin/commit/aaa6b9d4d96464f6d74a0e11d7cb... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M README M config.sample.inc.php M doc/conf.py M doc/config.rst M import.php M index.php M js/console.js M js/error_report.js M js/functions.js M js/messages.php M js/multi_column_sort.js M libraries/Config.class.php M libraries/Error_Handler.class.php M libraries/Util.class.php M libraries/central_columns.lib.php M libraries/common.inc.php M libraries/config.default.php M libraries/config/Validator.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/create_addfield.lib.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/replication_gui.lib.php M libraries/sql.lib.php M libraries/structure.lib.php M libraries/tbl_columns_definition_form.lib.php M libraries/tbl_printview.lib.php M libraries/user_preferences.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 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/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.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/ne.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@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@latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M test/classes/PMA_Error_Handler_test.php M test/classes/PMA_Footer_test.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_tbl_columns_definition_form_test.php M test/libraries/PMA_tbl_printview_test.php M test/libraries/common/PMA_quoting_slashing_test.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'QA_4_3' into Bug4642
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 204af7887929166ded545259318b16b1d2046fbd https://github.com/phpmyadmin/phpmyadmin/commit/204af7887929166ded545259318b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M js/ajax.js M libraries/Scripts.class.php M test/classes/PMA_Scripts_test.php
Log Message: ----------- Merge pull request #1425 from madhuracj/Bug4642
bug #4642 phpmyadmin often fails to load due to specific load order
Commit: 296a87c83dd384df0b1df30d1fa169ad612182ea https://github.com/phpmyadmin/phpmyadmin/commit/296a87c83dd384df0b1df30d1fa1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M js/tbl_structure.js
Log Message: ----------- #4671 Unable to move all columns
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 77fec70ee87ccbd456df04c7d554bc8993345d95 https://github.com/phpmyadmin/phpmyadmin/commit/77fec70ee87ccbd456df04c7d554... Author: Marc Delisle marc@infomarc.info Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog M libraries/plugins/import/ImportSql.class.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: ed32527de04ab73c5868ff0b1ca53392b93455b1 https://github.com/phpmyadmin/phpmyadmin/commit/ed32527de04ab73c5868ff0b1ca5... Author: Rakesh Kumar rakeshkumar4294@gmail.com Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- fix bug #4672
Signed-off-by: Rakesh Kumar rakeshkumar4294@gmail.com
Commit: cd136786e989e0f04d1cff6a80d6be730b3cfb60 https://github.com/phpmyadmin/phpmyadmin/commit/cd136786e989e0f04d1cff6a80d6... Author: Marc Delisle marc@infomarc.info Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M libraries/DisplayResults.class.php
Log Message: ----------- Merge pull request #1438 from rakeshkaundilya/QA_4_3
fix bug #4672
Commit: 6fab2c158eafbb2f00a3af09111f2ba19370d30a https://github.com/phpmyadmin/phpmyadmin/commit/6fab2c158eafbb2f00a3af09111f... Author: Marc Delisle marc@infomarc.info Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 9fea160d3b044119e21c982d8fdae6cb09a8d092 https://github.com/phpmyadmin/phpmyadmin/commit/9fea160d3b044119e21c982d8fda... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2977 of 2977 strings)
[CI skip]
Commit: 1b9bedc65c4de3209fad0a44aaf9c7a3b94455ac https://github.com/phpmyadmin/phpmyadmin/commit/1b9bedc65c4de3209fad0a44aaf9... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2977 of 2977 strings)
[CI skip]
Commit: 4e65c7fc4d430c59fc2f7640412b07392604838c https://github.com/phpmyadmin/phpmyadmin/commit/4e65c7fc4d430c59fc2f7640412b... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2977 of 2977 strings)
[CI skip]
Commit: 056e15749e574eeca5d77a8c2adee7bba16d59eb https://github.com/phpmyadmin/phpmyadmin/commit/056e15749e574eeca5d77a8c2ade... Author: Marc Delisle marc@infomarc.info Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: fe2725f5be57339b78acda493df34a9e684267d4 https://github.com/phpmyadmin/phpmyadmin/commit/fe2725f5be57339b78acda493df3... Author: Robin van der Vliet info@robinvandervliet.nl Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths: M po/nl.po
Log Message: ----------- Translated using Weblate (Dutch)
Currently translated at 100.0% (2977 of 2977 strings)
[CI skip]
Commit: 09e189605de2d779a8ce3e91b8c3987a76a869d4 https://github.com/phpmyadmin/phpmyadmin/commit/09e189605de2d779a8ce3e91b8c3... Author: Weblate noreply@weblate.org Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3
Commit: 462428570e4a3f16c71893c46d7b3f1d0dc405d2 https://github.com/phpmyadmin/phpmyadmin/commit/462428570e4a3f16c71893c46d7b... Author: Marc Delisle marc@infomarc.info Date: 2014-12-25 (Thu, 25 Dec 2014)
Changed paths: M ChangeLog M libraries/structure.lib.php
Log Message: ----------- bug #4658 Illegal string offset (Data_length, Index_length)
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 38bb19ffb66f0c78116f0916b7478d6c0d9f1e4d https://github.com/phpmyadmin/phpmyadmin/commit/38bb19ffb66f0c78116f0916b747... Author: Marc Delisle marc@infomarc.info Date: 2014-12-26 (Fri, 26 Dec 2014)
Changed paths: M ChangeLog M libraries/Config.class.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Theme_test.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
Log Message: ----------- bug #4655 Undefined index: collation_connection
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 0d3a9e4ca6790480e99ca734a5cd3a8baae1a21e https://github.com/phpmyadmin/phpmyadmin/commit/0d3a9e4ca6790480e99ca734a5cd... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-27 (Sat, 27 Dec 2014)
Changed paths: M js/ajax.js
Log Message: ----------- Fix #4673 Delimiter causing page lock
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 70985f197ccd6904aae0f047284deb67813677b7 https://github.com/phpmyadmin/phpmyadmin/commit/70985f197ccd6904aae0f047284d... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2014-12-27 (Sat, 27 Dec 2014)
Changed paths: M ChangeLog
Log Message: ----------- Update ChangeLog
Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com
Commit: 67a67b7e9dbd9ff14cab2d4afe332c7b4d12bb0c https://github.com/phpmyadmin/phpmyadmin/commit/67a67b7e9dbd9ff14cab2d4afe33... Author: Marc Delisle marc@infomarc.info Date: 2014-12-28 (Sun, 28 Dec 2014)
Changed paths: M ChangeLog M js/ajax.js
Log Message: ----------- Merge pull request #1439 from Tithugues/b4673_qa43
Fix #4673 Delimiter causing page lock
Commit: 85ae51142cb6fd774a70b525d227602dbe8fd9f6 https://github.com/phpmyadmin/phpmyadmin/commit/85ae51142cb6fd774a70b525d227... Author: Marc Delisle marc@infomarc.info Date: 2014-12-29 (Mon, 29 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.3.4 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: e1e878fea9fed546d602fefe099d3500465a1652 https://github.com/phpmyadmin/phpmyadmin/commit/e1e878fea9fed546d602fefe099d... Author: Marc Delisle marc@infomarc.info Date: 2014-12-29 (Mon, 29 Dec 2014)
Changed paths: M ChangeLog M README M doc/conf.py M import.php M js/ajax.js M js/console.js M js/error_report.js M js/tbl_structure.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/Scripts.class.php M libraries/Util.class.php M libraries/central_columns.lib.php M libraries/config/Validator.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/import/ImportCsv.class.php M libraries/plugins/import/ImportSql.class.php M libraries/sql.lib.php M libraries/structure.lib.php M libraries/tbl_printview.lib.php M po/kn.po M po/nl.po M po/pa.po M po/ru.po M po/vls.po M test/classes/PMA_DbSearch_test.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_Theme_test.php M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/libraries/PMA_central_columns_test.php M test/libraries/PMA_tbl_printview_test.php M test/libraries/common/PMA_quoting_slashing_test.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'MAINT_4_3_4' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/953e3e0c0e8d...e1e878fea9fe