Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
https://github.com/phpmyadmin/phpmyadmin/commit/bfdd89f63ab88a83f88ab8a2d0a…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: b04edfe2f8492ac4e194dd8c903f4019be6ae82f
https://github.com/phpmyadmin/phpmyadmin/commit/b04edfe2f8492ac4e194dd8c903…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: 33c819b8b46c14e1e1708bf369d5d9d149f3cd47
https://github.com/phpmyadmin/phpmyadmin/commit/33c819b8b46c14e1e1708bf369d…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5
https://github.com/phpmyadmin/phpmyadmin/commit/aaa6b9d4d96464f6d74a0e11d7c…
Author: Madhura Jayaratne <madhura.cj(a)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(a)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(a)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(a)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(a)gmail.com>
Commit: 204af7887929166ded545259318b16b1d2046fbd
https://github.com/phpmyadmin/phpmyadmin/commit/204af7887929166ded545259318…
Author: Madhura Jayaratne <madhura.cj(a)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: 6d682dc48f274943d24ef513e3ca00609747364e
https://github.com/phpmyadmin/phpmyadmin/commit/6d682dc48f274943d24ef513e3c…
Author: Madhura Jayaratne <madhura.cj(a)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 branch 'QA_4_3'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e16ad76ebd23...6d682dc48f27
Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
https://github.com/phpmyadmin/phpmyadmin/commit/bfdd89f63ab88a83f88ab8a2d0a…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: b04edfe2f8492ac4e194dd8c903f4019be6ae82f
https://github.com/phpmyadmin/phpmyadmin/commit/b04edfe2f8492ac4e194dd8c903…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: 33c819b8b46c14e1e1708bf369d5d9d149f3cd47
https://github.com/phpmyadmin/phpmyadmin/commit/33c819b8b46c14e1e1708bf369d…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5
https://github.com/phpmyadmin/phpmyadmin/commit/aaa6b9d4d96464f6d74a0e11d7c…
Author: Madhura Jayaratne <madhura.cj(a)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(a)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(a)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(a)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(a)gmail.com>
Commit: 204af7887929166ded545259318b16b1d2046fbd
https://github.com/phpmyadmin/phpmyadmin/commit/204af7887929166ded545259318…
Author: Madhura Jayaratne <madhura.cj(a)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
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/32f1ac421197...204af7887929
Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 32f1ac4211971d80da6ac36f7ae8d1e9f2db4a9c
https://github.com/phpmyadmin/phpmyadmin/commit/32f1ac4211971d80da6ac36f7ae…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 4db61785afde420d0ff8b6036b591fe03b5af95c
https://github.com/phpmyadmin/phpmyadmin/commit/4db61785afde420d0ff8b6036b5…
Author: Robin van der Vliet <info(a)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/0b927efe4293b0586080f697b04…
Author: Robin van der Vliet <info(a)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/ec712e1810ba657e1529d4e325f…
Author: Robin van der Vliet <info(a)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/99412808a4c47b051549cf2f607…
Author: Robin van der Vliet <info(a)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/9864ae0babc51baaddf11c721ba…
Author: Robin van der Vliet <info(a)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/ab1c456bb16ff2a20399d4c4909…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: c95dc6d6cb734355253ea89161ea759d64c89759
https://github.com/phpmyadmin/phpmyadmin/commit/c95dc6d6cb734355253ea89161e…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: 7d492ba0119d57042965fccea584b1d86bf3d3b4
https://github.com/phpmyadmin/phpmyadmin/commit/7d492ba0119d57042965fccea58…
Author: Madhura Jayaratne <madhura.cj(a)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(a)gmail.com>
Commit: 18f601ae64b4447282a53b46d21eca7d2274791f
https://github.com/phpmyadmin/phpmyadmin/commit/18f601ae64b4447282a53b46d21…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-24 (Wed, 24 Dec 2014)
Changed paths:
M ChangeLog
M libraries/central_columns.lib.php
Log Message:
-----------
Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eea4ec02f1e7...18f601ae64b4