[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 831069: Add PHP 5.5.0 error codes as well

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8310691341e0659990510bc8067e55c486a88328
  
https://github.com/phpmyadmin/phpmyadmin/commit/8310691341e0659990510bc8067e55c486a88328
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/Response.php

  Log Message:
  ---
  Add PHP 5.5.0 error codes as well

Signed-off-by: Michal Čihař 


  Commit: b8d5d6e9b25fbb9eb798545f8e72e0a5283d447b
  
https://github.com/phpmyadmin/phpmyadmin/commit/b8d5d6e9b25fbb9eb798545f8e72e0a5283d447b
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/Response.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/49d22c6c0100...b8d5d6e9b25f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 49d22c: Translated using Weblate (German)

[Julian Ladisch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 49d22c6c0100ea4893a5283cd0de7c1e59e9dda6
  
https://github.com/phpmyadmin/phpmyadmin/commit/49d22c6c0100ea4893a5283cd0de7c1e59e9dda6
  Author: Julian Ladisch 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M po/de.po

  Log Message:
  ---
  Translated using Weblate (German)

Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 07c2f2: Add workaround for PHP bug

[Michal Čihař]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 07c2f262232a784e50e4d7460d3c9b39df65ee9c
  
https://github.com/phpmyadmin/phpmyadmin/commit/07c2f262232a784e50e4d7460d3c9b39df65ee9c
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/Index.php

  Log Message:
  ---
  Add workaround for PHP bug

I'm unable to better diagnose the problem right now, so let's workaround
it so that it's working for users.

Fixes #11705

Signed-off-by: Michal Čihař 


  Commit: 3ec1ad0132b25635aefc383c539b376dadda6ecf
  
https://github.com/phpmyadmin/phpmyadmin/commit/3ec1ad0132b25635aefc383c539b376dadda6ecf
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M po/de.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b25885ee433f...3ec1ad0132b2___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 41df6c: Translated using Weblate (German)

[Weblate]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 41df6c4105a6382ee0f3f5b997005a5f0bce546d
  
https://github.com/phpmyadmin/phpmyadmin/commit/41df6c4105a6382ee0f3f5b997005a5f0bce546d
  Author: Julian Ladisch 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M po/de.po

  Log Message:
  ---
  Translated using Weblate (German)

Currently translated at 99.9% (3206 of 3208 strings)

[CI skip]


  Commit: 9cea2dec102d56a6f4b3402cca393220cc22457d
  
https://github.com/phpmyadmin/phpmyadmin/commit/9cea2dec102d56a6f4b3402cca393220cc22457d
  Author: Weblate 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/Index.php
M libraries/Response.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/f01b3b7ddd7b...9cea2dec102d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 315be0: Translated using Weblate (German)

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 315be0e456d4091ad73f57f3b333c6cacc694b46
  
https://github.com/phpmyadmin/phpmyadmin/commit/315be0e456d4091ad73f57f3b333c6cacc694b46
  Author: Julian Ladisch 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M po/de.po

  Log Message:
  ---
  Translated using Weblate (German)

Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]


  Commit: b25885ee433fc7151b58560a55f7ae66e12e539d
  
https://github.com/phpmyadmin/phpmyadmin/commit/b25885ee433fc7151b58560a55f7ae66e12e539d
  Author: Weblate 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/Response.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


  Commit: 3ec1ad0132b25635aefc383c539b376dadda6ecf
  
https://github.com/phpmyadmin/phpmyadmin/commit/3ec1ad0132b25635aefc383c539b376dadda6ecf
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M po/de.po

  Log Message:
  ---
  Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6


  Commit: 1c3590dcec73a30ade367b7a523db4ec8f2dfa7a
  
https://github.com/phpmyadmin/phpmyadmin/commit/1c3590dcec73a30ade367b7a523db4ec8f2dfa7a
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/9cea2dec102d...1c3590dcec73___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c96463: Provide diagnostics for JSON encoding errors

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c964633278cdc5c70e4be3adfb6cbe906d1340b8
  
https://github.com/phpmyadmin/phpmyadmin/commit/c964633278cdc5c70e4be3adfb6cbe906d1340b8
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/Response.php

  Log Message:
  ---
  Provide diagnostics for JSON encoding errors

Issue #11705

Signed-off-by: Michal Čihař 


  Commit: 07c2f262232a784e50e4d7460d3c9b39df65ee9c
  
https://github.com/phpmyadmin/phpmyadmin/commit/07c2f262232a784e50e4d7460d3c9b39df65ee9c
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/Index.php

  Log Message:
  ---
  Add workaround for PHP bug

I'm unable to better diagnose the problem right now, so let's workaround
it so that it's working for users.

Fixes #11705

Signed-off-by: Michal Čihař 


  Commit: f01b3b7ddd7b2f2bfaccbabb263c9ea1b8690d8b
  
https://github.com/phpmyadmin/phpmyadmin/commit/f01b3b7ddd7b2f2bfaccbabb263c9ea1b8690d8b
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/Index.php
M libraries/Response.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/16818f7ad330...f01b3b7ddd7b___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 315be0: Translated using Weblate (German)

[Weblate]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 315be0e456d4091ad73f57f3b333c6cacc694b46
  
https://github.com/phpmyadmin/phpmyadmin/commit/315be0e456d4091ad73f57f3b333c6cacc694b46
  Author: Julian Ladisch 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M po/de.po

  Log Message:
  ---
  Translated using Weblate (German)

Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]


  Commit: b25885ee433fc7151b58560a55f7ae66e12e539d
  
https://github.com/phpmyadmin/phpmyadmin/commit/b25885ee433fc7151b58560a55f7ae66e12e539d
  Author: Weblate 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/Response.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c964633278cd...b25885ee433f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c96463: Provide diagnostics for JSON encoding errors

[Michal Čihař]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c964633278cdc5c70e4be3adfb6cbe906d1340b8
  
https://github.com/phpmyadmin/phpmyadmin/commit/c964633278cdc5c70e4be3adfb6cbe906d1340b8
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/Response.php

  Log Message:
  ---
  Provide diagnostics for JSON encoding errors

Issue #11705

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b93ce9: Fixed rendering of table stats

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b93ce993eb2863afc637b28debf32f5d5f6db954
  
https://github.com/phpmyadmin/phpmyadmin/commit/b93ce993eb2863afc637b28debf32f5d5f6db954
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M templates/table/structure/display_table_stats.phtml

  Log Message:
  ---
  Fixed rendering of table stats

Fixes #12081

Signed-off-by: Michal Čihař 


  Commit: 16818f7ad3308174b82e356463a393b36da9d47a
  
https://github.com/phpmyadmin/phpmyadmin/commit/16818f7ad3308174b82e356463a393b36da9d47a
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M templates/table/structure/display_table_stats.phtml

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/02aa073a815b...16818f7ad330___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b93ce9: Fixed rendering of table stats

[Michal Čihař]

  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b93ce993eb2863afc637b28debf32f5d5f6db954
  
https://github.com/phpmyadmin/phpmyadmin/commit/b93ce993eb2863afc637b28debf32f5d5f6db954
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M templates/table/structure/display_table_stats.phtml

  Log Message:
  ---
  Fixed rendering of table stats

Fixes #12081

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/themes] 89cd10: Remove ancient IE code (no longer supported in mas...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/themes
  Commit: 89cd101b6e2c34c9e924c7787c67bfcbec67c71c
  
https://github.com/phpmyadmin/themes/commit/89cd101b6e2c34c9e924c7787c67bfcbec67c71c
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M metro/css/common.css.php

  Log Message:
  ---
  Remove ancient IE code (no longer supported in master)

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 02aa07: Add missing use

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 02aa073a815ba1673c24e6baf5c489dc25c9e4c4
  
https://github.com/phpmyadmin/phpmyadmin/commit/02aa073a815ba1673c24e6baf5c489dc25c9e4c4
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M libraries/display_import.lib.php

  Log Message:
  ---
  Add missing use

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ace1fa: Fixed parsing of field definition

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ace1faa08515e4f8305222079a20adf33bd04b36
  
https://github.com/phpmyadmin/phpmyadmin/commit/ace1faa08515e4f8305222079a20adf33bd04b36
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  ---
  Fixed parsing of field definition

Fixes #12083

Signed-off-by: Michal Čihař 


  Commit: 590593c8056b8d6b4f09ebe92a2c628289e445cd
  
https://github.com/phpmyadmin/phpmyadmin/commit/590593c8056b8d6b4f09ebe92a2c628289e445cd
  Author: Michal Čihař 
  Date:   2016-03-09 (Wed, 09 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/8b87d14fe8dd...590593c8056b___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git