- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 2c86f7: Translated using Weblate (Interlingua)
by Giovanni Sora 02 Nov '17

02 Nov '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2c86f7be3ab98c6e4fc884878886139773fef870 https://github.com/phpmyadmin/phpmyadmin/commit/2c86f7be3ab98c6e4fc88487888… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 75.5% (2423 of 3207 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 2ae956: Translated using Weblate (Interlingua)
by Weblate 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2ae956387ce6ed9068b0d8b4c4a5cae07f32be8e https://github.com/phpmyadmin/phpmyadmin/commit/2ae956387ce6ed9068b0d8b4c4a… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 74.0% (2420 of 3267 strings) [CI skip] Commit: a071cfc7954d26d4091aded257283fc1caf08fca https://github.com/phpmyadmin/phpmyadmin/commit/a071cfc7954d26d4091aded2572… Author: Weblate <noreply(a)weblate.org> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f388a41b04db...a071cfc7954d

1 0

[phpmyadmin/phpmyadmin] f388a4: Fix undefined index notices
by Maurício Meneghini Fauth 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f388a41b04db81387a8062fd17058056107ee299 https://github.com/phpmyadmin/phpmyadmin/commit/f388a41b04db81387a8062fd170… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Fix undefined index notices Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 1adf9a: Revert "Cache already loaded templates"
by Michal Čihař 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1adf9a493f992d7ca73f7328294e339715199e17 https://github.com/phpmyadmin/phpmyadmin/commit/1adf9a493f992d7ca73f7328294… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/classes/Template.php Log Message: ----------- Revert "Cache already loaded templates" This reverts commit 56ff2afb74c1f694d446bc8cc7daf0ce1f1842f2. The caching is already done in Twig, no need to duplicate it.

1 0

[phpmyadmin/phpmyadmin] cae0ac: Use static property rather than static variable fo...
by Michal Čihař 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cae0ac89479125e485f0d76c18a36ede26f23454 https://github.com/phpmyadmin/phpmyadmin/commit/cae0ac89479125e485f0d76c18a… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/classes/Template.php Log Message: ----------- Use static property rather than static variable for caching twig environment Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 56ff2afb74c1f694d446bc8cc7daf0ce1f1842f2 https://github.com/phpmyadmin/phpmyadmin/commit/56ff2afb74c1f694d446bc8cc7d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/classes/Template.php Log Message: ----------- Cache already loaded templates This should improve performance when loading many small templates. Issue #13711 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 369b0edb42c7ca470248f490c978b02a2ab54da9 https://github.com/phpmyadmin/phpmyadmin/commit/369b0edb42c7ca470248f490c97… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M js/get_image.js.php M libraries/classes/Util.php Log Message: ----------- Remove test for no longer used PMA_TEST_THEME Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ab86c9d84cf5...369b0edb42c7

1 0

[phpmyadmin/phpmyadmin] f8559a: Update po files
by Michal Čihař 02 Nov '17

02 Nov '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8559aeb784d8c20c46a9b9f47e056b8501e8fed https://github.com/phpmyadmin/phpmyadmin/commit/f8559aeb784d8c20c46a9b9f47e… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 2ed014: Avoid using concatenation in |trans filter
by Michal Čihař 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2ed01429503e2019870044d9fcb646c15af37740 https://github.com/phpmyadmin/phpmyadmin/commit/2ed01429503e2019870044d9fcb… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M templates/columns_definitions/table_fields_definitions.twig M templates/table/relation/common_form.twig Log Message: ----------- Avoid using concatenation in |trans filter The generated PHP code can not be extracted using xgettext. This is workaround for #13794, should be reverted after proper fix. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f7d2997d797b035a9c0cec23660fceba62b6114f https://github.com/phpmyadmin/phpmyadmin/commit/f7d2997d797b035a9c0cec23660… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: A scripts/fix-po-twig M scripts/generate-twig-cache M scripts/update-po Log Message: ----------- Use php for fixing line information in the Gettext files The debug information actually maps ranges, not individual lines, so it needs more logic. Also the sed was really slow (as it had to replace all lines). Issue #13344 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ab86c9d84cf5c250c563e5c864b0021595e1339b https://github.com/phpmyadmin/phpmyadmin/commit/ab86c9d84cf5c250c563e5c864b… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bn.po M po/br.po M po/brx.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/eo.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fil.po M po/fr.po M po/fy.po M po/gl.po M po/gu.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/ia.po M po/id.po M po/ig.po M po/it.po M po/ja.po M po/ka.po M po/kab.po M po/kk.po M po/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ku.po M po/ky.po M po/li.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/ne.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr(a)latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz(a)latin.po M po/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po Log Message: ----------- Update po files [CI skip] Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5a2a115e886f...ab86c9d84cf5

1 0

[phpmyadmin/phpmyadmin] 12dbff: Generate consistent translator comments in twig co...
by Michal Čihař 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 12dbfff7e9eecf48a26dc38b97cce1f496839684 https://github.com/phpmyadmin/phpmyadmin/commit/12dbfff7e9eecf48a26dc38b97c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/classes/Twig/I18n/NodeTrans.php Log Message: ----------- Generate consistent translator comments in twig code Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5a2a115e886f4e096d118aa4735077f4a32ba9b7 https://github.com/phpmyadmin/phpmyadmin/commit/5a2a115e886f4e096d118aa4735… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M scripts/generate-twig-cache M scripts/update-po Log Message: ----------- Include correct line information in Gettext files for twig templates Fixes #13344 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5acd64f84d96...5a2a115e886f

1 0

[phpmyadmin/phpmyadmin] 5a401b: Changelog entry for #6197 and #13787
by Michal Čihař 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5a401b192eb0ed723638deda015fb5e9ea670051 https://github.com/phpmyadmin/phpmyadmin/commit/5a401b192eb0ed723638deda015… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #6197 and #13787 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 192edd9324ff459fde10c74126ad52e3f163860a https://github.com/phpmyadmin/phpmyadmin/commit/192edd9324ff459fde10c74126a… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M doc/second_factor.rst Log Message: ----------- Add wikipedia link for TOTP Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5acd64f84d964e5f2db6170ecb5a42581e74ca12 https://github.com/phpmyadmin/phpmyadmin/commit/5acd64f84d964e5f2db6170ecb5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M doc/config.rst R doc/second_factor.rst A doc/two_factor.rst M doc/user.rst M libraries/classes/Plugins/AuthenticationPlugin.php R libraries/classes/Plugins/SecondFactor/Application.php R libraries/classes/Plugins/SecondFactor/Key.php R libraries/classes/Plugins/SecondFactor/Simple.php R libraries/classes/Plugins/SecondFactorPlugin.php A libraries/classes/Plugins/TwoFactor/Application.php A libraries/classes/Plugins/TwoFactor/Key.php A libraries/classes/Plugins/TwoFactor/Simple.php A libraries/classes/Plugins/TwoFactorPlugin.php R libraries/classes/SecondFactor.php A libraries/classes/TwoFactor.php M libraries/common.inc.php M libraries/config.default.php M libraries/user_preferences.inc.php M prefs_second.php R templates/login/second.twig R templates/login/second/application.twig R templates/login/second/application_configure.twig R templates/login/second/key.twig R templates/login/second/key_configure.twig R templates/login/second/simple.twig A templates/login/twofactor.twig A templates/login/twofactor/application.twig A templates/login/twofactor/application_configure.twig A templates/login/twofactor/key.twig A templates/login/twofactor/key_configure.twig A templates/login/twofactor/simple.twig M templates/prefs_second.twig R test/classes/SecondFactorTest.php A test/classes/TwoFactorTest.php Log Message: ----------- Use two-factor authentication instead fo second authentication factor This is probably more widely used naming. Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/96ba136b4457...5acd64f84d96

1 0

[phpmyadmin/phpmyadmin] 28a886: Port columns_definitions/column_attributes to Twig
by Maurício Meneghini Fauth 02 Nov '17

02 Nov '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 28a886c7911e1250b77bba954ad88638fbea10f2 https://github.com/phpmyadmin/phpmyadmin/commit/28a886c7911e1250b77bba954ad… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Normalization.php M libraries/tbl_columns_definition_form.inc.php R templates/columns_definitions/column_attributes.phtml A templates/columns_definitions/column_attributes.twig M templates/columns_definitions/table_fields_definitions.phtml M test/classes/NormalizationTest.php Log Message: ----------- Port columns_definitions/column_attributes to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: b670552cbf1d0b99a67b0bd49056b40b01944202 https://github.com/phpmyadmin/phpmyadmin/commit/b670552cbf1d0b99a67b0bd4905… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Normalization.php M libraries/classes/Twig/UtilExtension.php M templates/columns_definitions/column_definitions_form.phtml R templates/columns_definitions/table_fields_definitions.phtml A templates/columns_definitions/table_fields_definitions.twig Log Message: ----------- Port columns_definitions/table_fields_definitions to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: c7ca02fbaa00bfacd15974499ffe6e6fb6213757 https://github.com/phpmyadmin/phpmyadmin/commit/c7ca02fbaa00bfacd15974499ff… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/tbl_columns_definition_form.inc.php R templates/columns_definitions/column_definitions_form.phtml A templates/columns_definitions/column_definitions_form.twig Log Message: ----------- Port columns_definitions/column_definitions_form to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 0e867253dd592b2dfb9771e3eccc989142b70dc6 https://github.com/phpmyadmin/phpmyadmin/commit/0e867253dd592b2dfb9771e3ecc… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Controllers/Server/ServerDatabasesController.php M libraries/classes/Twig/PhpFunctionsExtension.php R templates/server/databases/table_footer.phtml A templates/server/databases/table_footer.twig Log Message: ----------- Port server/databases/table_footer to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 412020beea93b3cf53a4dc7f3661e7af1e604e90 https://github.com/phpmyadmin/phpmyadmin/commit/412020beea93b3cf53a4dc7f366… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Controllers/Server/ServerDatabasesController.php R templates/server/databases/table_header.phtml A templates/server/databases/table_header.twig Log Message: ----------- Port server/databases/table_header template to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: d4464f948cd5f568039e12fe0e201224f3dc18d3 https://github.com/phpmyadmin/phpmyadmin/commit/d4464f948cd5f568039e12fe0e2… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Controllers/Server/ServerDatabasesController.php M libraries/classes/Twig/SanitizeExtension.php M libraries/classes/Twig/UtilExtension.php R templates/server/databases/table_row.phtml A templates/server/databases/table_row.twig Log Message: ----------- Port server/databases/table_row template to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: f134a3ba67df54082a06d9e3285119d25d7017e0 https://github.com/phpmyadmin/phpmyadmin/commit/f134a3ba67df54082a06d9e3285… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Relation.php M templates/table/relation/common_form.phtml M templates/table/relation/foreign_key_row.phtml Log Message: ----------- Refactor templates/table/relation/foreign_key_row.phtml Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 01bd6d1455722a8647d97c7ae9078356b24478b6 https://github.com/phpmyadmin/phpmyadmin/commit/01bd6d1455722a8647d97c7ae90… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Twig/RelationExtension.php M templates/table/relation/common_form.phtml R templates/table/relation/foreign_key_row.phtml A templates/table/relation/foreign_key_row.twig Log Message: ----------- Port table/relation/foreign_key_row template to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 9b653cbba329c8663fddb9c63822d4d316e3d202 https://github.com/phpmyadmin/phpmyadmin/commit/9b653cbba329c8663fddb9c6382… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Controllers/Table/TableRelationController.php M libraries/classes/Table.php M libraries/classes/Template.php A libraries/classes/Twig/TableExtension.php M scripts/generate-twig-cache R templates/table/relation/common_form.phtml A templates/table/relation/common_form.twig Log Message: ----------- Port table/relation/common_form template to Twig Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: f3faca7fd7cd71331946e8bd9ba101c83e9a9553 https://github.com/phpmyadmin/phpmyadmin/commit/f3faca7fd7cd71331946e8bd9ba… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: M libraries/classes/Template.php R templates/test/add_data.phtml R templates/test/echo.phtml R templates/test/gettext/gettext.phtml R templates/test/gettext/pgettext.phtml R templates/test/static.phtml R templates/test/trim.phtml M test/classes/TemplateTest.php Log Message: ----------- Remove support for PHP templates Fix #13297 Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: d223781975f22886282b3572701348fb572053ac https://github.com/phpmyadmin/phpmyadmin/commit/d223781975f22886282b3572701… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-10-29 (Sun, 29 Oct 2017) Changed paths: A templates/test/add_data.twig R templates/test/add_data_twig.twig A templates/test/echo.twig R templates/test/echo_twig.twig A templates/test/gettext/gettext.twig R templates/test/gettext/gettext_twig.twig A templates/test/gettext/notes.twig R templates/test/gettext/notes_twig.twig A templates/test/gettext/pgettext.twig R templates/test/gettext/pgettext_twig.twig A templates/test/gettext/plural.twig A templates/test/gettext/plural_notes.twig R templates/test/gettext/plural_notes_twig.twig R templates/test/gettext/plural_twig.twig A templates/test/static.twig R templates/test/static_twig.twig M test/classes/TemplateTest.php Log Message: ----------- Remove '_twig' from test template names Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 569ee91f2a4a0a4dafed2402b6d68f1c07354e8c https://github.com/phpmyadmin/phpmyadmin/commit/569ee91f2a4a0a4dafed2402b6d… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-01 (Wed, 01 Nov 2017) Changed paths: M ChangeLog M doc/conf.py M gis_data_editor.php M js/db_structure.js M js/functions.js M js/server_databases.js M js/server_variables.js M libraries/classes/Config.php M libraries/classes/Controllers/Database/DatabaseStructureController.php M libraries/classes/Plugins/Auth/AuthenticationCookie.php M libraries/classes/Response.php M libraries/classes/Server/Privileges.php M libraries/classes/Theme.php M libraries/classes/Twig/MessageExtension.php M libraries/classes/Twig/UrlExtension.php M libraries/classes/Twig/UtilExtension.php M libraries/classes/UserPreferences.php M libraries/common.inc.php M po/th.po M templates/database/designer/side_menu.twig M templates/database/structure/check_all_tables.twig M templates/database/structure/structure_table_row.twig A templates/login/footer.twig A templates/login/header.twig M templates/server/databases/table_footer.twig M templates/server/databases/table_row.twig M templates/server/variables/session_variable_row.twig M templates/server/variables/variable_row.twig M test/classes/Controllers/Server/ServerDatabasesControllerTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/ThemeTest.php M test/classes/UserPreferencesTest.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' into templates Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 3bb5e0d73257b8ae0d3c5f3e9dc7328a0bf325d6 https://github.com/phpmyadmin/phpmyadmin/commit/3bb5e0d73257b8ae0d3c5f3e9dc… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-01 (Wed, 01 Nov 2017) Changed paths: M templates/columns_definitions/column_attributes.twig M templates/table/relation/common_form.twig Log Message: ----------- Fix wrong incremental order Signed-off-by: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Commit: 96ba136b4457249532863d08e5953b8959e4742c https://github.com/phpmyadmin/phpmyadmin/commit/96ba136b4457249532863d08e59… Author: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com> Date: 2017-11-02 (Thu, 02 Nov 2017) Changed paths: M libraries/classes/Controllers/Server/ServerDatabasesController.php M libraries/classes/Controllers/Table/TableRelationController.php M libraries/classes/Normalization.php M libraries/classes/Relation.php M libraries/classes/Table.php M libraries/classes/Template.php M libraries/classes/Twig/PhpFunctionsExtension.php M libraries/classes/Twig/RelationExtension.php M libraries/classes/Twig/SanitizeExtension.php A libraries/classes/Twig/TableExtension.php M libraries/classes/Twig/UtilExtension.php M libraries/tbl_columns_definition_form.inc.php M scripts/generate-twig-cache R templates/columns_definitions/column_attributes.phtml A templates/columns_definitions/column_attributes.twig R templates/columns_definitions/column_definitions_form.phtml A templates/columns_definitions/column_definitions_form.twig R templates/columns_definitions/table_fields_definitions.phtml A templates/columns_definitions/table_fields_definitions.twig R templates/server/databases/table_footer.phtml A templates/server/databases/table_footer.twig R templates/server/databases/table_header.phtml A templates/server/databases/table_header.twig R templates/server/databases/table_row.phtml A templates/server/databases/table_row.twig R templates/table/relation/common_form.phtml A templates/table/relation/common_form.twig R templates/table/relation/foreign_key_row.phtml A templates/table/relation/foreign_key_row.twig R templates/test/add_data.phtml A templates/test/add_data.twig R templates/test/add_data_twig.twig R templates/test/echo.phtml A templates/test/echo.twig R templates/test/echo_twig.twig R templates/test/gettext/gettext.phtml A templates/test/gettext/gettext.twig R templates/test/gettext/gettext_twig.twig A templates/test/gettext/notes.twig R templates/test/gettext/notes_twig.twig R templates/test/gettext/pgettext.phtml A templates/test/gettext/pgettext.twig R templates/test/gettext/pgettext_twig.twig A templates/test/gettext/plural.twig A templates/test/gettext/plural_notes.twig R templates/test/gettext/plural_notes_twig.twig R templates/test/gettext/plural_twig.twig R templates/test/static.phtml A templates/test/static.twig R templates/test/static_twig.twig R templates/test/trim.phtml M test/classes/NormalizationTest.php M test/classes/TemplateTest.php Log Message: ----------- Merge pull request #13785 from mauriciofauth/templates Port templates to Twig and remove PHP templates support Compare: https://github.com/phpmyadmin/phpmyadmin/compare/38646a32f215...96ba136b4457

1 0