Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6e5fbd7403691e4a19a5b9ffe80457955a18c7b9 https://github.com/phpmyadmin/phpmyadmin/commit/6e5fbd7403691e4a19a5b9ffe804... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php A templates/display/import/submit_option.twig Log Message: ----------- Use template for getHtmlForImportOptionsSubmit Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: dfd8abaae60a94b945201f95238f8aeb219b857f https://github.com/phpmyadmin/phpmyadmin/commit/dfd8abaae60a94b945201f95238f... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php A templates/display/import/options.twig Log Message: ----------- Use template for getHtmlForImportOptions Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: ce50bd64ce79647cff09db11f8117d937568d122 https://github.com/phpmyadmin/phpmyadmin/commit/ce50bd64ce79647cff09db11f811... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php A templates/display/import/hidden_inputs.twig Log Message: ----------- Use template for getHtmlForHiddenInputs Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 45860954cd2c8453bc7b15d9517fa86c7c5021b6 https://github.com/phpmyadmin/phpmyadmin/commit/45860954cd2c8453bc7b15d9517f... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php M libraries/classes/Twig/UrlExtension.php A templates/display/import/with_plugin.twig Log Message: ----------- Use template for getHtmlForImportWithPlugin Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 0d2e214c58328e5796d6583fd7d0e7437ba7506c https://github.com/phpmyadmin/phpmyadmin/commit/0d2e214c58328e5796d6583fd7d0... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportWithPlugin method Replace getHtmlForImportWithPlugin method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 33330d7a7b7132ff94f27a1284e90ae041dfb5ab https://github.com/phpmyadmin/phpmyadmin/commit/33330d7a7b7132ff94f27a1284e9... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php A templates/display/import/javascript.twig Log Message: ----------- Use template for getHtmlForImportJs Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: aeef8e54180567915960c022d81b93875dfea0d4 https://github.com/phpmyadmin/phpmyadmin/commit/aeef8e54180567915960c022d81b... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php A templates/display/import/compressions.twig Log Message: ----------- Use template for getHtmlForImportCompressions Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: ef7936af09b6b0d95f688c75f1c7a35af619d7a2 https://github.com/phpmyadmin/phpmyadmin/commit/ef7936af09b6b0d95f688c75f1c7... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php M libraries/classes/Twig/CharsetsExtension.php A templates/display/import/charset.twig Log Message: ----------- Use template for getHtmlForImportCharset Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 96a1f01a624dba0447d6048d26043a2cc8ea9a72 https://github.com/phpmyadmin/phpmyadmin/commit/96a1f01a624dba0447d6048d2604... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForHiddenInputs method Replace getHtmlForHiddenInputs method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 3d688660afb927d1c273e966a865969978b11eb1 https://github.com/phpmyadmin/phpmyadmin/commit/3d688660afb927d1c273e966a865... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportJs method Replace getHtmlForImportJs method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 2f511140ae990578508d93932ec1023a3b18cd6a https://github.com/phpmyadmin/phpmyadmin/commit/2f511140ae990578508d93932ec1... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportCompressions method Replace getHtmlForImportCompressions method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 1c4390205cb597000850d95c953ab72490481f9d https://github.com/phpmyadmin/phpmyadmin/commit/1c4390205cb597000850d95c953a... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportOptions method Replace getHtmlForImportOptions method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 8502c2ad479b0b7894623a988ecdb6e2bb9e4e08 https://github.com/phpmyadmin/phpmyadmin/commit/8502c2ad479b0b7894623a988ecd... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportCharset method Replace getHtmlForImportCharset method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 8f12613b7b7398abd5792fa8ad0b2fb7bd39ec29 https://github.com/phpmyadmin/phpmyadmin/commit/8f12613b7b7398abd5792fa8ad0b... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportOptionsPartialImport method Replace getHtmlForImportOptionsPartialImport method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 4ef1e098d28404865bcdbeda12a365f377b5480a https://github.com/phpmyadmin/phpmyadmin/commit/4ef1e098d28404865bcdbeda12a3... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportOptionsOther method Replace getHtmlForImportOptionsOther method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 4ea6e68b37ad8c82cfef8a9c4136dc3c84649cfc https://github.com/phpmyadmin/phpmyadmin/commit/4ea6e68b37ad8c82cfef8a9c4136... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportOptionsFormat method Replace getHtmlForImportOptionsFormat method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: db607e7fa8eb29b9a06ce9da0583c32341cff53d https://github.com/phpmyadmin/phpmyadmin/commit/db607e7fa8eb29b9a06ce9da0583... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportOptionsSubmit method Replace getHtmlForImportOptionsSubmit method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 7e81e5e09e1c9a65eb93bbfd7ead1ab5d78591a7 https://github.com/phpmyadmin/phpmyadmin/commit/7e81e5e09e1c9a65eb93bbfd7ead... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php M libraries/classes/Twig/UtilExtension.php A templates/display/import/file_option.twig Log Message: ----------- Use template for getHtmlForImportOptionsFile Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: ec3591fe60a92139dc6c0cd2a1f962de04fdec0e https://github.com/phpmyadmin/phpmyadmin/commit/ec3591fe60a92139dc6c0cd2a1f9... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-25 (Sat, 25 Nov 2017) Changed paths: M libraries/classes/Display/Import.php Log Message: ----------- Remove getHtmlForImportOptionsFile method Replace getHtmlForImportOptionsFile method with the template call. Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 4b51f335de4bbe1e33e7a136ebecf71e2e759cd2 https://github.com/phpmyadmin/phpmyadmin/commit/4b51f335de4bbe1e33e7a136ebec... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-26 (Sun, 26 Nov 2017) Changed paths: M libraries/classes/Display/Import.php M templates/display/import/file_option.twig A templates/display/import/import.twig M templates/display/import/javascript.twig Log Message: ----------- Use template for getHtmlForImport Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 73e558337c62521e207359b444ca76317d307e2a https://github.com/phpmyadmin/phpmyadmin/commit/73e558337c62521e207359b444ca... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-26 (Sun, 26 Nov 2017) Changed paths: M db_import.php M libraries/classes/Display/Import.php M server_import.php M tbl_import.php Log Message: ----------- Refactor PhpMyAdmin\Display\Import class Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: ed396da220d56fc5c18cfe0ed2e9cf837b647502 https://github.com/phpmyadmin/phpmyadmin/commit/ed396da220d56fc5c18cfe0ed2e9... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2017-11-26 (Sun, 26 Nov 2017) Changed paths: M db_import.php M libraries/classes/Display/Import.php M libraries/classes/Twig/CharsetsExtension.php M libraries/classes/Twig/UrlExtension.php M libraries/classes/Twig/UtilExtension.php M server_import.php M tbl_import.php A templates/display/import/charset.twig A templates/display/import/compressions.twig A templates/display/import/file_option.twig A templates/display/import/hidden_inputs.twig A templates/display/import/import.twig A templates/display/import/javascript.twig A templates/display/import/options.twig A templates/display/import/submit_option.twig A templates/display/import/with_plugin.twig Log Message: ----------- Merge pull request #13834 from mauriciofauth/display-import Refactor PhpMyAdmin\Display\Import class Compare: https://github.com/phpmyadmin/phpmyadmin/compare/337ec5ade91b...ed396da220d5