[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bfdd89: bug #4642 phpmyadmin often fails to load due to sp...

2014-12-29 Thread Marc Delisle
  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
  
https://github.com/phpmyadmin/phpmyadmin/commit/bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: b04edfe2f8492ac4e194dd8c903f4019be6ae82f
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04edfe2f8492ac4e194dd8c903f4019be6ae82f
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: 33c819b8b46c14e1e1708bf369d5d9d149f3cd47
  
https://github.com/phpmyadmin/phpmyadmin/commit/33c819b8b46c14e1e1708bf369d5d9d149f3cd47
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: 8b695200e79e02a5731732b160746277b9c79c73
  
https://github.com/phpmyadmin/phpmyadmin/commit/8b695200e79e02a5731732b160746277b9c79c73
  Author: A. Voogt a.vo...@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/3960df34bce1a7e03261b8e83705bc59825d4320
  Author: Marc Delisle m...@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 m...@infomarc.info


  Commit: fb731ad37bed205ef44875de0c79362e28e56bbc
  
https://github.com/phpmyadmin/phpmyadmin/commit/fb731ad37bed205ef44875de0c79362e28e56bbc
  Author: Michal Čihař mic...@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/2dcb1c9b0a9c6603a3bb39fb49f568a2c8d9b5cd
  Author: Hugues Peccatte hugues.pecca...@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.pecca...@gmail.com


  Commit: bac38f3ef6ca06b24a650eb4361159e94157d99e
  
https://github.com/phpmyadmin/phpmyadmin/commit/bac38f3ef6ca06b24a650eb4361159e94157d99e
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: fbe587ce7386de47f728ad8c8f167fc945e18501
  
https://github.com/phpmyadmin/phpmyadmin/commit/fbe587ce7386de47f728ad8c8f167fc945e18501
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae
  
https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae
  Author: Madhura Jayaratne madhura...@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 m...@infomarc.info


  Commit: 66c7c04582e01b0a6e1f968b98197533c0dd9efc
  
https://github.com/phpmyadmin/phpmyadmin/commit/66c7c04582e01b0a6e1f968b98197533c0dd9efc
  Author: Hugues Peccatte hugues.pecca...@gmail.com
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Remove borders 

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bfdd89: bug #4642 phpmyadmin often fails to load due to sp...

2014-12-23 Thread Madhura Jayaratne
  Branch: refs/heads/QA_4_3
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
  
https://github.com/phpmyadmin/phpmyadmin/commit/bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: b04edfe2f8492ac4e194dd8c903f4019be6ae82f
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04edfe2f8492ac4e194dd8c903f4019be6ae82f
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: 33c819b8b46c14e1e1708bf369d5d9d149f3cd47
  
https://github.com/phpmyadmin/phpmyadmin/commit/33c819b8b46c14e1e1708bf369d5d9d149f3cd47
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5
  
https://github.com/phpmyadmin/phpmyadmin/commit/aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5
  Author: Madhura Jayaratne madhura...@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/b...@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/s...@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/u...@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...@gmail.com


  Commit: 204af7887929166ded545259318b16b1d2046fbd
  
https://github.com/phpmyadmin/phpmyadmin/commit/204af7887929166ded545259318b16b1d2046fbd
  Author: Madhura Jayaratne madhura...@gmail.com
  Date:   2014-12-24 (Wed, 24 Dec 2014)

  Changed paths:
M ChangeLog
M js/ajax.js
M 

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bfdd89: bug #4642 phpmyadmin often fails to load due to sp...

2014-12-23 Thread Madhura Jayaratne
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
  
https://github.com/phpmyadmin/phpmyadmin/commit/bfdd89f63ab88a83f88ab8a2d0ae09abb2ead282
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: b04edfe2f8492ac4e194dd8c903f4019be6ae82f
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04edfe2f8492ac4e194dd8c903f4019be6ae82f
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: 33c819b8b46c14e1e1708bf369d5d9d149f3cd47
  
https://github.com/phpmyadmin/phpmyadmin/commit/33c819b8b46c14e1e1708bf369d5d9d149f3cd47
  Author: Madhura Jayaratne madhura...@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...@gmail.com


  Commit: aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5
  
https://github.com/phpmyadmin/phpmyadmin/commit/aaa6b9d4d96464f6d74a0e11d7cb50e03c5a2fc5
  Author: Madhura Jayaratne madhura...@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/b...@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/s...@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/u...@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...@gmail.com


  Commit: 204af7887929166ded545259318b16b1d2046fbd
  
https://github.com/phpmyadmin/phpmyadmin/commit/204af7887929166ded545259318b16b1d2046fbd
  Author: Madhura Jayaratne madhura...@gmail.com
  Date:   2014-12-24 (Wed, 24 Dec 2014)

  Changed paths:
M ChangeLog
M js/ajax.js
M