Git December 2015

git@phpmyadmin.net

20 participants
376 discussions

[phpmyadmin/phpmyadmin] 41dffd: Translated using Weblate (Korean)

by Weblate

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 41dffdf79a3a383bfe9ba265433f53c9ccb01511 https://github.com/phpmyadmin/phpmyadmin/commit/41dffdf79a3a383bfe9ba265433… Author: Hanson String <miss30kr55(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 77.1% (2479 of 3215 strings) [CI skip] Commit: d9d97983c06b80b5a7655acb93569f03c5ca3b53 https://github.com/phpmyadmin/phpmyadmin/commit/d9d97983c06b80b5a7655acb935… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c8d908d5107f...d9d97983c06b

8 years, 9 months

[phpmyadmin/phpmyadmin] e68d11: Fixes 11744. Incomplete results of UNION ALL

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e68d11a76ce0228d3d68fe91f07221349b4e1d2e https://github.com/phpmyadmin/phpmyadmin/commit/e68d11a76ce0228d3d68fe91f07… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Fixes 11744. Incomplete results of UNION ALL Fixes 11742. MATCH AGAINST keywords not recognized Fixes 11723. syntax verifier is not knowing STRAIGHT_JOIN Fixes 11699. REPLACE() function confused with REPLACE statement Fixes 11690. FLUSH word not recognized by parser Updated sql-parser to udan11/sql-parser@47d03c5dc614939b2df057b984544635ae6217db (v3.0.8). Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 66d80b4a08b241b8cd1e78a33ef2bc3ed386a78e https://github.com/phpmyadmin/phpmyadmin/commit/66d80b4a08b241b8cd1e78a33ef… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- Added ChangeLog entries. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 00e11d610b3b6996e20000bdbabe806f9a61989e https://github.com/phpmyadmin/phpmyadmin/commit/00e11d610b3b6996e20000bdbab… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge pull request #11765 from udan11/QA_4_5 Fixed multiple sql-parser bugs Commit: 81b11a31a7182741d4cc46de01f2b00dfc46b7e7 https://github.com/phpmyadmin/phpmyadmin/commit/81b11a31a7182741d4cc46de01f… Author: Hanson String <miss30kr55(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.1% (2510 of 3210 strings) [CI skip] Commit: 3d29a79b72028a6b69cf1ad1b8cbff015d196c29 https://github.com/phpmyadmin/phpmyadmin/commit/3d29a79b72028a6b69cf1ad1b8c… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Commit: 703c215b38491a826bfad80d74d75af2d11b9614 https://github.com/phpmyadmin/phpmyadmin/commit/703c215b38491a826bfad80d74d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: c8d908d5107ff6071d3570b867d766cc034d0a3a https://github.com/phpmyadmin/phpmyadmin/commit/c8d908d5107ff6071d3570b867d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-20 (Sun, 20 Dec 2015) Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b0608474bd1...c8d908d5107f

8 years, 9 months

[phpmyadmin/phpmyadmin] 81b11a: Translated using Weblate (Korean)

by Weblate

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 81b11a31a7182741d4cc46de01f2b00dfc46b7e7 https://github.com/phpmyadmin/phpmyadmin/commit/81b11a31a7182741d4cc46de01f… Author: Hanson String <miss30kr55(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 78.1% (2510 of 3210 strings) [CI skip] Commit: 3d29a79b72028a6b69cf1ad1b8cbff015d196c29 https://github.com/phpmyadmin/phpmyadmin/commit/3d29a79b72028a6b69cf1ad1b8c… Author: Weblate <noreply(a)weblate.org> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/00e11d610b3b...3d29a79b7202

8 years, 9 months

[phpmyadmin/phpmyadmin] e68d11: Fixes 11744. Incomplete results of UNION ALL

by Marc Delisle

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e68d11a76ce0228d3d68fe91f07221349b4e1d2e https://github.com/phpmyadmin/phpmyadmin/commit/e68d11a76ce0228d3d68fe91f07… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Fixes 11744. Incomplete results of UNION ALL Fixes 11742. MATCH AGAINST keywords not recognized Fixes 11723. syntax verifier is not knowing STRAIGHT_JOIN Fixes 11699. REPLACE() function confused with REPLACE statement Fixes 11690. FLUSH word not recognized by parser Updated sql-parser to udan11/sql-parser@47d03c5dc614939b2df057b984544635ae6217db (v3.0.8). Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 66d80b4a08b241b8cd1e78a33ef2bc3ed386a78e https://github.com/phpmyadmin/phpmyadmin/commit/66d80b4a08b241b8cd1e78a33ef… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- Added ChangeLog entries. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 00e11d610b3b6996e20000bdbabe806f9a61989e https://github.com/phpmyadmin/phpmyadmin/commit/00e11d610b3b6996e20000bdbab… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Components/Expression.php M libraries/sql-parser/src/Components/ExpressionArray.php M libraries/sql-parser/src/Components/JoinKeyword.php M libraries/sql-parser/src/Components/SetOperation.php M libraries/sql-parser/src/Components/UnionKeyword.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Statements/SelectStatement.php Log Message: ----------- Merge pull request #11765 from udan11/QA_4_5 Fixed multiple sql-parser bugs Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6fe98b7a0b0c...00e11d610b3b

8 years, 9 months

[phpmyadmin/phpmyadmin] 6fe98b: Fix an extraneous change from 0af8c39

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6fe98b7a0b0c055023a315ed12b41a77493acb21 https://github.com/phpmyadmin/phpmyadmin/commit/6fe98b7a0b0c055023a315ed12b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/dbi/DBIDummy.class.php Log Message: ----------- Fix an extraneous change from 0af8c39 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 9b0608474bd1d14b198e5e03cf5e39fdd39850ba https://github.com/phpmyadmin/phpmyadmin/commit/9b0608474bd1d14b198e5e03cf5… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/dbi/DBIDummy.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5412dd6e16cc...9b0608474bd1

8 years, 9 months

[phpmyadmin/phpmyadmin] 6fe98b: Fix an extraneous change from 0af8c39

by Deven Bansod

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6fe98b7a0b0c055023a315ed12b41a77493acb21 https://github.com/phpmyadmin/phpmyadmin/commit/6fe98b7a0b0c055023a315ed12b… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/dbi/DBIDummy.class.php Log Message: ----------- Fix an extraneous change from 0af8c39 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>

8 years, 9 months

[phpmyadmin/phpmyadmin] 0af8c3: Update the queries used in DBIDummy

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0af8c39481e5cb598e186307f18eef252f76be93 https://github.com/phpmyadmin/phpmyadmin/commit/0af8c39481e5cb598e186307f18… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/dbi/DBIDummy.class.php Log Message: ----------- Update the queries used in DBIDummy Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5412dd6e16cc87e7f51e8a4f93133934300b023d https://github.com/phpmyadmin/phpmyadmin/commit/5412dd6e16cc87e7f51e8a4f931… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/dbi/DBIDummy.php Log Message: ----------- Merge branch 'QA_4_5' Conflicts: libraries/dbi/DBIDummy.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/52f326c98b16...5412dd6e16cc

8 years, 9 months

[phpmyadmin/phpmyadmin] 0af8c3: Update the queries used in DBIDummy

by Deven Bansod

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0af8c39481e5cb598e186307f18eef252f76be93 https://github.com/phpmyadmin/phpmyadmin/commit/0af8c39481e5cb598e186307f18… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/dbi/DBIDummy.class.php Log Message: ----------- Update the queries used in DBIDummy Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>

8 years, 9 months

[phpmyadmin/phpmyadmin] b0297c: Unset foreign_key_checks while testing insert priv...

by Deven Bansod

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0297c5dccbe3dc52922acef36fc98cbe84fa2c6 https://github.com/phpmyadmin/phpmyadmin/commit/b0297c5dccbe3dc52922acef36f… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-18 (Fri, 18 Dec 2015) Changed paths: M libraries/check_user_privileges.lib.php Log Message: ----------- Unset foreign_key_checks while testing insert priv and reset it back Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 5db813b7a4664acdf0b5c4495304dc4b9161a9fe https://github.com/phpmyadmin/phpmyadmin/commit/5db813b7a4664acdf0b5c449530… Author: Deven Bansod <devenbansod(a)users.noreply.github.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M libraries/check_user_privileges.lib.php Log Message: ----------- Merge pull request #11761 from devenbansod/fix_11752 Fix #11752 : PMA 4.5.2 breaks MySQL Master-Master Cluster Commit: eff2ad168bafc70d031fcaf605ea880e5306fc25 https://github.com/phpmyadmin/phpmyadmin/commit/eff2ad168bafc70d031fcaf605e… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for issue #11752 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: f2124ee1e2d324715eebe4a3d331a19963539ea7 https://github.com/phpmyadmin/phpmyadmin/commit/f2124ee1e2d324715eebe4a3d33… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for issue #11757 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 52f326c98b16425a82f670339163dfa33eae8ee7 https://github.com/phpmyadmin/phpmyadmin/commit/52f326c98b16425a82f67033916… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_5' Conflicts: libraries/check_user_privileges.lib.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/996a6b663662...52f326c98b16

8 years, 9 months

[phpmyadmin/phpmyadmin] f2124e: ChangeLog for issue #11757

by Deven Bansod

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f2124ee1e2d324715eebe4a3d331a19963539ea7 https://github.com/phpmyadmin/phpmyadmin/commit/f2124ee1e2d324715eebe4a3d33… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-12-20 (Sun, 20 Dec 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for issue #11757 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>

8 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2015