Git November 2016

git@phpmyadmin.net

22 participants
263 discussions

[phpmyadmin/phpmyadmin] 9970d9: Release 4.6.5.1
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9970d9d32e858c74ba13f64a810effe60629e70e https://github.com/phpmyadmin/phpmyadmin/commit/9970d9d32e858c74ba13f64a810… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Release 4.6.5.1 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 88bbbcf27da8d92e7b8ee447ce889136dbf890b5 https://github.com/phpmyadmin/phpmyadmin/commit/88bbbcf27da8d92e7b8ee447ce8… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M ChangeLog M libraries/tbl_partition_definition.inc.php Log Message: ----------- Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 Commit: c1acb3a212872fd235446efa446c3531653a5917 https://github.com/phpmyadmin/phpmyadmin/commit/c1acb3a212872fd235446efa446… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2016-11-26 (Sat, 26 Nov 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.6.6-dev Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: 4d26bec55acd47cc2b5298802269284b3d16b374 https://github.com/phpmyadmin/phpmyadmin/commit/4d26bec55acd47cc2b529880226… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M doc/setup.rst Log Message: ----------- Adjust docs to latest Docker image changes Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4e81f883f80e6686417fc4b74d1df6400fcbdbba https://github.com/phpmyadmin/phpmyadmin/commit/4e81f883f80e6686417fc4b74d1… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M ChangeLog M doc/setup.rst Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/73f1007c3586...4e81f883f80e

1 0

[phpmyadmin/docker] f58155: Move all configuration to /etc
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: f581555bcf8384117d2bac4a7f26fe065175af3a https://github.com/phpmyadmin/docker/commit/f581555bcf8384117d2bac4a7f26fe0… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M .travis.yml M Dockerfile M README.md R config.inc.php M etc/php.ini A etc/phpmyadmin/config.inc.php Log Message: ----------- Move all configuration to /etc * configuration is now in /etc * reorder commands for better Docker layer caching Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f544b5ca9773b25a6e15385b195518c34114b723 https://github.com/phpmyadmin/docker/commit/f544b5ca9773b25a6e15385b195518c… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M .travis.yml M Dockerfile M README.md R config.inc.php M etc/php.ini A etc/phpmyadmin/config.inc.php Log Message: ----------- Merge pull request #92 from nijel/master Try to reorder commands for better Docker layer caching Compare: https://github.com/phpmyadmin/docker/compare/d53aadc0bb80...f544b5ca9773

1 0

[phpmyadmin/docker] 5cef68: Cleanup documentation folder
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 5cef68749ad1167b3e2944c31da8fdf45857983a https://github.com/phpmyadmin/docker/commit/5cef68749ad1167b3e2944c31da8fdf… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Cleanup documentation folder We really do not need documentation source in the Docker image. Fixes #79 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d53aadc0bb801b543c470e67da17f45d633dce0c https://github.com/phpmyadmin/docker/commit/d53aadc0bb801b543c470e67da17f45… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Merge pull request #93 from nijel/doc-cleanup Cleanup documentation folder Compare: https://github.com/phpmyadmin/docker/compare/6c1410cbef0e...d53aadc0bb80

1 0

[phpmyadmin/docker] 352e5f: Split setting variable from export
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 352e5fe6eda6c2e25a4e68bee954394ca38a9df2 https://github.com/phpmyadmin/docker/commit/352e5fe6eda6c2e25a4e68bee954394… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Split setting variable from export This way we can correctly get error from the mkdir. Fixes #86 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6c1410cbef0e5984091f383161823940f1ffdc7e https://github.com/phpmyadmin/docker/commit/6c1410cbef0e5984091f38316182394… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Merge pull request #91 from nijel/master Split setting variable from export Compare: https://github.com/phpmyadmin/docker/compare/c81443abd100...6c1410cbef0e

1 0

[phpmyadmin/docker] 717738: Bump version to 4.6.5.1
by Michal Čihař 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 7177389b2042ccce23d5d7b1e7b727702990f55d https://github.com/phpmyadmin/docker/commit/7177389b2042ccce23d5d7b1e7b7277… Author: vancepym <vancepym(a)163.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Bump version to 4.6.5.1 Commit: c81443abd100de2b64191f785ff9bb7cd762a2b2 https://github.com/phpmyadmin/docker/commit/c81443abd100de2b64191f785ff9bb7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M Dockerfile Log Message: ----------- Merge pull request #90 from vancepym/patch-1 Bump version to 4.6.5.1 Compare: https://github.com/phpmyadmin/docker/compare/3142368a079d...c81443abd100

1 0

[phpmyadmin/phpmyadmin] 7d7c5e: Translated using Weblate (Chinese (Taiwan))
by Weblate 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7d7c5e6897aa53ca44fd1bbf980c1de82087e034 https://github.com/phpmyadmin/phpmyadmin/commit/7d7c5e6897aa53ca44fd1bbf980… Author: ncwgf <hd(a)cgsword.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M po/zh_TW.po Log Message: ----------- Translated using Weblate (Chinese (Taiwan)) Currently translated at 98.7% (3192 of 3232 strings) [CI skip] Commit: 89f2305cb5000644f7883e1882a5a0c904086033 https://github.com/phpmyadmin/phpmyadmin/commit/89f2305cb5000644f7883e1882a… Author: Marc Delisle <marc(a)infomarc.info> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.9% (3229 of 3232 strings) [CI skip] Commit: 73f1007c3586e7760001baf5066df50dd96ee45b https://github.com/phpmyadmin/phpmyadmin/commit/73f1007c3586e7760001baf5066… Author: Weblate <noreply(a)weblate.org> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/server_privileges.lib.php A templates/privileges/initials_row.phtml M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/420cb4ff7afd...73f1007c3586

1 0

[phpmyadmin/phpmyadmin] 9e27e0: Refactor intials row to use template
by Deven Bansod 28 Nov '16

28 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9e27e02688f4bb5e425fc2a9819fdbc3f55f82c9 https://github.com/phpmyadmin/phpmyadmin/commit/9e27e02688f4bb5e425fc2a9819… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M libraries/server_privileges.lib.php A templates/privileges/initials_row.phtml Log Message: ----------- Refactor intials row to use template Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 0a56073acd6d934f5c498bffbd9ce3701c81b06f https://github.com/phpmyadmin/phpmyadmin/commit/0a56073acd6d934f5c498bffbd9… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M test/libraries/PMA_server_privileges_test.php Log Message: ----------- Adjust tests Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 420cb4ff7afdd8e061216c2b15a6e72fc719be67 https://github.com/phpmyadmin/phpmyadmin/commit/420cb4ff7afdd8e061216c2b15a… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2016-11-28 (Mon, 28 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7a890b884f8a...420cb4ff7afd

1 0

[phpmyadmin/phpmyadmin] 7a890b: Translated using Weblate (French)
by Carlos Ferreira 27 Nov '16

27 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7a890b884f8a9462477b343c21bd82564353fd8c https://github.com/phpmyadmin/phpmyadmin/commit/7a890b884f8a9462477b343c21b… Author: Carlos Ferreira <c.ferreira(a)acsiiweb.com> Date: 2016-11-27 (Sun, 27 Nov 2016) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 99.7% (3225 of 3232 strings) [CI skip]

1 0

[phpmyadmin/localized_docs] 6e70f5: Translated using Weblate (Czech)
by ratajs 26 Nov '16

26 Nov '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 6e70f5b40cb1e8ec87833240c604919e7833d699 https://github.com/phpmyadmin/localized_docs/commit/6e70f5b40cb1e8ec8783324… Author: ratajs <simonrataj(a)seznam.cz> Date: 2016-11-26 (Sat, 26 Nov 2016) Changed paths: M po/cs.mo M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 15.6% (362 of 2315 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin]
by ibennetch 26 Nov '16

26 Nov '16

Branch: refs/tags/RELEASE_4_6_5_1 Home: https://github.com/phpmyadmin/phpmyadmin

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git November 2016