Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: bdaab73967ac4242fb7bc15fd777b65e2d0ecdb2
https://github.com/phpmyadmin/phpmyadmin/commit/bdaab73967ac4242fb7bc15fd77…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M .travis.yml
M test/ci-lint
M test/ci-selenium
M test/ci-test
Log Message:
-----------
Squeeze lint into test build
- the setup costs are quite high, so do both steps at once
- lint only changed files
- always generate locales for tests to simplify code
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: f3425986b5cad507df7ead6f758ba08bd91a14e6
https://github.com/phpmyadmin/phpmyadmin/commit/f3425986b5cad507df7ead6f758…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Generate locales without ant
Removes ant overhead.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b4326fcc3d6e30a90a03af9718e3f4a13347ceda
https://github.com/phpmyadmin/phpmyadmin/commit/b4326fcc3d6e30a90a03af9718e…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
Remove and cleanup from Travis
It should not be necessary at all as we start with clean environment.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 0b0e99cc02e1d1f5f04eb739a3f748a5a02604c4
https://github.com/phpmyadmin/phpmyadmin/commit/0b0e99cc02e1d1f5f04eb739a3f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M phpunit.xml.dist
Log Message:
-----------
Remove no longer needed exclude
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 4f375697734e03ff63293f28b24107e04c8056cd
https://github.com/phpmyadmin/phpmyadmin/commit/4f375697734e03ff63293f28b24…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M .travis.yml
M test/ci-lint
M test/ci-selenium
M test/ci-test
Log Message:
-----------
Do not use ant on Travis
It is just additional overhead without real benefit.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: db62cf1bf4392fc7b3f02023c6a8627b33667c25
https://github.com/phpmyadmin/phpmyadmin/commit/db62cf1bf4392fc7b3f02023c6a…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M .travis.yml
Log Message:
-----------
There is no phpenv on OSX
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 2fea612791032f54fa5a873f0c26772fcbd914c7
https://github.com/phpmyadmin/phpmyadmin/commit/2fea612791032f54fa5a873f0c2…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M test/install-runkit
Log Message:
-----------
Simplify code for skipping not supported PHP versions
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7a87ce15658...2fea61279103
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 506b5fb9e754e3024c3ba73d2ce9401a430bea60
https://github.com/phpmyadmin/phpmyadmin/commit/506b5fb9e754e3024c3ba73d2ce…
Author: Joshua Atkins <support(a)jublo.net>
Date: 2017-02-11 (Sat, 11 Feb 2017)
Changed paths:
M libraries/sql_query_form.lib.php
Log Message:
-----------
Server query form header: Use typograph. quotes
Signed-off-by: Joshua Atkins <support(a)jublo.net>
Commit: 7589ea7c1a6e8a5434a1d348e2704e56ce62dade
https://github.com/phpmyadmin/phpmyadmin/commit/7589ea7c1a6e8a5434a1d348e27…
Author: Joshua Atkins <support(a)jublo.net>
Date: 2017-02-11 (Sat, 11 Feb 2017)
Changed paths:
M libraries/server_privileges.lib.php
Log Message:
-----------
Typographical quotes for Flush privs note
Signed-off-by: Joshua Atkins <support(a)jublo.net>
Commit: b79194377c2f9f233d3043d1c8b04e9d94c44819
https://github.com/phpmyadmin/phpmyadmin/commit/b79194377c2f9f233d3043d1c8b…
Author: Joshua Atkins <support(a)jublo.net>
Date: 2017-02-11 (Sat, 11 Feb 2017)
Changed paths:
M libraries/Util.php
M test/libraries/common/PMA_getDbLink_test.php
Log Message:
-----------
Typographical quotes for Jump to db link title
Signed-off-by: Joshua Atkins <support(a)jublo.net>
Commit: 68f107786cc31db74d3b2e24ee51cfb37bc633dd
https://github.com/phpmyadmin/phpmyadmin/commit/68f107786cc31db74d3b2e24ee5…
Author: Joshua Atkins <support(a)jublo.net>
Date: 2017-02-23 (Thu, 23 Feb 2017)
Changed paths:
M libraries/Menu.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/common/PMA_getDbLink_test.php
Log Message:
-----------
Typographical quotes for table comments
Signed-off-by: Joshua Atkins <support(a)jublo.net>
Commit: 0a8490f711a623693e1c6aa5bbec8630fd207373
https://github.com/phpmyadmin/phpmyadmin/commit/0a8490f711a623693e1c6aa5bbe…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M libraries/Menu.php
M libraries/Util.php
M libraries/server_privileges.lib.php
M libraries/sql_query_form.lib.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/common/PMA_getDbLink_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/12987'
Commit: dfa799545169e18d9264d85461f805f273efcc02
https://github.com/phpmyadmin/phpmyadmin/commit/dfa799545169e18d9264d85461f…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M libraries/sql_query_form.lib.php
Log Message:
-----------
Include quotes directly in the string
This makes it easier for tranlators to handle.
Issue #12987
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 6e78d489ee074fac101635846bbca3b6cf2c008a
https://github.com/phpmyadmin/phpmyadmin/commit/6e78d489ee074fac101635846bb…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M libraries/Menu.php
Log Message:
-----------
Use unicode for quotes
There is no need to use html entities.
Issue #12987
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2c55ecc4504b...6e78d489ee07
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: faffa92f2246709d1c514b4d522ba8de449774d7
https://github.com/phpmyadmin/phpmyadmin/commit/faffa92f2246709d1c514b4d522…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M ChangeLog
M browse_foreigners.php
Log Message:
-----------
Fixed related field selection for native relations
The PMA_getForeigners handles just fine both situations, so there is no
need to check the configuration in advance.
Fixes #12967
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 9d13e3d143ef54cf328262c771ccf700eb02708c
https://github.com/phpmyadmin/phpmyadmin/commit/9d13e3d143ef54cf328262c771c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M libraries/relation.lib.php
Log Message:
-----------
Display first char field for foreign key if nothing is configured
In most cases this is what users want to see and anyway it is way better
than showing nothing.
Issue #12835
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 19aad415067920e481d16dd3d60485bbee227710
https://github.com/phpmyadmin/phpmyadmin/commit/19aad415067920e481d16dd3d60…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M ChangeLog
M browse_foreigners.php
M libraries/relation.lib.php
Log Message:
-----------
Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/002c39877e17...19aad4150679
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: faffa92f2246709d1c514b4d522ba8de449774d7
https://github.com/phpmyadmin/phpmyadmin/commit/faffa92f2246709d1c514b4d522…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M ChangeLog
M browse_foreigners.php
Log Message:
-----------
Fixed related field selection for native relations
The PMA_getForeigners handles just fine both situations, so there is no
need to check the configuration in advance.
Fixes #12967
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 9d13e3d143ef54cf328262c771ccf700eb02708c
https://github.com/phpmyadmin/phpmyadmin/commit/9d13e3d143ef54cf328262c771c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)
Changed paths:
M libraries/relation.lib.php
Log Message:
-----------
Display first char field for foreign key if nothing is configured
In most cases this is what users want to see and anyway it is way better
than showing nothing.
Issue #12835
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cb60b4a75099...9d13e3d143ef