[phpMyAdmin Git] [phpmyadmin/docker] 15ca16: Change deps to php5

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 15ca16c9d042ddbda38f40844595386881772e73
  
https://github.com/phpmyadmin/docker/commit/15ca16c9d042ddbda38f40844595386881772e73
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Change deps to php5

We would really prefer php7, but it's not there and php packages got
renamed to php5

Issue #31

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 719729: Ignore linkcheck output

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 719729397f513383fba1aec69e72133af9f508d5
  
https://github.com/phpmyadmin/phpmyadmin/commit/719729397f513383fba1aec69e72133af9f508d5
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M .gitignore

  Log Message:
  ---
  Ignore linkcheck output

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c1b147: Improve controluser docs based on suggestions from...

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c1b147d9fa6642bb19b1775b035ebd63c0c3713b
  
https://github.com/phpmyadmin/phpmyadmin/commit/c1b147d9fa6642bb19b1775b035ebd63c0c3713b
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M doc/config.rst
M doc/setup.rst

  Log Message:
  ---
  Improve controluser docs based on suggestions from wiki

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a3bc2f: Move other articles links from wiki

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a3bc2fa22e468f01f9b19e9105ebfa701bf401a7
  
https://github.com/phpmyadmin/phpmyadmin/commit/a3bc2fa22e468f01f9b19e9105ebfa701bf401a7
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M doc/other.rst
M doc/setup.rst
M doc/user.rst

  Log Message:
  ---
  Move other articles links from wiki

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 786786: Remove inline styles from elements with id='filter...

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 786786d6026f74352d20e2cb1ef8b6a0a718d475
  
https://github.com/phpmyadmin/phpmyadmin/commit/786786d6026f74352d20e2cb1ef8b6a0a718d475
  Author: Andy Davies 
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
M libraries/server_status_variables.lib.php
M templates/filter.phtml
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Remove inline styles from elements with id='filterText' (partial fix of issue 
#12262)

Signed-off-by: Andy Davies 


  Commit: 8678125b6aec2a9a3524b6462ad9cb115fc0d94c
  
https://github.com/phpmyadmin/phpmyadmin/commit/8678125b6aec2a9a3524b6462ad9cb115fc0d94c
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M libraries/server_status_variables.lib.php
M templates/filter.phtml
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Merge pull request #12275 from andavies/issue-#12262

Remove inline styles from elements with id='filterText' (partial fix …


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ab29ec994790...8678125b6aec___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] df137f: fixed checking of user rights to make it look for ...

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: df137f2410c004a7dcb6ca15306018060cba76e0
  
https://github.com/phpmyadmin/phpmyadmin/commit/df137f2410c004a7dcb6ca15306018060cba76e0
  Author: sfobiwahn 
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
M libraries/insert_edit.lib.php

  Log Message:
  ---
  fixed checking of user rights to make it look for database privileges

Signed-off-by: Florian Steenblock 


  Commit: c4a7ec46500cc516d8b55c1836276ed5e5037979
  
https://github.com/phpmyadmin/phpmyadmin/commit/c4a7ec46500cc516d8b55c1836276ed5e5037979
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M libraries/insert_edit.lib.php

  Log Message:
  ---
  Merge pull request #12274 from sfobiwahn/master

fixed checking of user rights to make it look for database privileges


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/8678125b6aec...c4a7ec46500c___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/docker]

2016-05-27 Thread nijel
  Branch: refs/tags/4.6.2-1
  Home:   https://github.com/phpmyadmin/docker
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d78e17: Do not use dirname for calculating cookie path

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d78e173b34b2a318677e30900a4399b53d9b28b3
  
https://github.com/phpmyadmin/phpmyadmin/commit/d78e173b34b2a318677e30900a4399b53d9b28b3
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M ChangeLog
M libraries/Config.php
M test/classes/ConfigTest.php

  Log Message:
  ---
  Do not use dirname for calculating cookie path

It is wrong for this purpose as on Windows this uses \ for both
separating parts and generating result. This fixed calculation of cookie
path on Windows.

Fixes #12249

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e7e174: Remove mcrypt mention in setup documentation

2016-05-27 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e7e17420f7b9716ad06b468f3bcc0068c2df4a0c
  
https://github.com/phpmyadmin/phpmyadmin/commit/e7e17420f7b9716ad06b468f3bcc0068c2df4a0c
  Author: Sebastiaan Lokhorst 
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Remove mcrypt mention in setup documentation

mcrypt is no longer mentioned in the 'require' section (removed in commit 
692c555c3fd625f9efdee7abf8483cce2d0d6986), so this is confusing.

Signed-off-by: Sebastiaan Lokhorst 


  Commit: eea1bca5017b49b94330de8757c8a4c1a6d777f5
  
https://github.com/phpmyadmin/phpmyadmin/commit/eea1bca5017b49b94330de8757c8a4c1a6d777f5
  Author: Michal Čihař 
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Merge pull request #12273 from slokhorst/doc-rm-mcrypt

Remove mcrypt mention in setup documentation


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/719729397f51...eea1bca5017b___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git