- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 1a90f9: Bring back CSS customization for CodeMirror
by Michal Čihař 18 Jul '17

18 Jul '17

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

1 0

[phpmyadmin/phpmyadmin] c73f45: Always cleanup composer file
by Michal Čihař 18 Jul '17

18 Jul '17

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>

1 0

[phpmyadmin/phpmyadmin] c73f45: Always cleanup composer file
by Michal Čihař 18 Jul '17

18 Jul '17

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

1 0

[phpmyadmin/phpmyadmin] c592ba: Translated using Weblate (Bulgarian)
by Michal Čihař 18 Jul '17

18 Jul '17

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

1 0

[phpmyadmin/phpmyadmin] c592ba: Translated using Weblate (Bulgarian)
by NMilchev 18 Jul '17

18 Jul '17

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]

1 0

[phpmyadmin/phpmyadmin] dc4a1a: Translated using Weblate (Bulgarian)
by Weblate 18 Jul '17

18 Jul '17

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

1 0

[phpmyadmin/phpmyadmin] 51fb18: Move Theme object out of session
by Michal Čihař 18 Jul '17

18 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 51fb18612aec88a62f95006fd1906b55b17b91d2 https://github.com/phpmyadmin/phpmyadmin/commit/51fb18612aec88a62f95006fd19… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 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: ----------- Move Theme object out of session Honestly I don't see good reason for storing Theme in session as loading it from the session will take about same time as loading it from the disk. Additionally it seems that current code really didn't really use the object stored in session, it was constructed with every request anyway (by ThemeManager::initializeTheme). Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 942e44afe70f5fb5984b577b994a2959f17734fa https://github.com/phpmyadmin/phpmyadmin/commit/942e44afe70f5fb5984b577b994… Author: Michal Čihař <michal(a)cihar.com> 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 pull request #13499 from nijel/theme Move Theme object out of session Compare: https://github.com/phpmyadmin/phpmyadmin/compare/964f3d896356...942e44afe70f

1 0

[phpmyadmin/scripts] 03bd80: Add git merge options to allow non interactive run
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 03bd80d67e58de3e71446af0a5560f2492c963d7 https://github.com/phpmyadmin/scripts/commit/03bd80d67e58de3e71446af0a5560f… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M website/daily-composer Log Message: ----------- Add git merge options to allow non interactive run There might be conflicting changes (eg. README.rst on release) and we do not want to handle these manually. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8841a2: Fixed size of index edit dialog
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8841a26788e297e5734481eb3123bd7f59b570ce https://github.com/phpmyadmin/phpmyadmin/commit/8841a26788e297e5734481eb312… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fixed size of index edit dialog Fixes #13382 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8841a2: Fixed size of index edit dialog
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8841a26788e297e5734481eb3123bd7f59b570ce https://github.com/phpmyadmin/phpmyadmin/commit/8841a26788e297e5734481eb312… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fixed size of index edit dialog Fixes #13382 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 964f3d896356ad0d934b2927698dfdb71b7f79bd https://github.com/phpmyadmin/phpmyadmin/commit/964f3d896356ad0d934b2927698… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff84a36e09db...964f3d896356

1 0