Git July 2017

git@phpmyadmin.net

29 participants
241 discussions

[phpmyadmin/phpmyadmin] 4b4403: Update to current lint plugin

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4b4403aeef448e632b3f14d0fb74c4a748eae3c0 https://github.com/phpmyadmin/phpmyadmin/commit/4b4403aeef448e632b3f14d0fb7… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/codemirror/addon/lint/lint.js Log Message: ----------- Update to current lint plugin Our patch has been integrated. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9eb7287b72ecd275f0d456eee1c1bd65a340205d https://github.com/phpmyadmin/phpmyadmin/commit/9eb7287b72ecd275f0d456eee1c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/vendor/codemirror/addon/lint/lint.js Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0cd143f274e2...9eb7287b72ec

7 years, 2 months

[phpmyadmin/phpmyadmin] 0971a9: Change variable name to match upstream

by Michal Čihař

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0971a91698a6ae2e5dd70447bd76f59964162669 https://github.com/phpmyadmin/phpmyadmin/commit/0971a91698a6ae2e5dd70447bd7… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js Log Message: ----------- Change variable name to match upstream See https://github.com/codemirror/CodeMirror/pull/4861 Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 2 months

[phpmyadmin/phpmyadmin] 0971a9: Change variable name to match upstream

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0971a91698a6ae2e5dd70447bd76f59964162669 https://github.com/phpmyadmin/phpmyadmin/commit/0971a91698a6ae2e5dd70447bd7… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js Log Message: ----------- Change variable name to match upstream See https://github.com/codemirror/CodeMirror/pull/4861 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0cd143f274e2d1d43a95e6db1dd7b00f96079163 https://github.com/phpmyadmin/phpmyadmin/commit/0cd143f274e2d1d43a95e6db1dd… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/codemirror/addon/lint/sql-lint.js M js/vendor/codemirror/addon/lint/lint.js Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cc954750bbb3...0cd143f274e2

7 years, 2 months

[phpmyadmin/phpmyadmin] 1a90f9: Bring back CSS customization for CodeMirror

by Michal Čihař

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1a90f9723184170113e0fbc5e96a23ef897a7451 https://github.com/phpmyadmin/phpmyadmin/commit/1a90f9723184170113e0fbc5e96… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M themes/pmahomme/css/codemirror.css.php Log Message: ----------- Bring back CSS customization for CodeMirror Originally it was done by patching upstream sources in 4c24db0, but that was lost when upgrading. Issue #13489 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 639c2b8c4bad8b36508b6a059632a1c6dce85637 https://github.com/phpmyadmin/phpmyadmin/commit/639c2b8c4bad8b36508b6a05963… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js M libraries/Linter.php Log Message: ----------- Fixed rendering SQL lint errors - add patch to CodeMirror to render HTML, it's submitted upstream as https://github.com/codemirror/CodeMirror/pull/4861 - properly escape html output of Linter, now when we use full HTML Fixes #13489 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c73f451cde7a...639c2b8c4bad

7 years, 2 months

[phpmyadmin/phpmyadmin] 1a90f9: Bring back CSS customization for CodeMirror

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1a90f9723184170113e0fbc5e96a23ef897a7451 https://github.com/phpmyadmin/phpmyadmin/commit/1a90f9723184170113e0fbc5e96… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M themes/pmahomme/css/codemirror.css.php Log Message: ----------- Bring back CSS customization for CodeMirror Originally it was done by patching upstream sources in 4c24db0, but that was lost when upgrading. Issue #13489 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 639c2b8c4bad8b36508b6a059632a1c6dce85637 https://github.com/phpmyadmin/phpmyadmin/commit/639c2b8c4bad8b36508b6a05963… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js M libraries/Linter.php Log Message: ----------- Fixed rendering SQL lint errors - add patch to CodeMirror to render HTML, it's submitted upstream as https://github.com/codemirror/CodeMirror/pull/4861 - properly escape html output of Linter, now when we use full HTML Fixes #13489 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: cc954750bbb36032c3c80882ad1d9b9c3db5b9f9 https://github.com/phpmyadmin/phpmyadmin/commit/cc954750bbb36032c3c80882ad1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M ChangeLog M js/codemirror/addon/lint/sql-lint.js M js/vendor/codemirror/addon/lint/lint.js M libraries/classes/Linter.php M themes/pmahomme/css/codemirror.css.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d463309502a2...cc954750bbb3

7 years, 2 months

[phpmyadmin/phpmyadmin] c73f45: Always cleanup composer file

by Michal Čihař

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c73f451cde7ad9e37596bfeb9cf7180063af8186 https://github.com/phpmyadmin/phpmyadmin/commit/c73f451cde7ad9e37596bfeb9cf… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M scripts/create-release.sh Log Message: ----------- Always cleanup composer file Signed-off-by: Michal Čihař <michal(a)cihar.com>

7 years, 2 months

[phpmyadmin/phpmyadmin] c73f45: Always cleanup composer file

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c73f451cde7ad9e37596bfeb9cf7180063af8186 https://github.com/phpmyadmin/phpmyadmin/commit/c73f451cde7ad9e37596bfeb9cf… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M scripts/create-release.sh Log Message: ----------- Always cleanup composer file Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d463309502a23ac59fb9c26f07b49c6fa24f78f1 https://github.com/phpmyadmin/phpmyadmin/commit/d463309502a23ac59fb9c26f07b… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M scripts/create-release.sh Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/22b27fa3e307...d463309502a2

7 years, 2 months

[phpmyadmin/phpmyadmin] c592ba: Translated using Weblate (Bulgarian)

by Michal Čihař

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c592ba6a0e28cbf4489a0bcd83b74ad22ca4b234 https://github.com/phpmyadmin/phpmyadmin/commit/c592ba6a0e28cbf4489a0bcd83b… Author: NMilchev <nmilchev(a)gmail.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M po/bg.po Log Message: ----------- Translated using Weblate (Bulgarian) Currently translated at 60.4% (1937 of 3203 strings) [CI skip] Commit: 22b27fa3e307ac4d2ee9d94148e691fd6c80082e https://github.com/phpmyadmin/phpmyadmin/commit/22b27fa3e307ac4d2ee9d94148e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/41e8a3db4301...22b27fa3e307

7 years, 2 months

[phpmyadmin/phpmyadmin] c592ba: Translated using Weblate (Bulgarian)

by NMilchev

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c592ba6a0e28cbf4489a0bcd83b74ad22ca4b234 https://github.com/phpmyadmin/phpmyadmin/commit/c592ba6a0e28cbf4489a0bcd83b… Author: NMilchev <nmilchev(a)gmail.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M po/bg.po Log Message: ----------- Translated using Weblate (Bulgarian) Currently translated at 60.4% (1937 of 3203 strings) [CI skip]

7 years, 2 months

[phpmyadmin/phpmyadmin] dc4a1a: Translated using Weblate (Bulgarian)

by Weblate

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dc4a1a2213e68c656fbb2ae0cdcbf78e0f0a3452 https://github.com/phpmyadmin/phpmyadmin/commit/dc4a1a2213e68c656fbb2ae0cdc… Author: NMilchev <nmilchev(a)gmail.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M po/bg.po Log Message: ----------- Translated using Weblate (Bulgarian) Currently translated at 60.1% (1930 of 3211 strings) [CI skip] Commit: 41e8a3db430123b8e540856a29f9987e77ff25d9 https://github.com/phpmyadmin/phpmyadmin/commit/41e8a3db430123b8e540856a29f… Author: Weblate <noreply(a)weblate.org> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/get_image.js.php M js/messages.php M libraries/classes/Config.php M libraries/classes/Header.php M libraries/classes/ThemeManager.php M libraries/classes/Util.php M templates/database/designer/database_tables.phtml M templates/database/designer/side_menu.phtml M templates/database/designer/table_list.phtml M test/bootstrap-dist.php M test/classes/ConfigTest.php M test/classes/HeaderTest.php M test/classes/MenuTest.php M test/classes/ThemeTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/navigation/NodeDatabaseChildTest.php M test/libraries/PMA_relation_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/942e44afe70f...41e8a3db4301

7 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git July 2017