Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 111fbab5d2eae9dcceb0039dde93914536ec9276
https://github.com/phpmyadmin/phpmyadmin/commit/111fbab5d2eae9dcceb0039dde9…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M test/classes/navigation/NavigationTest.php
M test/classes/navigation/NodeDatabaseChildTest.php
Log Message:
-----------
Fix tests after 44760ac
* Currently hard-coded the values and removed URL::getCommon() call as it was producing incorrect order of parameters in the url
* Can look at a better approach for fixing the test
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/docker
Commit: 9e0529c6f500c688d6d5717d71c3bec649e14d26
https://github.com/phpmyadmin/docker/commit/9e0529c6f500c688d6d5717d71c3bec…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M README.md
M config.inc.php
Log Message:
-----------
Revert "Remove PMA_ABSOLUTE_URI as it is no longer needed with 4.6"
This reverts commit 812590e038631e4b32c6af7f289e045e4db1b1b3.
Fixes #40
Please note that the setting will take no effect till phpMyAdmin 4.6.5.
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 5410e3859bc96f2ff3a45e8f627931937f9c81bc
https://github.com/phpmyadmin/phpmyadmin/commit/5410e3859bc96f2ff3a45e8f627…
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M po/tr.po
Log Message:
-----------
Translated using Weblate (Turkish)
Currently translated at 100.0% (3206 of 3206 strings)
[CI skip]
Commit: 41613c512dd207dc36aced8ef387d7de1e7abd7c
https://github.com/phpmyadmin/phpmyadmin/commit/41613c512dd207dc36aced8ef38…
Author: Kristjan Räts <kristjanrats(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M po/et.po
Log Message:
-----------
Translated using Weblate (Estonian)
Currently translated at 100.0% (3206 of 3206 strings)
[CI skip]
Commit: 311be7515c8c280041565594ca853f31a4177082
https://github.com/phpmyadmin/phpmyadmin/commit/311be7515c8c280041565594ca8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M js/functions.js
M libraries/core.lib.php
M test/.htaccess
Log Message:
-----------
Use https when available
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 76a471a790bf31873f469866374dfbab63e5f40c
https://github.com/phpmyadmin/phpmyadmin/commit/76a471a790bf31873f469866374…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M user_password.php
Log Message:
-----------
Avoid problems with PHP comparison
- allow password where empty returns true
- compare using ===
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b53fff29b20ebdc04aa34515e3c3a7940c2e065e
https://github.com/phpmyadmin/phpmyadmin/commit/b53fff29b20ebdc04aa34515e3c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M doc/config.rst
M doc/faq.rst
Log Message:
-----------
Crossreference docs for PmaAbsoluteUri
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 1099f68c1a94c39e1f04baa6403152f00b3ee345
https://github.com/phpmyadmin/phpmyadmin/commit/1099f68c1a94c39e1f04baa6403…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M doc/config.rst
M doc/faq.rst
M libraries/config.default.php
Log Message:
-----------
Reintroduce PmaAbsoluteUri setting
It has no affect yet.
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 83476322ba5a31caf17651ac57256da54b3cda10
https://github.com/phpmyadmin/phpmyadmin/commit/83476322ba5a31caf17651ac572…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/libraries/PMA_user_preferences_test.php
Log Message:
-----------
Use PmaAbsolueUri for cookie path
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 01b9db6b1c6f986ee38b814b37879082cd2d4520
https://github.com/phpmyadmin/phpmyadmin/commit/01b9db6b1c6f986ee38b814b378…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
M libraries/core.lib.php
M libraries/session.inc.php
M test/classes/ConfigTest.php
Log Message:
-----------
Rename getCookiePath() to getRootPath()
It is not used only for cookies, so generic name makes more sense.
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: a458b704127c0cd1b21d8111842a7ff86043d74e
https://github.com/phpmyadmin/phpmyadmin/commit/a458b704127c0cd1b21d8111842…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
Log Message:
-----------
Use PmaAbsoluteUri for isHttps
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: f6a64ed83518aad7985942158fc492d7e6cbec62
https://github.com/phpmyadmin/phpmyadmin/commit/f6a64ed83518aad7985942158fc…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Reintroduced simplified PmaAbsoluteUri configuration directive
Fixes #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 7898060916b7b9d82ef35d73117228c7246f510a
https://github.com/phpmyadmin/phpmyadmin/commit/7898060916b7b9d82ef35d73117…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
M test/classes/ConfigTest.php
Log Message:
-----------
Ensure PmaAbsoluteUri ends with /
This was probably most frequest user error we want to fix.
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 07985b5ef2c726d090607585cf5f92b39061b6a4
https://github.com/phpmyadmin/phpmyadmin/commit/07985b5ef2c726d090607585cf5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6'
Commit: 23e01d306ac1c0cd9a2cb916d6c1e0b4256efecb
https://github.com/phpmyadmin/phpmyadmin/commit/23e01d306ac1c0cd9a2cb916d6c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
M doc/config.rst
M doc/faq.rst
M js/functions.js
M libraries/Config.php
M libraries/config.default.php
M libraries/core.lib.php
M libraries/session.inc.php
M test/.htaccess
M test/classes/ConfigTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/libraries/PMA_user_preferences_test.php
M user_password.php
Log Message:
-----------
Merge branch 'QA_4_6'
Commit: a02f9c6ad03fd87d907865191128c363addc6b05
https://github.com/phpmyadmin/phpmyadmin/commit/a02f9c6ad03fd87d90786519112…
Author: dingo thirteen <dingo13(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M po/nl.po
Log Message:
-----------
Translated using Weblate (Dutch)
Currently translated at 100.0% (3206 of 3206 strings)
[CI skip]
Commit: 9d3263c9f34c2225c27286487a058e02eb703585
https://github.com/phpmyadmin/phpmyadmin/commit/9d3263c9f34c2225c27286487a0…
Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M po/it.po
Log Message:
-----------
Translated using Weblate (Italian)
Currently translated at 100.0% (3206 of 3206 strings)
[CI skip]
Commit: df5099459db3d311ac86ca36ba4dd03e8a19c9db
https://github.com/phpmyadmin/phpmyadmin/commit/df5099459db3d311ac86ca36ba4…
Author: Weblate <noreply(a)weblate.org>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
M doc/config.rst
M doc/faq.rst
M js/functions.js
M libraries/Config.php
M libraries/config.default.php
M libraries/core.lib.php
M libraries/session.inc.php
M test/.htaccess
M test/classes/ConfigTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/libraries/PMA_user_preferences_test.php
M user_password.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 23b34b18804e0f94cec847fda67c803099b3d58d
https://github.com/phpmyadmin/phpmyadmin/commit/23b34b18804e0f94cec847fda67…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
M js/navigation.js
M libraries/URL.php
M libraries/navigation/Navigation.php
M libraries/navigation/nodes/NodeDatabase.php
M libraries/navigation/nodes/NodeDatabaseChild.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Commit: 5072d9a0dfa062268bf124fb9d11e439be22df3d
https://github.com/phpmyadmin/phpmyadmin/commit/5072d9a0dfa062268bf124fb9d1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e78ca476e19b...5072d9a0dfa0
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: a02f9c6ad03fd87d907865191128c363addc6b05
https://github.com/phpmyadmin/phpmyadmin/commit/a02f9c6ad03fd87d90786519112…
Author: dingo thirteen <dingo13(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M po/nl.po
Log Message:
-----------
Translated using Weblate (Dutch)
Currently translated at 100.0% (3206 of 3206 strings)
[CI skip]
Commit: 9d3263c9f34c2225c27286487a058e02eb703585
https://github.com/phpmyadmin/phpmyadmin/commit/9d3263c9f34c2225c27286487a0…
Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M po/it.po
Log Message:
-----------
Translated using Weblate (Italian)
Currently translated at 100.0% (3206 of 3206 strings)
[CI skip]
Commit: df5099459db3d311ac86ca36ba4dd03e8a19c9db
https://github.com/phpmyadmin/phpmyadmin/commit/df5099459db3d311ac86ca36ba4…
Author: Weblate <noreply(a)weblate.org>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
M doc/config.rst
M doc/faq.rst
M js/functions.js
M libraries/Config.php
M libraries/config.default.php
M libraries/core.lib.php
M libraries/session.inc.php
M test/.htaccess
M test/classes/ConfigTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/libraries/PMA_user_preferences_test.php
M user_password.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7898060916b7...df5099459db3
Branch: refs/heads/QA_4_6
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 311be7515c8c280041565594ca853f31a4177082
https://github.com/phpmyadmin/phpmyadmin/commit/311be7515c8c280041565594ca8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M js/functions.js
M libraries/core.lib.php
M test/.htaccess
Log Message:
-----------
Use https when available
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 76a471a790bf31873f469866374dfbab63e5f40c
https://github.com/phpmyadmin/phpmyadmin/commit/76a471a790bf31873f469866374…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M user_password.php
Log Message:
-----------
Avoid problems with PHP comparison
- allow password where empty returns true
- compare using ===
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b53fff29b20ebdc04aa34515e3c3a7940c2e065e
https://github.com/phpmyadmin/phpmyadmin/commit/b53fff29b20ebdc04aa34515e3c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M doc/config.rst
M doc/faq.rst
Log Message:
-----------
Crossreference docs for PmaAbsoluteUri
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 1099f68c1a94c39e1f04baa6403152f00b3ee345
https://github.com/phpmyadmin/phpmyadmin/commit/1099f68c1a94c39e1f04baa6403…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M doc/config.rst
M doc/faq.rst
M libraries/config.default.php
Log Message:
-----------
Reintroduce PmaAbsoluteUri setting
It has no affect yet.
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 83476322ba5a31caf17651ac57256da54b3cda10
https://github.com/phpmyadmin/phpmyadmin/commit/83476322ba5a31caf17651ac572…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/libraries/PMA_user_preferences_test.php
Log Message:
-----------
Use PmaAbsolueUri for cookie path
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 01b9db6b1c6f986ee38b814b37879082cd2d4520
https://github.com/phpmyadmin/phpmyadmin/commit/01b9db6b1c6f986ee38b814b378…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
M libraries/core.lib.php
M libraries/session.inc.php
M test/classes/ConfigTest.php
Log Message:
-----------
Rename getCookiePath() to getRootPath()
It is not used only for cookies, so generic name makes more sense.
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: a458b704127c0cd1b21d8111842a7ff86043d74e
https://github.com/phpmyadmin/phpmyadmin/commit/a458b704127c0cd1b21d8111842…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
Log Message:
-----------
Use PmaAbsoluteUri for isHttps
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: f6a64ed83518aad7985942158fc492d7e6cbec62
https://github.com/phpmyadmin/phpmyadmin/commit/f6a64ed83518aad7985942158fc…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Reintroduced simplified PmaAbsoluteUri configuration directive
Fixes #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 7898060916b7b9d82ef35d73117228c7246f510a
https://github.com/phpmyadmin/phpmyadmin/commit/7898060916b7b9d82ef35d73117…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M libraries/Config.php
M test/classes/ConfigTest.php
Log Message:
-----------
Ensure PmaAbsoluteUri ends with /
This was probably most frequest user error we want to fix.
Issue #12374
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/41613c512dd2...7898060916b7
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 44760aca0b8c818a839b3a8edc0e0b01b981d467
https://github.com/phpmyadmin/phpmyadmin/commit/44760aca0b8c818a839b3a8edc0…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
M js/navigation.js
M libraries/URL.php
M libraries/navigation/Navigation.php
M libraries/navigation/nodes/NodeDatabase.php
M libraries/navigation/nodes/NodeDatabaseChild.php
Log Message:
-----------
Use URL::getCommon() for all params to be included in the urls
Don't append the parameters in query string while building the HTML; was going awry when URL::getCommon() returned blank
Fix #12463
More instances of such appending of URL parameters which are present in the codebase,
have to fixed.
ChangeLog entry for #12463
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: e78ca476e19b1f735c35c84fa3af3a862b4f26a2
https://github.com/phpmyadmin/phpmyadmin/commit/e78ca476e19b1f735c35c84fa3a…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2016-08-17 (Wed, 17 Aug 2016)
Changed paths:
M ChangeLog
M js/shortcuts_handler.js
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Conflicts:
ChangeLog
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84d5c028b294...e78ca476e19b