- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] c84f61: Move compressions template into file_option templa...
by Maurício Meneghini Fauth 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c84f612f2acc19f2d7fcc5456f4fb6f634155251 https://github.com/phpmyadmin/phpmyadmin/commit/c84f612f2acc19f2d7fcc5456f4… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: R templates/display/import/compressions.twig M templates/display/import/file_option.twig Log Message: ----------- Move compressions template into file_option template Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 647c626ae4a2b7d985cfaeecbc225a8de61e9ddd https://github.com/phpmyadmin/phpmyadmin/commit/647c626ae4a2b7d985cfaeecbc2… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M templates/display/import/import.twig M templates/display/import/javascript.twig R templates/display/import/with_plugin.twig Log Message: ----------- Move with_plugin.twig into javascript.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 6e15e838f471129be74b1c873d01fc3c6f05b53a https://github.com/phpmyadmin/phpmyadmin/commit/6e15e838f471129be74b1c873d0… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M templates/display/import/import.twig R templates/display/import/submit_option.twig Log Message: ----------- Move submit_option.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: a8cc3ec8291553c2ed9acc007c4ae3ac248543ea https://github.com/phpmyadmin/phpmyadmin/commit/a8cc3ec8291553c2ed9acc007c4… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: R templates/display/import/format_option.twig M templates/display/import/import.twig Log Message: ----------- Move format_option.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: f3010659ed1fb2261f69fb8aa441932a324e6603 https://github.com/phpmyadmin/phpmyadmin/commit/f3010659ed1fb2261f69fb8aa44… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M templates/display/import/import.twig R templates/display/import/other_option.twig Log Message: ----------- Move other_option.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 3202480c7b85458a0ece7ab7b0bb4bd75c5d14d7 https://github.com/phpmyadmin/phpmyadmin/commit/3202480c7b85458a0ece7ab7b0b… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M templates/display/import/import.twig R templates/display/import/partial_import_option.twig Log Message: ----------- Move partial_import_option.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 55641774f6d1292bba4d4c2ef51e103db9d0857b https://github.com/phpmyadmin/phpmyadmin/commit/55641774f6d1292bba4d4c2ef51… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: R templates/display/import/file_option.twig M templates/display/import/import.twig Log Message: ----------- Move file_option.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: c5dfe379eb37c4ec5f2e70b7c5baf52c35540d80 https://github.com/phpmyadmin/phpmyadmin/commit/c5dfe379eb37c4ec5f2e70b7c5b… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M templates/display/import/import.twig R templates/display/import/options.twig Log Message: ----------- Move options.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 531d82b980d90612ebbbf8088f5fcf0657a2979b https://github.com/phpmyadmin/phpmyadmin/commit/531d82b980d90612ebbbf8088f5… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: R templates/display/import/hidden_inputs.twig M templates/display/import/import.twig Log Message: ----------- Move hidden_inputs.twig into import.twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7ec4059dbb33...531d82b980d9

1 0

[phpmyadmin/phpmyadmin] 8fbe46: Remove usage of get_scripts.js.php wrapper
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fbe46f3e810c361858d6c3b6e2ccbb9ff969ff5 https://github.com/phpmyadmin/phpmyadmin/commit/8fbe46f3e810c361858d6c3b6e2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M js/ajax.js R js/get_scripts.js.php M libraries/classes/Scripts.php M test/classes/ScriptsTest.php M test/libraries/Files_test.php Log Message: ----------- Remove usage of get_scripts.js.php wrapper - this adds significant overhead in sending static files from the server - the benefit of joining requests is minimal since introduction of HTTP/2 - the onload handlers are now fired directly by individual scripts, what makes them really execute when the script is loaded (it could be previously executed earlier in case of chunked loading) Fixes #13840 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8ef504da912d95e683217228f589bd6d90500384 https://github.com/phpmyadmin/phpmyadmin/commit/8ef504da912d95e683217228f58… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M .gitignore M doc/faq.rst M libraries/classes/ErrorReport.php R scripts/line-counts.sh Log Message: ----------- Remove line counts logic from the error reporting component We no longer need this as we download js files directly, so the client has correct filename and line immediatelly. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 77f0d50bea5ee461920fb92cff832f252e9fdc8a https://github.com/phpmyadmin/phpmyadmin/commit/77f0d50bea5ee461920fb92cff8… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M libraries/classes/Controllers/Database/DatabaseStructureController.php M libraries/classes/Controllers/Table/TableSearchController.php M libraries/classes/InsertEdit.php M tbl_replace.php M test/classes/InsertEditTest.php Log Message: ----------- Add missing dependency on jquery.validate.js Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5346416625f3196238c55c9e9c2d3d0fef25887d https://github.com/phpmyadmin/phpmyadmin/commit/5346416625f3196238c55c9e9c2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M libraries/classes/Header.php M libraries/classes/Scripts.php M test/classes/ScriptsTest.php Log Message: ----------- Simplify Scripts::addFile API Removed unused parameter to define ordering of scripts. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7ec4059dbb3349969d911646234c638da7791a4e https://github.com/phpmyadmin/phpmyadmin/commit/7ec4059dbb3349969d911646234… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M .gitignore M doc/faq.rst M js/ajax.js R js/get_scripts.js.php M libraries/classes/Controllers/Database/DatabaseStructureController.php M libraries/classes/Controllers/Table/TableSearchController.php M libraries/classes/ErrorReport.php M libraries/classes/Header.php M libraries/classes/InsertEdit.php M libraries/classes/Scripts.php R scripts/line-counts.sh M tbl_replace.php M test/classes/InsertEditTest.php M test/classes/ScriptsTest.php M test/libraries/Files_test.php Log Message: ----------- Merge pull request #13839 from nijel/scripts Remove get_scripts wrapper to download javascript Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bb60b9d53bd6...7ec4059dbb33

1 0

[phpmyadmin/phpmyadmin] 5ec4a1: Translated using Weblate (Interlingua)
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5ec4a107d06615c70ccc9242f375cdd20b989118 https://github.com/phpmyadmin/phpmyadmin/commit/5ec4a107d06615c70ccc9242f37… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 75.5% (2424 of 3207 strings) [CI skip] Commit: c6f3c4002c56509c8699ab38e123eff45778552d https://github.com/phpmyadmin/phpmyadmin/commit/c6f3c4002c56509c8699ab38e12… Author: Weblate <noreply(a)weblate.org> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M composer.json Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: a957f2694783e58ee3c0a06f0f6eac6ce9c868d6 https://github.com/phpmyadmin/phpmyadmin/commit/a957f2694783e58ee3c0a06f0f6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entries for #11688 and #13466 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bb60b9d53bd6d45535172ec03986e78b54cbed07 https://github.com/phpmyadmin/phpmyadmin/commit/bb60b9d53bd6d45535172ec0398… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6a0345b10e90...bb60b9d53bd6

1 0

[phpmyadmin/phpmyadmin] 3b6a99: Move collation connection setting to user preferen...
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3b6a994dcdf2cbcfa23caa51b3719ba924aab20a https://github.com/phpmyadmin/phpmyadmin/commit/3b6a994dcdf2cbcfa23caa51b37… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M import.php M index.php M libraries/classes/Config.php M libraries/classes/Config/Descriptions.php M libraries/classes/Config/Forms/User/FeaturesForm.php M libraries/classes/DatabaseInterface.php M libraries/classes/Header.php M libraries/classes/Url.php M libraries/classes/UserPreferences.php M libraries/common.inc.php M prefs_manage.php M test/classes/ConfigTest.php M test/classes/Database/SearchTest.php M test/classes/DatabaseInterfaceTest.php M test/classes/Display/ResultsTest.php M test/classes/FooterTest.php M test/classes/InsertEditTest.php M test/classes/MessageTest.php M test/classes/Plugins/Auth/AuthenticationConfigTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/SanitizeTest.php M test/classes/Server/PrivilegesTest.php M test/classes/ThemeManagerTest.php M test/classes/ThemeTest.php M test/classes/UrlTest.php M test/classes/UserPreferencesTest.php Log Message: ----------- Move collation connection setting to user preferences It is now handled same way as other user settings. Issue #11688 Issue #13466 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6a0345b10e90cf450bf5f169ba7b2e8653591194 https://github.com/phpmyadmin/phpmyadmin/commit/6a0345b10e90cf450bf5f169ba7… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M import.php M index.php M libraries/classes/Config.php M libraries/classes/Config/Descriptions.php M libraries/classes/Config/Forms/User/FeaturesForm.php M libraries/classes/DatabaseInterface.php M libraries/classes/Header.php M libraries/classes/Url.php M libraries/classes/UserPreferences.php M libraries/common.inc.php M prefs_manage.php M test/classes/ConfigTest.php M test/classes/Database/SearchTest.php M test/classes/DatabaseInterfaceTest.php M test/classes/Display/ResultsTest.php M test/classes/FooterTest.php M test/classes/InsertEditTest.php M test/classes/MessageTest.php M test/classes/Plugins/Auth/AuthenticationConfigTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/SanitizeTest.php M test/classes/Server/PrivilegesTest.php M test/classes/ThemeManagerTest.php M test/classes/ThemeTest.php M test/classes/UrlTest.php M test/classes/UserPreferencesTest.php Log Message: ----------- Merge pull request #13847 from nijel/collation Move collation connection setting to user preferences Compare: https://github.com/phpmyadmin/phpmyadmin/compare/63f5b90ad536...6a0345b10e90

1 0

[phpmyadmin/phpmyadmin] 5ec4a1: Translated using Weblate (Interlingua)
by Weblate 29 Nov '17

29 Nov '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5ec4a107d06615c70ccc9242f375cdd20b989118 https://github.com/phpmyadmin/phpmyadmin/commit/5ec4a107d06615c70ccc9242f37… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 75.5% (2424 of 3207 strings) [CI skip] Commit: c6f3c4002c56509c8699ab38e123eff45778552d https://github.com/phpmyadmin/phpmyadmin/commit/c6f3c4002c56509c8699ab38e12… Author: Weblate <noreply(a)weblate.org> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M composer.json Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7bff1263c8f7...c6f3c4002c56

1 0

[phpmyadmin/phpmyadmin] 7bff12: Revert limitation on phpseclib dependency
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7bff1263c8f7dc37de9e90da1eaa38a68ff160a1 https://github.com/phpmyadmin/phpmyadmin/commit/7bff1263c8f7dc37de9e90da1ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M composer.json Log Message: ----------- Revert limitation on phpseclib dependency Only 2.0.8 is broken, so conflict with that. Fixes #13846 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 63f5b90ad53613dc4529f0711b2cf1c3a7e55d3c https://github.com/phpmyadmin/phpmyadmin/commit/63f5b90ad53613dc4529f0711b2… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M composer.json Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dd38309300a1...63f5b90ad536

1 0

[phpmyadmin/phpmyadmin] 7bff12: Revert limitation on phpseclib dependency
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7bff1263c8f7dc37de9e90da1eaa38a68ff160a1 https://github.com/phpmyadmin/phpmyadmin/commit/7bff1263c8f7dc37de9e90da1ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M composer.json Log Message: ----------- Revert limitation on phpseclib dependency Only 2.0.8 is broken, so conflict with that. Fixes #13846 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 14e78f: Avoid error when event is not really added
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 14e78f79bbb83d36f02efb87fe16b4d3a8bb746d https://github.com/phpmyadmin/phpmyadmin/commit/14e78f79bbb83d36f02efb87fe1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M libraries/classes/Rte/Events.php Log Message: ----------- Avoid error when event is not really added This can easily happen when it was scheduled in past, MySQL then just ignores it. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: dd38309300a129cab17d090bf30ed82cc5b44334 https://github.com/phpmyadmin/phpmyadmin/commit/dd38309300a129cab17d090bf30… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M test/selenium/PmaSeleniumDbEventsTest.php Log Message: ----------- Include timestamp when creating event in selenium tests Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/51a65e022b24...dd38309300a1

1 0

[phpmyadmin/phpmyadmin] 51a65e: Avoid using deprecated jQuery functions
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 51a65e022b247bc09bef4464e5f4797049ed1c7f https://github.com/phpmyadmin/phpmyadmin/commit/51a65e022b247bc09bef4464e5f… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M js/config.js M js/functions.js M js/menu-resizer.js M js/shortcuts_handler.js Log Message: ----------- Avoid using deprecated jQuery functions Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 843906: Ensure navigation does not break on setting invali...
by Michal Čihař 29 Nov '17

29 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 843906a8278302be1d0736d9bcb7cd206283df65 https://github.com/phpmyadmin/phpmyadmin/commit/843906a8278302be1d0736d9bcb… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M js/navigation.js Log Message: ----------- Ensure navigation does not break on setting invalid width This can be result of failed request, so fallback to defaults. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0