Git May 2016

git@phpmyadmin.net

18 participants
133 discussions

[phpmyadmin/docker] 15ca16: Change deps to php5
by Michal Čihař 27 May '16

27 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 15ca16c9d042ddbda38f40844595386881772e73 https://github.com/phpmyadmin/docker/commit/15ca16c9d042ddbda38f40844595386… Author: Michal Čihař <michal(a)cihar.com> 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ř <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 6f4136: Backport URL redirection from later releases
by Michal Čihař 27 May '16

27 May '16

Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6f413680b172ae0b25f2509f1c7bb21405e8eaf9 https://github.com/phpmyadmin/phpmyadmin/commit/6f413680b172ae0b25f2509f1c7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-23 (Mon, 23 May 2016) Changed paths: M libraries/core.lib.php M url.php Log Message: ----------- Backport URL redirection from later releases - fixes token leak for browsers which do not change referer on Location header - adds whitelist to avoid redirection to any domain Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] d78e17: Do not use dirname for calculating cookie path
by Michal Čihař 27 May '16

27 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d78e173b34b2a318677e30900a4399b53d9b28b3 https://github.com/phpmyadmin/phpmyadmin/commit/d78e173b34b2a318677e30900a4… Author: Michal Čihař <michal(a)cihar.com> 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ř <michal(a)cihar.com> Commit: ab29ec9947907acd276c4ba6ba22980988d29483 https://github.com/phpmyadmin/phpmyadmin/commit/ab29ec9947907acd276c4ba6ba2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-27 (Fri, 27 May 2016) Changed paths: M ChangeLog M libraries/Config.php M test/classes/ConfigTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ba20c9fc7e39...ab29ec994790

1 0

[phpmyadmin/phpmyadmin] d78e17: Do not use dirname for calculating cookie path
by Michal Čihař 27 May '16

27 May '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d78e173b34b2a318677e30900a4399b53d9b28b3 https://github.com/phpmyadmin/phpmyadmin/commit/d78e173b34b2a318677e30900a4… Author: Michal Čihař <michal(a)cihar.com> 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ř <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] ba20c9: We no longer need to create MAINT branches for eac...
by Isaac Bennetch 26 May '16

26 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ba20c9fc7e39f8db1baffebad5b47132a0af525f https://github.com/phpmyadmin/phpmyadmin/commit/ba20c9fc7e39f8db1baffebad5b… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M scripts/create-release.sh Log Message: ----------- We no longer need to create MAINT branches for each release; we'll do this on demand from the RELEASE_x_y_z tag if needed. Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] b56df9: Translated using Weblate (Estonian)
by Michal Čihař 26 May '16

26 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b56df997316967f770f54bf00fe1418ca11a8994 https://github.com/phpmyadmin/phpmyadmin/commit/b56df997316967f770f54bf00fe… Author: Kristjan Räts <kristjanrats(a)gmail.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M po/et.po Log Message: ----------- Translated using Weblate (Estonian) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] Commit: e72c1d4da95e549b7329b30b3561a7d4caacc5a4 https://github.com/phpmyadmin/phpmyadmin/commit/e72c1d4da95e549b7329b30b356… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M test/classes/ConfigTest.php Log Message: ----------- Add more tests for getCookiePath (issue #12249) Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 88f22797813407d734607404f56b71fcab1b3818 https://github.com/phpmyadmin/phpmyadmin/commit/88f22797813407d734607404f56… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-26 (Thu, 26 May 2016) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' Commit: c71e8423491f266b8e7bff487979513226faddc2 https://github.com/phpmyadmin/phpmyadmin/commit/c71e8423491f266b8e7bff48797… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M test/classes/ConfigTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/16d146400978...c71e8423491f

1 0

[phpmyadmin/phpmyadmin] e72c1d: Add more tests for getCookiePath (issue #12249)
by Michal Čihař 26 May '16

26 May '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e72c1d4da95e549b7329b30b3561a7d4caacc5a4 https://github.com/phpmyadmin/phpmyadmin/commit/e72c1d4da95e549b7329b30b356… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M test/classes/ConfigTest.php Log Message: ----------- Add more tests for getCookiePath (issue #12249) Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/localized_docs] 5cf1ad: Update documentation to match master
by Michal Čihař 26 May '16

26 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 5cf1addbab709b0f7a08f3abf19ec8dfc02cdc2b https://github.com/phpmyadmin/localized_docs/commit/5cf1addbab709b0f7a08f3a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: A docs/ar/bookmarks.rst A docs/ar/charts.rst M docs/ar/conf.py A docs/ar/images A docs/ar/relations.rst A docs/az/bookmarks.rst A docs/az/charts.rst M docs/az/conf.py A docs/az/images A docs/az/relations.rst A docs/bs/bookmarks.rst A docs/bs/charts.rst M docs/bs/conf.py A docs/bs/images A docs/bs/relations.rst A docs/ca/bookmarks.rst A docs/ca/charts.rst M docs/ca/conf.py A docs/ca/images A docs/ca/relations.rst A docs/cs/bookmarks.rst A docs/cs/charts.rst M docs/cs/conf.py A docs/cs/images A docs/cs/relations.rst A docs/da/bookmarks.rst A docs/da/charts.rst M docs/da/conf.py A docs/da/images A docs/da/relations.rst A docs/de/bookmarks.rst A docs/de/charts.rst M docs/de/conf.py A docs/de/images A docs/de/relations.rst A docs/el/bookmarks.rst A docs/el/charts.rst M docs/el/conf.py A docs/el/images A docs/el/relations.rst A docs/en_GB/bookmarks.rst A docs/en_GB/charts.rst M docs/en_GB/conf.py A docs/en_GB/images A docs/en_GB/relations.rst A docs/eo/bookmarks.rst A docs/eo/charts.rst M docs/eo/conf.py A docs/eo/images A docs/eo/relations.rst A docs/es/bookmarks.rst A docs/es/charts.rst M docs/es/conf.py A docs/es/images A docs/es/relations.rst A docs/et/bookmarks.rst A docs/et/charts.rst M docs/et/conf.py A docs/et/images A docs/et/relations.rst A docs/fi/bookmarks.rst A docs/fi/charts.rst M docs/fi/conf.py A docs/fi/images A docs/fi/relations.rst A docs/fr/bookmarks.rst A docs/fr/charts.rst M docs/fr/conf.py A docs/fr/images A docs/fr/relations.rst A docs/fy/bookmarks.rst A docs/fy/charts.rst M docs/fy/conf.py A docs/fy/images A docs/fy/relations.rst A docs/gl/bookmarks.rst A docs/gl/charts.rst M docs/gl/conf.py A docs/gl/images A docs/gl/relations.rst A docs/hu/bookmarks.rst A docs/hu/charts.rst M docs/hu/conf.py A docs/hu/images A docs/hu/relations.rst A docs/hy/bookmarks.rst A docs/hy/charts.rst M docs/hy/conf.py A docs/hy/images A docs/hy/relations.rst A docs/it/bookmarks.rst A docs/it/charts.rst M docs/it/conf.py A docs/it/images A docs/it/relations.rst A docs/ja/bookmarks.rst A docs/ja/charts.rst M docs/ja/conf.py A docs/ja/images A docs/ja/relations.rst A docs/ka/bookmarks.rst A docs/ka/charts.rst M docs/ka/conf.py A docs/ka/images A docs/ka/relations.rst A docs/lt/bookmarks.rst A docs/lt/charts.rst M docs/lt/conf.py A docs/lt/images A docs/lt/relations.rst A docs/mn/bookmarks.rst A docs/mn/charts.rst M docs/mn/conf.py A docs/mn/images A docs/mn/relations.rst A docs/nb/bookmarks.rst A docs/nb/charts.rst M docs/nb/conf.py A docs/nb/images A docs/nb/relations.rst A docs/nl/bookmarks.rst A docs/nl/charts.rst M docs/nl/conf.py A docs/nl/images A docs/nl/relations.rst A docs/pl/bookmarks.rst A docs/pl/charts.rst M docs/pl/conf.py A docs/pl/images A docs/pl/relations.rst A docs/pt_BR/bookmarks.rst A docs/pt_BR/charts.rst M docs/pt_BR/conf.py A docs/pt_BR/images A docs/pt_BR/relations.rst A docs/ro/bookmarks.rst A docs/ro/charts.rst M docs/ro/conf.py A docs/ro/images A docs/ro/relations.rst A docs/sk/bookmarks.rst A docs/sk/charts.rst M docs/sk/conf.py A docs/sk/images A docs/sk/relations.rst A docs/sl/bookmarks.rst A docs/sl/charts.rst M docs/sl/conf.py A docs/sl/images A docs/sl/relations.rst A docs/sq/bookmarks.rst A docs/sq/charts.rst M docs/sq/conf.py A docs/sq/images A docs/sq/relations.rst A docs/sv/bookmarks.rst A docs/sv/charts.rst M docs/sv/conf.py A docs/sv/images A docs/sv/relations.rst A docs/tr/bookmarks.rst A docs/tr/charts.rst M docs/tr/conf.py A docs/tr/images A docs/tr/relations.rst A docs/zh_CN/bookmarks.rst A docs/zh_CN/charts.rst M docs/zh_CN/conf.py A docs/zh_CN/images A docs/zh_CN/relations.rst A docs/zh_TW/bookmarks.rst A docs/zh_TW/charts.rst M docs/zh_TW/conf.py A docs/zh_TW/images A docs/zh_TW/relations.rst M locale/bookmarks.pot M locale/charts.pot M locale/config.pot M locale/copyright.pot M locale/credits.pot M locale/developers.pot M locale/faq.pot M locale/glossary.pot M locale/import_export.pot M locale/index.pot M locale/intro.pot M locale/other.pot M locale/privileges.pot M locale/relations.pot M locale/require.pot M locale/setup.pot M locale/transformations.pot M locale/user.pot M locale/vendors.pot M phpmyadmin M po/ar.mo M po/ar.po M po/az.mo M po/az.po M po/bs.mo M po/bs.po M po/ca.mo M po/ca.po M po/cs.mo M po/cs.po M po/da.mo M po/da.po M po/de.mo M po/de.po M po/documentation.pot M po/el.mo M po/el.po M po/en_GB.mo M po/en_GB.po M po/eo.mo M po/eo.po M po/es.mo M po/es.po M po/et.mo M po/et.po M po/fi.mo M po/fi.po M po/fr.mo M po/fr.po M po/fy.mo M po/fy.po M po/gl.mo M po/gl.po M po/hu.mo M po/hu.po M po/hy.mo M po/hy.po M po/it.mo M po/it.po M po/ja.mo M po/ja.po M po/ka.mo M po/ka.po M po/lt.mo M po/lt.po M po/mn.mo M po/mn.po M po/nb.mo M po/nb.po M po/nl.mo M po/nl.po M po/pl.mo M po/pl.po M po/pt_BR.mo M po/pt_BR.po M po/ro.mo M po/ro.po M po/sk.mo M po/sk.po M po/sl.mo M po/sl.po M po/sq.mo M po/sq.po M po/sv.mo M po/sv.po M po/tr.mo M po/tr.po M po/zh_CN.mo M po/zh_CN.po M po/zh_TW.mo M po/zh_TW.po Log Message: ----------- Update documentation to match master Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/localized_docs] aa90aa: Translated using Weblate (Estonian)
by Kristjan Räts 26 May '16

26 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: aa90aa7ef5edd8c0e6046cddc8c7a3a107bf3c56 https://github.com/phpmyadmin/localized_docs/commit/aa90aa7ef5edd8c0e6046cd… Author: Kristjan Räts <kristjanrats(a)gmail.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M po/et.mo M po/et.po Log Message: ----------- Translated using Weblate (Estonian) Currently translated at 21.0% (423 of 2013 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 16d146: Fix typo
by Michal Čihař 26 May '16

26 May '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 16d14640097814857049fb1f34643f213d9502fd https://github.com/phpmyadmin/phpmyadmin/commit/16d14640097814857049fb1f346… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-05-26 (Thu, 26 May 2016) Changed paths: M doc/setup.rst Log Message: ----------- Fix typo Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git May 2016