- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] aa034b: Update SQL parser
by Michal Čihař 18 Mar '16

18 Mar '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: aa034bb0c9f3757b919cfc89056380b84e66e1ef https://github.com/phpmyadmin/phpmyadmin/commit/aa034bb0c9f3757b919cfc89056… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php A libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Update SQL parser - issue #12026 Fixed parsing of UNION SELECT with brackets Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] aa034b: Update SQL parser
by Michal Čihař 18 Mar '16

18 Mar '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: aa034bb0c9f3757b919cfc89056380b84e66e1ef https://github.com/phpmyadmin/phpmyadmin/commit/aa034bb0c9f3757b919cfc89056… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php A libraries/sql-parser/src/Utils/CLI.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Update SQL parser - issue #12026 Fixed parsing of UNION SELECT with brackets Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: aa1278b12dade6695e305f58843f9bca030d334f https://github.com/phpmyadmin/phpmyadmin/commit/aa1278b12dade6695e305f58843… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_6' Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8a5bf7277578...aa1278b12dad

1 0

[phpmyadmin/phpmyadmin] 1b4360: Fixed possible invalid SQL export
by Michal Čihař 18 Mar '16

18 Mar '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b43606a48bb6260aa9223fbb82547784ce6a3e8 https://github.com/phpmyadmin/phpmyadmin/commit/1b43606a48bb6260aa9223fbb82… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fixed possible invalid SQL export We should emit the charset restoration only if we have emitted its setting in the header. As the condition was slightly different in both cases it was possible that only one part of these two was emitted in past. Fixes #12074 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 1b4360: Fixed possible invalid SQL export
by Michal Čihař 18 Mar '16

18 Mar '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b43606a48bb6260aa9223fbb82547784ce6a3e8 https://github.com/phpmyadmin/phpmyadmin/commit/1b43606a48bb6260aa9223fbb82… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Fixed possible invalid SQL export We should emit the charset restoration only if we have emitted its setting in the header. As the condition was slightly different in both cases it was possible that only one part of these two was emitted in past. Fixes #12074 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 8a5bf72775782306cb42415321e09e5cdc494cf1 https://github.com/phpmyadmin/phpmyadmin/commit/8a5bf72775782306cb42415321e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-18 (Fri, 18 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.php M test/classes/plugin/export/ExportSqlTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/48b444fc2162...8a5bf7277578

1 0

[phpmyadmin/themes] cc9b61: Update printview.css styles. See f72864cb2b526d44f...
by Michal Čihař 17 Mar '16

17 Mar '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/themes Commit: cc9b6116e8c53d22c29b990b615f8fde99e8fa91 https://github.com/phpmyadmin/themes/commit/cc9b6116e8c53d22c29b990b615f8fd… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: M metro/css/printview.css Log Message: ----------- Update printview.css styles. See f72864cb2b526d44f39e2d48aaba7ffe34de9d90 Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 03b7871ca1d72e23daeba2ab3242ec5355fb927a https://github.com/phpmyadmin/themes/commit/03b7871ca1d72e23daeba2ab3242ec5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: R metro/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png R metro/jquery/images/ui-bg_flat_75_ffffff_40x100.png M metro/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M metro/jquery/images/ui-bg_glass_65_ffffff_1x400.png M metro/jquery/images/ui-bg_glass_75_dadada_1x400.png M metro/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M metro/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M metro/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M metro/jquery/images/ui-icons_222222_256x240.png M metro/jquery/images/ui-icons_2e83ff_256x240.png M metro/jquery/images/ui-icons_454545_256x240.png M metro/jquery/images/ui-icons_888888_256x240.png M metro/jquery/images/ui-icons_cd0a0a_256x240.png R metro/jquery/jquery-ui-1.11.2.css A metro/jquery/jquery-ui-1.11.4.css Log Message: ----------- Update jQuery UI to 1.11.4, See c6939e9e50cebd1c10ab12df9867267c76b4cc8e Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: ce6523563159db7c36be0049601975cc07d66734 https://github.com/phpmyadmin/themes/commit/ce6523563159db7c36be0049601975c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: M metro/css/common.css.php M metro/layout.inc.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/themes into update Commit: aa0054e6567ba510a485ec37e32535b75b1598c4 https://github.com/phpmyadmin/themes/commit/aa0054e6567ba510a485ec37e32535b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-11 (Fri, 11 Mar 2016) Changed paths: M metro/css/printview.css Log Message: ----------- Fix styles for print view Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 8599b783289f49753863c89b59d5232018948676 https://github.com/phpmyadmin/themes/commit/8599b783289f49753863c89b59d5232… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M metro/css/printview.css R metro/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png R metro/jquery/images/ui-bg_flat_75_ffffff_40x100.png M metro/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png M metro/jquery/images/ui-bg_glass_65_ffffff_1x400.png M metro/jquery/images/ui-bg_glass_75_dadada_1x400.png M metro/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png M metro/jquery/images/ui-bg_glass_95_fef1ec_1x400.png M metro/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png M metro/jquery/images/ui-icons_222222_256x240.png M metro/jquery/images/ui-icons_2e83ff_256x240.png M metro/jquery/images/ui-icons_454545_256x240.png M metro/jquery/images/ui-icons_888888_256x240.png M metro/jquery/images/ui-icons_cd0a0a_256x240.png R metro/jquery/jquery-ui-1.11.2.css A metro/jquery/jquery-ui-1.11.4.css Log Message: ----------- Merge pull request #11 from madhuracj/update Update metro theme to be compatible with 4.6.0 Compare: https://github.com/phpmyadmin/themes/compare/89cd101b6e2c...8599b783289f

1 0

[phpmyadmin/phpmyadmin] 670311: Translated using Weblate (Slovak)
by Michal Čihař 17 Mar '16

17 Mar '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 670311dd24b70780ea56a46b9b693063635b0b75 https://github.com/phpmyadmin/phpmyadmin/commit/670311dd24b70780ea56a46b9b6… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.1% (2671 of 3211 strings) [CI skip] Commit: cdf07a17fe5491286484b3b1ca5d833796308c36 https://github.com/phpmyadmin/phpmyadmin/commit/cdf07a17fe5491286484b3b1ca5… Author: Weblate <noreply(a)weblate.org> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 48b444fc21623008908132346e7bc3dde94b19e9 https://github.com/phpmyadmin/phpmyadmin/commit/48b444fc21623008908132346e7… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eb4f7534ddf3...48b444fc2162

1 0

[phpmyadmin/phpmyadmin] 670311: Translated using Weblate (Slovak)
by Weblate 17 Mar '16

17 Mar '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 670311dd24b70780ea56a46b9b693063635b0b75 https://github.com/phpmyadmin/phpmyadmin/commit/670311dd24b70780ea56a46b9b6… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 83.1% (2671 of 3211 strings) [CI skip] Commit: cdf07a17fe5491286484b3b1ca5d833796308c36 https://github.com/phpmyadmin/phpmyadmin/commit/cdf07a17fe5491286484b3b1ca5… Author: Weblate <noreply(a)weblate.org> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1523985bce4a...cdf07a17fe54

1 0

[phpmyadmin/phpmyadmin] 409ebf: Translated using Weblate (Slovak)
by Weblate 17 Mar '16

17 Mar '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 409ebff98caae54e46bd393c8e726f0bfab79274 https://github.com/phpmyadmin/phpmyadmin/commit/409ebff98caae54e46bd393c8e7… Author: Jozef Pistej <pistej2(a)gmail.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M po/sk.po Log Message: ----------- Translated using Weblate (Slovak) Currently translated at 82.8% (2664 of 3214 strings) [CI skip] Commit: eb4f7534ddf3a1b79fb82a37ce6a7ab50dbffb30 https://github.com/phpmyadmin/phpmyadmin/commit/eb4f7534ddf3a1b79fb82a37ce6… Author: Weblate <noreply(a)weblate.org> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f8ead4738e49...eb4f7534ddf3

1 0

[phpmyadmin/phpmyadmin] 152398: Fix login after logout with http authentication
by Michal Čihař 17 Mar '16

17 Mar '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1523985bce4aeb15950e80aa75183a473c06430f https://github.com/phpmyadmin/phpmyadmin/commit/1523985bce4aeb15950e80aa751… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Fix login after logout with http authentication We can not check token here as it's always there (in the URL) after logout. Fixes #12098 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 6eb4ba: Fix typo
by Michal Čihař 17 Mar '16

17 Mar '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6eb4baed940c2ee827c5351d20a1a82730f919c0 https://github.com/phpmyadmin/phpmyadmin/commit/6eb4baed940c2ee827c5351d20a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-03-16 (Wed, 16 Mar 2016) Changed paths: M ChangeLog Log Message: ----------- Fix typo Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 1523985bce4aeb15950e80aa75183a473c06430f https://github.com/phpmyadmin/phpmyadmin/commit/1523985bce4aeb15950e80aa751… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Fix login after logout with http authentication We can not check token here as it's always there (in the URL) after logout. Fixes #12098 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f8ead4738e49b0215b325d4bec3568503216f809 https://github.com/phpmyadmin/phpmyadmin/commit/f8ead4738e49b0215b325d4bec3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-03-17 (Thu, 17 Mar 2016) Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/251cd5d071b1...f8ead4738e49

1 0