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

104214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
c557581389 Merge branch 'QA_4_5' 2015-12-21 16:27:52 +05:30
Deven Bansod
9121ebf525 ChangeLog entry for issue #11724 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-21 16:26:41 +05:30
Michal Čihař
98d88ef134 Remove unused pmaString variable 
It was used in past when we didn't rely on mbstring.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 11:35:36 +01:00
Michal Čihař
47a5ece9c1 Merge branch 'QA_4_5' 2015-12-21 11:31:22 +01:00
Michal Čihař
6cbfe12122 Remove unused code 
These variables are set on next row anyway.

Issue #11749

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 11:26:22 +01:00
Michal Čihař
b485166d08 Avoid not needed mb_strtoupper 
The libraries/tbl_info.inc.php already does this.

Issue #11749

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 11:26:12 +01:00
Michal Čihař
5abdf6886b Merge remote-tracking branch 'origin/QA_4_5' 2015-12-21 11:16:39 +01:00
Michal Čihař
ad769bd0b9 Merge pull request #11766 from devenbansod/fix_11724 
Fix #11724 : live data edit of big sets is not working
 2015-12-21 11:14:41 +01:00
Deven Bansod
0b64ff7f72 Fix #11724 : live data edit of big sets is not working 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-21 13:53:03 +05:30
Marc Delisle
1daeb372db Remove unneeded code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-20 18:33:43 -05:00
Marc Delisle
0cd9a76774 4.5.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-20 04:40:55 -05:00
Marc Delisle
1290151211 Merge branch 'QA_4_5' 2015-12-20 04:40:21 -05:00
Marc Delisle
42a9a81cc0 4.5.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-20 04:39:50 -05:00
Weblate
d9d97983c0 Merge remote-tracking branch 'origin/master' 2015-12-20 10:30:27 +01:00
Hanson String
41dffdf79a Translated using Weblate (Korean) 
Currently translated at 77.1% (2479 of 3215 strings)

[CI skip]
 2015-12-20 10:30:26 +01:00
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