Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c84f612f2acc19f2d7fcc5456f4fb6f634155251 https://github.com/phpmyadmin/phpmyadmin/commit/c84f612f2acc19f2d7fcc5456f4f... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: 647c626ae4a2b7d985cfaeecbc225a8de61e9ddd https://github.com/phpmyadmin/phpmyadmin/commit/647c626ae4a2b7d985cfaeecbc22... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: 6e15e838f471129be74b1c873d01fc3c6f05b53a https://github.com/phpmyadmin/phpmyadmin/commit/6e15e838f471129be74b1c873d01... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: a8cc3ec8291553c2ed9acc007c4ae3ac248543ea https://github.com/phpmyadmin/phpmyadmin/commit/a8cc3ec8291553c2ed9acc007c4a... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: f3010659ed1fb2261f69fb8aa441932a324e6603 https://github.com/phpmyadmin/phpmyadmin/commit/f3010659ed1fb2261f69fb8aa441... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: 3202480c7b85458a0ece7ab7b0bb4bd75c5d14d7 https://github.com/phpmyadmin/phpmyadmin/commit/3202480c7b85458a0ece7ab7b0bb... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: 55641774f6d1292bba4d4c2ef51e103db9d0857b https://github.com/phpmyadmin/phpmyadmin/commit/55641774f6d1292bba4d4c2ef51e... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: c5dfe379eb37c4ec5f2e70b7c5baf52c35540d80 https://github.com/phpmyadmin/phpmyadmin/commit/c5dfe379eb37c4ec5f2e70b7c5ba... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Commit: 531d82b980d90612ebbbf8088f5fcf0657a2979b https://github.com/phpmyadmin/phpmyadmin/commit/531d82b980d90612ebbbf8088f5f... Author: Maurício Meneghini Fauth <mauriciofauth@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@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7ec4059dbb33...531d82b980d9