Git December 2015

git@phpmyadmin.net

20 participants
376 discussions

[phpmyadmin/docker] 409324: Fix typo in title
by Michal Čihař 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 409324545e53aabe8acf768c9cd6c0411497dcc8 https://github.com/phpmyadmin/docker/commit/409324545e53aabe8acf768c9cd6c04… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M README.md Log Message: ----------- Fix typo in title Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cf8f6d45c85a556b0fef94e4ce5ebef232ac0555 https://github.com/phpmyadmin/docker/commit/cf8f6d45c85a556b0fef94e4ce5ebef… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M .travis.yml Log Message: ----------- Fix typo in test script Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/docker/compare/b1946a827ea3...cf8f6d45c85a

1 0

[phpmyadmin/docker] 2bd796: drop execute permission on run.sh - this is only r...
by Michal Čihař 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 2bd79639b29bc17a420de8ee506144418e70729c https://github.com/phpmyadmin/docker/commit/2bd79639b29bc17a420de8ee5061444… Author: Sebastian Mendel <sebastian.mendel(a)netresearch.de> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M run.sh Log Message: ----------- drop execute permission on run.sh - this is only required inside image Commit: ab4765226976b07b304f4b0da87413b05d7238bc https://github.com/phpmyadmin/docker/commit/ab4765226976b07b304f4b0da87413b… Author: Sebastian Mendel <sebastian.mendel(a)netresearch.de> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: A .dockerignore Log Message: ----------- add .dockerignore file - hide files competely from docker (deamon) for security and performance Commit: 844798cd19f8ded37c0748f74f7a363ee1463934 https://github.com/phpmyadmin/docker/commit/844798cd19f8ded37c0748f74f7a363… Author: Sebastian Mendel <sebastian.mendel(a)netresearch.de> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M .dockerignore A Makefile A docker-compose.testing.yml Log Message: ----------- add Makefile for easier building and testing Commit: b1946a827ea3c906167bc0d32c7a12e801e944f1 https://github.com/phpmyadmin/docker/commit/b1946a827ea3c906167bc0d32c7a12e… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: A .dockerignore A Makefile A docker-compose.testing.yml M run.sh Log Message: ----------- Merge pull request #6 from CybotTM/master add Makefile and .dockerignore Compare: https://github.com/phpmyadmin/docker/compare/020fd6f8c7aa...b1946a827ea3

1 0

[phpmyadmin/localized_docs] f32b53: Translated using Weblate (French)
by Marc Delisle 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: f32b53fd92cf53ad7a0899196e8cfe3f6253008f https://github.com/phpmyadmin/localized_docs/commit/f32b53fd92cf53ad7a08991… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M po/fr.mo M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 96.5% (1845 of 1911 strings) [CI skip]

1 0

[phpmyadmin/docker] 020fd6: Add support to specify MySQL server in environment
by Michal Čihař 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 020fd6f8c7aaf2f64f6f3a0bfb15374ea05f93fd https://github.com/phpmyadmin/docker/commit/020fd6f8c7aaf2f64f6f3a0bfb15374… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M .travis.yml M README.md M config.inc.linked.php Log Message: ----------- Add support to specify MySQL server in environment Fixes #4 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] c18f23: Translated using Weblate (Korean)
by Weblate 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c18f23e0639401c55da260eb50a2597e76ec26e9 https://github.com/phpmyadmin/phpmyadmin/commit/c18f23e0639401c55da260eb50a… Author: Yong Kim <kim(a)nhn.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 77.0% (2481 of 3222 strings) [CI skip] Commit: 2878da1eb8bd46dc2b11e93e5fb848e293981580 https://github.com/phpmyadmin/phpmyadmin/commit/2878da1eb8bd46dc2b11e93e5fb… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/74c651e4d8ad...2878da1eb8bd

1 0

[phpmyadmin/phpmyadmin] dade3f: Fix #11706 Database export template not saving com...
by Madhura Jayaratne 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dade3fa2e4a98008a828151d63b756380e1d6a56 https://github.com/phpmyadmin/phpmyadmin/commit/dade3fa2e4a98008a828151d63b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Fix #11706 Database export template not saving compression option Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 0375802fc0808e493e3f3ba3b186685a93f4ca3d https://github.com/phpmyadmin/phpmyadmin/commit/0375802fc0808e493e3f3ba3b18… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M po/ia.po M po/tr.po R scripts/decode_bug.php Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 Conflicts: ChangeLog Commit: 74c651e4d8ad5cc2997fee1e2d26b30ac118cbd0 https://github.com/phpmyadmin/phpmyadmin/commit/74c651e4d8ad5cc2997fee1e2d2… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/40644b5c330e...74c651e4d8ad

1 0

[phpmyadmin/phpmyadmin] 5f0c55: Translated using Weblate (Korean)
by Weblate 07 Dec '15

07 Dec '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5f0c55da4a69566061b9384f3487c3a741d96e29 https://github.com/phpmyadmin/phpmyadmin/commit/5f0c55da4a69566061b9384f348… Author: Yong Kim <kim(a)nhn.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 77.9% (2503 of 3211 strings) [CI skip] Commit: 39c97184e85b2c3a1076ff11e26df72d0a0fd1b8 https://github.com/phpmyadmin/phpmyadmin/commit/39c97184e85b2c3a1076ff11e26… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0375802fc080...39c97184e85b

1 0

[phpmyadmin/phpmyadmin] dade3f: Fix #11706 Database export template not saving com...
by Madhura Jayaratne 07 Dec '15

07 Dec '15

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: dade3fa2e4a98008a828151d63b756380e1d6a56 https://github.com/phpmyadmin/phpmyadmin/commit/dade3fa2e4a98008a828151d63b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M js/export.js Log Message: ----------- Fix #11706 Database export template not saving compression option Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 0375802fc0808e493e3f3ba3b186685a93f4ca3d https://github.com/phpmyadmin/phpmyadmin/commit/0375802fc0808e493e3f3ba3b18… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php M po/ia.po M po/tr.po R scripts/decode_bug.php Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 Conflicts: ChangeLog Compare: https://github.com/phpmyadmin/phpmyadmin/compare/23a70525aecd...0375802fc080

1 0

[phpmyadmin/scripts] b153f0: Update configuration details for the second server...
by Madhura Jayaratne 07 Dec '15

07 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: b153f017428686d48eb7fbaed70df67be3d6815c https://github.com/phpmyadmin/scripts/commit/b153f017428686d48eb7fbaed70df6… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-12-07 (Mon, 07 Dec 2015) Changed paths: M demo/php/config-common.inc.php Log Message: ----------- Update configuration details for the second server as well Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] af95b4: Translated using Weblate (Interlingua)
by Marc Delisle 06 Dec '15

06 Dec '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: af95b435541dc390f9cb03d31787df514d358c35 https://github.com/phpmyadmin/phpmyadmin/commit/af95b435541dc390f9cb03d3178… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 72.5% (2329 of 3211 strings) [CI skip] Commit: 5f02ec86f325be8028fde0516228a08e226300b6 https://github.com/phpmyadmin/phpmyadmin/commit/5f02ec86f325be8028fde051622… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] Commit: ca32b9f51a73a7664962896641db13e1e7d7f583 https://github.com/phpmyadmin/phpmyadmin/commit/ca32b9f51a73a7664962896641d… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: 23a70525aecddc71f643e199eb2f2bc2228006d0 https://github.com/phpmyadmin/phpmyadmin/commit/23a70525aecddc71f643e199eb2… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-06 (Sun, 06 Dec 2015) Changed paths: R scripts/decode_bug.php Log Message: ----------- This was related to the previous SQL parser. If someone still needs it to decode an old bug report, he/she can still get this script from an older branch. Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 0ca15a9c50cd8f56285d6554c62dad9a200c7434 https://github.com/phpmyadmin/phpmyadmin/commit/0ca15a9c50cd8f56285d6554c62… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-06 (Sun, 06 Dec 2015) Log Message: ----------- Merge commit 'ca32b9f' Commit: 40644b5c330ea79bf4b85b5c878a59906d85d6f2 https://github.com/phpmyadmin/phpmyadmin/commit/40644b5c330ea79bf4b85b5c878… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-06 (Sun, 06 Dec 2015) Changed paths: R scripts/decode_bug.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/66c15daba0a4...40644b5c330e

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2015