- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 695464: Ignore composer.lock from git
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 695464de8a7d72d62ce6adc9ec44a30170468d32 https://github.com/phpmyadmin/phpmyadmin/commit/695464de8a7d72d62ce6adc9ec4… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .gitignore Log Message: ----------- Ignore composer.lock from git Issue #13346 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 695464: Ignore composer.lock from git
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 695464de8a7d72d62ce6adc9ec44a30170468d32 https://github.com/phpmyadmin/phpmyadmin/commit/695464de8a7d72d62ce6adc9ec4… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .gitignore Log Message: ----------- Ignore composer.lock from git Issue #13346 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bbf5ca915690dfe5e78d285527a3eb8f9d2a16e9 https://github.com/phpmyadmin/phpmyadmin/commit/bbf5ca915690dfe5e78d285527a… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Log Message: ----------- Merge branch 'QA_4_7' Commit: c4380018a71424de4e5c2ebe026d135e2af4c8d3 https://github.com/phpmyadmin/phpmyadmin/commit/c4380018a71424de4e5c2ebe026… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M scripts/create-release.sh Log Message: ----------- Avoid .gitignore modification when commiting composer.lock With --force we can add files which would be ignored. Issue #13346 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 87fd00915ab102914bf985238209e90db1a7663a https://github.com/phpmyadmin/phpmyadmin/commit/87fd00915ab102914bf98523820… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M scripts/create-release.sh Log Message: ----------- Remove composer.lock after tagging release We really want this file only on tags and not elsewhere. Fixes #13346 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b2ddd0c14ae2...87fd00915ab1

1 0

[phpmyadmin/phpmyadmin] 1512bd: Translated using Weblate (Belarusian)
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1512bd3f15214b465fc388dd3d3f1a4f264a2a43 https://github.com/phpmyadmin/phpmyadmin/commit/1512bd3f15214b465fc388dd3d3… Author: Viktar Vauchkevich <victorenator(a)gmail.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M po/be.po Log Message: ----------- Translated using Weblate (Belarusian) Currently translated at 56.9% (1820 of 3198 strings) [CI skip] Commit: e23d1749425dc94ad693f961308ecfaca33ff856 https://github.com/phpmyadmin/phpmyadmin/commit/e23d1749425dc94ad693f961308… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Specify -e parameter to sed Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d2240cd8f24b0fe1bf68d5e8897b9c2c3de69cd6 https://github.com/phpmyadmin/phpmyadmin/commit/d2240cd8f24b0fe1bf68d5e8897… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M libraries/Util.php Log Message: ----------- Fix phpseclib method invocation Apparently this has been broken for quite some time on PHP 5 and nobody noticed. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9748c35b7649d6bd98d7a4aacf17624f722b3c12 https://github.com/phpmyadmin/phpmyadmin/commit/9748c35b7649d6bd98d7a4aacf1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' Commit: b2ddd0c14ae28fa20f02338813298cc714f127f2 https://github.com/phpmyadmin/phpmyadmin/commit/b2ddd0c14ae28fa20f023388132… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a12a41e73aae...b2ddd0c14ae2

1 0

[phpmyadmin/phpmyadmin] e23d17: Specify -e parameter to sed
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e23d1749425dc94ad693f961308ecfaca33ff856 https://github.com/phpmyadmin/phpmyadmin/commit/e23d1749425dc94ad693f961308… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Specify -e parameter to sed Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 1512bd: Translated using Weblate (Belarusian)
by Viktar Vauchkevich 02 Jun '17

02 Jun '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1512bd3f15214b465fc388dd3d3f1a4f264a2a43 https://github.com/phpmyadmin/phpmyadmin/commit/1512bd3f15214b465fc388dd3d3… Author: Viktar Vauchkevich <victorenator(a)gmail.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M po/be.po Log Message: ----------- Translated using Weblate (Belarusian) Currently translated at 56.9% (1820 of 3198 strings) [CI skip]

1 0

[phpmyadmin/shapefile] 5f7b87: Update Travis to Trusty
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/shapefile Commit: 5f7b87947c131f233b320d25a4baffcab4da51f0 https://github.com/phpmyadmin/shapefile/commit/5f7b87947c131f233b320d25a4ba… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Update Travis to Trusty This is needed to have HHVM working. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/motranslator] 43cfb6: Run PHP 5.3 tests on Precise
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/motranslator Commit: 43cfb636f1488e358a8eb34b61222a3e2500cf1f https://github.com/phpmyadmin/motranslator/commit/43cfb636f1488e358a8eb34b6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Run PHP 5.3 tests on Precise Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/sql-parser] a3292c: Include PHP 5.3 on Precise
by Michal Čihař 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: a3292c43d407b2ab69184633fc5cd74e6acf5bf7 https://github.com/phpmyadmin/sql-parser/commit/a3292c43d407b2ab69184633fc5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Include PHP 5.3 on Precise Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 10e04628b567ca53672deb9abf5d03fa39d72f84 https://github.com/phpmyadmin/sql-parser/commit/10e04628b567ca53672deb9abf5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M .travis.yml Log Message: ----------- Test with HHVM 3.12 and 3.18 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/sql-parser/compare/f078bd403991...10e04628b567

1 0

[phpmyadmin/phpmyadmin] c90557: Translated using Weblate (Belarusian)
by Weblate 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c90557234b01d4263c4d8588abadb88217d01b31 https://github.com/phpmyadmin/phpmyadmin/commit/c90557234b01d4263c4d8588aba… Author: Viktar Vauchkevich <victorenator(a)gmail.com> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M po/be.po Log Message: ----------- Translated using Weblate (Belarusian) Currently translated at 56.9% (1826 of 3207 strings) [CI skip] Commit: a12a41e73aaecb660326f658c31b87da06e8c8c2 https://github.com/phpmyadmin/phpmyadmin/commit/a12a41e73aaecb660326f658c31… Author: Weblate <noreply(a)weblate.org> Date: 2017-06-02 (Fri, 02 Jun 2017) Changed paths: M doc/setup.rst Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a9626ecd3114...a12a41e73aae

1 0

[phpmyadmin/phpmyadmin] a9626e: Slight improvement to phrasing
by Isaac Bennetch 02 Jun '17

02 Jun '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a9626ecd3114273c0ec53f4c863b4e8540435edc https://github.com/phpmyadmin/phpmyadmin/commit/a9626ecd3114273c0ec53f4c863… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2017-06-01 (Thu, 01 Jun 2017) Changed paths: M doc/setup.rst Log Message: ----------- Slight improvement to phrasing Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com>

1 0