Git March 2017

git@phpmyadmin.net

32 participants
258 discussions

[phpmyadmin/docker] ec28d9: Add database containers on compose test env

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: ec28d9334952aff19c270f09775dd758f95841e4 https://github.com/phpmyadmin/docker/commit/ec28d9334952aff19c270f09775dd75… Author: Paulo Lobato <paulo.lobatojr(a)hotmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M docker-compose.testing.yml Log Message: ----------- Add database containers on compose test env - Add MariaDB 10.1 version - Add MySQL 5.7 version - Link databases to PHPMyAdmin container Commit: 4ddc41bc29df7bab345a8f4fd248d4ccd31cd439 https://github.com/phpmyadmin/docker/commit/4ddc41bc29df7bab345a8f4fd248d4c… Author: Paulo Lobato <paulo.lobatojr(a)hotmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M README.md Log Message: ----------- Document the docker-compose test environment Commit: 446ed9e0d0a49fae722649bfa8ba3f77e58934a8 https://github.com/phpmyadmin/docker/commit/446ed9e0d0a49fae722649bfa8ba3f7… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .dockerignore A Dockerfile-testing M docker-compose.testing.yml A test-mariadb.ini A test-mysql.ini Log Message: ----------- Use separate Dockerfile for testing image Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ed5d9c5fc94103d38b68f07ed1b0c92cda87c295 https://github.com/phpmyadmin/docker/commit/ed5d9c5fc94103d38b68f07ed1b0c92… Author: Paulo Lobato <paulo.lobatojr(a)hotmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-docker.sh Log Message: ----------- Provision local test env similar the CI's tests - Run tests inside or not container Commit: d79872987d71686b4fff6192a6ed0ecf9fcc5a24 https://github.com/phpmyadmin/docker/commit/d79872987d71686b4fff6192a6ed0ec… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-docker.sh Log Message: ----------- Avoid setting set -e We are handling error codes, so we do not want script to terminate automatically Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f5c3a1b62801be35755071189132ac69bbe844a2 https://github.com/phpmyadmin/docker/commit/f5c3a1b62801be35755071189132ac6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-docker.sh Log Message: ----------- Avoid using echo -e It is not working on some /bin/sh versions and there is no reason to enforce bash just because of this. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 24679b0c0bd58583d55c8fb2b67e5418bb727a67 https://github.com/phpmyadmin/docker/commit/24679b0c0bd58583d55c8fb2b67e541… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Run docker-compose tests in Travis Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5d3536c3815630f83775f1c8c7c425089e595cb6 https://github.com/phpmyadmin/docker/commit/5d3536c3815630f83775f1c8c7c4250… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .dockerignore Log Message: ----------- Ignore testing dockerfile from docker Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b45585ea00b24567cb126cca4a9c66232936c2a1 https://github.com/phpmyadmin/docker/commit/b45585ea00b24567cb126cca4a9c662… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-mariadb.ini M test-mysql.ini Log Message: ----------- Remove trailing whitespace Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a7aa88b4c6a588ac2050df2928aca74b32dc8ad8 https://github.com/phpmyadmin/docker/commit/a7aa88b4c6a588ac2050df2928aca74… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Specify correct server to test Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e5a78047b27509959c6d3797ebf47ea49ee3f4fc https://github.com/phpmyadmin/docker/commit/e5a78047b27509959c6d3797ebf47ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .dockerignore R Dockerfile-testing R config.test.inc.php M docker-compose.testing.yml R phpmyadmin_test.py R test-docker.sh R test-mariadb.ini R test-mysql.ini A testing/Dockerfile A testing/config.test.inc.php A testing/phpmyadmin_test.py A testing/test-docker.sh A testing/test-mariadb.ini A testing/test-mysql.ini A testing/world.sql R world.sql Log Message: ----------- Move all testing files into subdirectory This makes the file structure a bit cleaner. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b35554203c9a6ea9861c0bb1b4658e909a8f2118 https://github.com/phpmyadmin/docker/commit/b35554203c9a6ea9861c0bb1b4658e9… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Fix path to testing script Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 21b080416681e57ee264a1c95c043132936a1cfa https://github.com/phpmyadmin/docker/commit/21b080416681e57ee264a1c95c04313… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M docker-compose.testing.yml Log Message: ----------- Use latest images for composer testing as well Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2ebc4587664a01c151ba971bad02bf12f3bc738e https://github.com/phpmyadmin/docker/commit/2ebc4587664a01c151ba971bad02bf1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/Dockerfile M testing/test-docker.sh Log Message: ----------- Run pip installation while building Docker container Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b5305971ba5ecf18b47611ff3cf7e832267dd08e https://github.com/phpmyadmin/docker/commit/b5305971ba5ecf18b47611ff3cf7e83… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml A testing/wait-for-testing.sh Log Message: ----------- Verify test result from docker-compose.testing.yml Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6736b49f7a96c031b710a2f13c48242ca855e348 https://github.com/phpmyadmin/docker/commit/6736b49f7a96c031b710a2f13c48242… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Fix expression calculation Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 61bc237761b58ab44baece1659462efac6208fc3 https://github.com/phpmyadmin/docker/commit/61bc237761b58ab44baece1659462ef… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Document this is supposed to fail right now Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a2782dd8f6d694651a126e57db6339debf26f235 https://github.com/phpmyadmin/docker/commit/a2782dd8f6d694651a126e57db6339d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/phpmyadmin_test.py Log Message: ----------- Detect correct path to sql file Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 63fd59434eb9e00ec3de940610b7378f2b9876ce https://github.com/phpmyadmin/docker/commit/63fd59434eb9e00ec3de940610b7378… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Display logs on timeout Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6314b17ebd0f043f4fca319bb3a37ba58db8dd6d https://github.com/phpmyadmin/docker/commit/6314b17ebd0f043f4fca319bb3a37ba… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Need more time to run tests Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 70b6297233aacc8cf61ae2488bb474473aa7d463 https://github.com/phpmyadmin/docker/commit/70b6297233aacc8cf61ae2488bb4744… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Fix path to testing configuration Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 382f9b9489bbe312073472b63f4eeb01f9b412de https://github.com/phpmyadmin/docker/commit/382f9b9489bbe312073472b63f4eeb0… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- better progress reporting Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5646cff98e44e3362df4bf3818ab0c1d679453b0 https://github.com/phpmyadmin/docker/commit/5646cff98e44e3362df4bf3818ab0c1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Do not report retries This is expected to take some time... Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 554e98df45a52d5b385cc260acb31bb9ac0aaf77 https://github.com/phpmyadmin/docker/commit/554e98df45a52d5b385cc260acb31bb… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml A docker-compose.db.yml Log Message: ----------- Add dabase server link to docker-compose Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c76721ba8b326402d45df07c45f8366991ac12f9 https://github.com/phpmyadmin/docker/commit/c76721ba8b326402d45df07c45f8366… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Fix typo Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/docker/compare/0ac5c9516c49...c76721ba8b32

7 years, 5 months

[phpmyadmin/phpmyadmin] d084d2: Fixes bugs in PmaSeleniumDbEventsTest.php

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d084d25a61b4be51e2366fab575abaa1e669d73e https://github.com/phpmyadmin/phpmyadmin/commit/d084d25a61b4be51e2366fab575… Author: Raghuram <raghuram.vadapalli(a)research.iiit.ac.in> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/TestBase.php Log Message: ----------- Fixes bugs in PmaSeleniumDbEventsTest.php Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli(a)research.iiit.ac.in> Commit: eae3b24a1cac3026b8ba60908d65f72e25bd9f09 https://github.com/phpmyadmin/phpmyadmin/commit/eae3b24a1cac3026b8ba60908d6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php M test/selenium/TestBase.php Log Message: ----------- Merge pull request #13122 from Achilles-96/Selenium-bug1 Go button not clicked due to not being in view Compare: https://github.com/phpmyadmin/phpmyadmin/compare/319f4d98cf72...eae3b24a1cac

7 years, 5 months

[phpmyadmin/phpmyadmin] 53770c: Go button not clicked due to not being in view

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 53770cf934f32edb8a9b3ba85338e2e6a8c884dd https://github.com/phpmyadmin/phpmyadmin/commit/53770cf934f32edb8a9b3ba8533… Author: Raghuram <raghuram.vadapalli(a)research.iiit.ac.in> Date: 2017-03-24 (Fri, 24 Mar 2017) Changed paths: M test/selenium/PmaSeleniumCreateRemoveUserTest.php Log Message: ----------- Go button not clicked due to not being in view Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli(a)research.iiit.ac.in> Commit: 319f4d98cf72814272c241393c2ab76f616f4698 https://github.com/phpmyadmin/phpmyadmin/commit/319f4d98cf72814272c241393c2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test/selenium/PmaSeleniumCreateRemoveUserTest.php Log Message: ----------- Merge commit '53770cf934f32edb8a9b3ba85338e2e6a8c884dd' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/98a1012ea4e3...319f4d98cf72

7 years, 5 months

[phpmyadmin/localized_docs] be2e32: Updated phpMyAdmin repository

by phpMyAdmin bot

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: be2e32e8096664e1a69c00f6989a0d52a38254c7 https://github.com/phpmyadmin/localized_docs/commit/be2e32e8096664e1a69c00f… Author: phpMyAdmin bot <bot(a)phpmyadmin.net> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M phpmyadmin Log Message: ----------- Updated phpMyAdmin repository Commit: 72cbdfaaa99c9d9b0556f97786be867a4867ae80 https://github.com/phpmyadmin/localized_docs/commit/72cbdfaaa99c9d9b0556f97… Author: phpMyAdmin bot <bot(a)phpmyadmin.net> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: 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/security.pot M locale/setup.pot M locale/transformations.pot M locale/user.pot M locale/vendors.pot M po/documentation.pot Log Message: ----------- Update po files Compare: https://github.com/phpmyadmin/localized_docs/compare/6304db42c0db...72cbdfa…

7 years, 5 months

[phpmyadmin/localized_docs] 6304db: Translated using Weblate (Ukrainian)

by Володимир

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: 6304db42c0db65540c7613b2b16e5b38abe6216f https://github.com/phpmyadmin/localized_docs/commit/6304db42c0db65540c7613b… Author: Володимир <bardvv(a)gmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M po/uk.mo M po/uk.po Log Message: ----------- Translated using Weblate (Ukrainian) Currently translated at 8.3% (195 of 2349 strings) [CI skip]

7 years, 5 months

[phpmyadmin/phpmyadmin] b6ca92: Truncate only long passwords

by Michal Čihař

Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b6ca92cc75c8a16001425be7881e73430bcc35b8 https://github.com/phpmyadmin/phpmyadmin/commit/b6ca92cc75c8a16001425be7881… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M libraries/common.inc.php Log Message: ----------- Truncate only long passwords This avoids problems with certain PHP versions returning false when first parameter to substr is ''. Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 5 months

[phpmyadmin/phpmyadmin] 723227: Truncate only long passwords

by Michal Čihař

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7232271a379396ca1d4b083af051262057003c41 https://github.com/phpmyadmin/phpmyadmin/commit/7232271a379396ca1d4b083af05… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M libraries/common.inc.php Log Message: ----------- Truncate only long passwords This avoids problems with certain PHP versions returning false when first parameter to substr is ''. Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 5 months

[phpmyadmin/phpmyadmin] 723227: Truncate only long passwords

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7232271a379396ca1d4b083af051262057003c41 https://github.com/phpmyadmin/phpmyadmin/commit/7232271a379396ca1d4b083af05… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M libraries/common.inc.php Log Message: ----------- Truncate only long passwords This avoids problems with certain PHP versions returning false when first parameter to substr is ''. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 98a1012ea4e3e2f0d131517e952bd71f1b6b2c4a https://github.com/phpmyadmin/phpmyadmin/commit/98a1012ea4e3e2f0d131517e952… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M libraries/common.inc.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8ef8dbf3e956...98a1012ea4e3

7 years, 5 months

[phpmyadmin/sql-parser] f044a7: Translated using Weblate (Vietnamese)

by Vuong Phan

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: f044a7d8fa7497149e240e4093c2685f96577bdd https://github.com/phpmyadmin/sql-parser/commit/f044a7d8fa7497149e240e4093c… Author: Vuong Phan <thevuong(a)live.com> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M locale/vi/LC_MESSAGES/sqlparser.mo M locale/vi/LC_MESSAGES/sqlparser.po Log Message: ----------- Translated using Weblate (Vietnamese) Currently translated at 93.0% (40 of 43 strings) [CI skip]

7 years, 5 months

[phpmyadmin/phpmyadmin] 750e42: Fix some coding standard errors

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 750e42916f56515470524a4444c2e5520445c57b https://github.com/phpmyadmin/phpmyadmin/commit/750e42916f56515470524a4444c… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-03-23 (Thu, 23 Mar 2017) Changed paths: M libraries/DatabaseInterface.php M libraries/Encoding.php M libraries/SystemDatabase.php M libraries/Template.php M libraries/Util.php M libraries/config/PageSettings.php M libraries/controllers/Controller.php M libraries/controllers/table/TableSearchController.php M libraries/plugins/import/ShapeFileImport.php M libraries/rte/rte_routines.lib.php M libraries/tracking.lib.php Log Message: ----------- Fix some coding standard errors Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 9f00b60e1b53ee1e630e431d9f5be957416f04aa https://github.com/phpmyadmin/phpmyadmin/commit/9f00b60e1b53ee1e630e431d9f5… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-03-26 (Sun, 26 Mar 2017) Changed paths: M libraries/Charsets.php M libraries/PDF.php M libraries/SystemDatabase.php M libraries/controllers/Controller.php M libraries/core.lib.php M libraries/session.inc.php Log Message: ----------- Fix more errors Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 8ef8dbf3e956a6bd1a66a26bd5ccc2afe0aaac4f https://github.com/phpmyadmin/phpmyadmin/commit/8ef8dbf3e956a6bd1a66a26bd5c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-03-27 (Mon, 27 Mar 2017) Changed paths: M libraries/Charsets.php M libraries/DatabaseInterface.php M libraries/Encoding.php M libraries/PDF.php M libraries/Template.php M libraries/Util.php M libraries/config/PageSettings.php M libraries/controllers/table/TableSearchController.php M libraries/core.lib.php M libraries/plugins/import/ShapeFileImport.php M libraries/rte/rte_routines.lib.php M libraries/session.inc.php M libraries/tracking.lib.php Log Message: ----------- Merge pull request #13121 from mauriciofauth/fix/coding-standard Fix some coding standard errors Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f6aa888e721e...8ef8dbf3e956

7 years, 5 months

← Newer
1
2
3
4
5
6
7
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2017