gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,199 Commits 12 Branches 481 Tags 2.4 GiB
c8d908d510
Commit Graph

104199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
c8d908d510 Merge branch 'QA_4_5' 2015-12-20 04:29:40 -05:00
Marc Delisle
703c215b38 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-20 04:29:01 -05:00
Weblate
3d29a79b72 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-20 10:19:47 +01:00
Hanson String
81b11a31a7 Translated using Weblate (Korean) 
Currently translated at 78.1% (2510 of 3210 strings)

[CI skip]
 2015-12-20 10:19:46 +01:00
Marc Delisle
00e11d610b Merge pull request #11765 from udan11/QA_4_5 
Fixed multiple sql-parser bugs
 2015-12-20 04:19:43 -05:00
Deven Bansod
9b0608474b Merge branch 'QA_4_5' 2015-12-20 09:42:54 +05:30
Deven Bansod
6fe98b7a0b Fix an extraneous change from 0af8c39 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-20 09:41:43 +05:30
Deven Bansod
5412dd6e16 Merge branch 'QA_4_5' 
Conflicts:
	libraries/dbi/DBIDummy.php
 2015-12-20 08:49:37 +05:30
Deven Bansod
0af8c39481 Update the queries used in DBIDummy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-20 08:46:31 +05:30
Deven Bansod
52f326c98b Merge branch 'QA_4_5' 
Conflicts:
	libraries/check_user_privileges.lib.php
 2015-12-20 08:40:45 +05:30
Deven Bansod
f2124ee1e2 ChangeLog for issue #11757 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-20 08:28:07 +05:30
Deven Bansod
eff2ad168b ChangeLog for issue #11752 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-20 08:26:35 +05:30
Deven Bansod
5db813b7a4 Merge pull request #11761 from devenbansod/fix_11752 
Fix #11752 : PMA 4.5.2 breaks MySQL Master-Master Cluster
 2015-12-20 08:24:13 +05:30
Dan Ungureanu
66d80b4a08 Added ChangeLog entries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-12-20 01:28:38 +02:00
Dan Ungureanu
e68d11a76c 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@47d03c5dc6 (v3.0.8).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-12-20 01:26:47 +02:00
Deven Bansod
996a6b6636 Move the variable assignment inside the else-if block 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 16:37:33 -05:00
Marc Delisle
187aa094d9 Merge branch 'QA_4_5' 2015-12-19 16:34:20 -05:00
Weblate
ed08510b98 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-19 18:30:58 +01:00
Domen
02df03b4a5 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-19 18:30:58 +01:00
Masahiro Nishi
e06399b37a Translated using Weblate (Japanese) 
Currently translated at 66.6% (2141 of 3210 strings)

[CI skip]
 2015-12-19 18:30:57 +01:00
Andrey Aleksanyants
eb726d36f5 Translated using Weblate (Armenian) 
Currently translated at 67.2% (2159 of 3210 strings)

[CI skip]
 2015-12-19 18:30:56 +01:00
Deven Bansod
c7b40c9717 Add a base case for MySQL versions 5.5.0 - 5.5.7 - Might give an error on these versions otherwise 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 22:59:15 +05:30
Deven Bansod
dc64071185 Add a base case for MySQL versions 5.5.0 - 5.5.7 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 22:00:39 +05:30
Deven Bansod
7c0a25c937 Move the variable assignment inside the else-if block 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 21:56:57 +05:30
Marc Delisle
a93160128f Fix indenting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-19 10:53:31 -05:00
Marc Delisle
74a867fd45 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-19 10:46:56 -05:00
Weblate
f6997121bd Merge remote-tracking branch 'origin/master' 2015-12-19 08:50:49 +01:00
Masahiro Nishi
9930d1e9d0 Translated using Weblate (Japanese) 
Currently translated at 65.9% (2119 of 3215 strings)

[CI skip]
 2015-12-19 08:50:47 +01:00
Andrey Aleksanyants
e2a1134b1e Translated using Weblate (Armenian) 
Currently translated at 67.4% (2168 of 3215 strings)

[CI skip]
 2015-12-19 08:50:44 +01:00
Deven Bansod
8c4cbbb988 Fix a reference to non-existing class. Use proper namespace and syntax 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-19 13:20:08 +05:30
Deven Bansod
5fdd750909 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-12-18 21:28:46 +05:30
Deven Bansod
8319c12c86 Fix error in test 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 21:27:34 +05:30
Domen
3d2c5f54e8 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-18 16:44:41 +01:00
Domen
881bc24a67 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-18 16:43:35 +01:00
Deven Bansod
a3a9a4578c Fix erroneous condition for array's all keys empty check 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 21:06:37 +05:30
Stefano Martinelli
1ed3443c55 Translated using Weblate (Italian) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-18 16:29:57 +01:00
Michal Čihař
e10b10936d Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-18 16:27:57 +01:00
Deven Bansod
52c637b383 Merge branch 'QA_4_5' 
Conflicts:
	libraries/mysql_charsets.lib.php
	po/de.po
	po/el.po
	po/et.po
	po/nl.po
	po/tr.po
	test/classes/TableTest.php
	test/libraries/PMA_mysql_charsets_test.php
 2015-12-18 20:18:10 +05:30
Weblate
d75c68d589 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-18 15:39:17 +01:00
Giovanni Sora
c774ccc4f6 Translated using Weblate (Interlingua) 
Currently translated at 72.5% (2329 of 3210 strings)

[CI skip]
 2015-12-18 15:39:16 +01:00
Xosé Calvo
0516a406b5 Translated using Weblate (Galician) 
Currently translated at 83.3% (2676 of 3210 strings)

[CI skip]
 2015-12-18 15:39:15 +01:00
Marc Delisle
07974ec70d Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-18 15:39:15 +01:00
Deven Bansod
99e30eff73 Merge pull request #11762 from devenbansod/fix_11757 
Fix #11757 : Export and preview show different SQL for character set - Use 'CHARSET='  uniformly with respect to table 'show create' and table 'export'
 2015-12-18 20:09:10 +05:30
Deven Bansod
a4f02ca28f Fix #11757 : Export and preview show different SQL for character set 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 19:03:24 +05:30
Madhura Jayaratne
13eac96191 Merge branch 'test' 2015-12-18 22:00:27 +11:00
Madhura Jayaratne
1c4e0bdaea Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 21:47:13 +11:00
Madhura Jayaratne
2b7cfb595d Move the rest of the tests related to objects under a common parent test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 21:32:34 +11:00
Madhura Jayaratne
b67f746bef Update test classes related to schema exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 21:16:40 +11:00
Deven Bansod
b0297c5dcc Unset foreign_key_checks while testing insert priv and reset it back 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 12:56:40 +05:30
Madhura Jayaratne
46a6967c70 Update another plugin test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 17:41:05 +11:00