gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,811 Commits 12 Branches 481 Tags 2.4 GiB
4cd3597bda
Commit Graph

102811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
4cd3597bda Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:34:50 -05:00
Marc Delisle
09c3375ec2 Merge commit 'a81ac37' into QA_4_5 2015-12-25 14:34:01 -05:00
Marc Delisle
63989d8666 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:33:16 -05:00
Robin van der Vliet
c9b35f480f Translated using Weblate (Esperanto) 
Currently translated at 2.5% (81 of 3210 strings)

[CI skip]
 2015-12-24 22:56:23 +01:00
Michal Čihař
5de5dc8463 Simplify detection of current script 
Fixes #11754

Signed-off-by: Michal Čihař <michal@cihar.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-24 08:12:56 -05:00
Marc Delisle
bd77d385da 4.5.3 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-23 08:01:57 -05:00
Marc Delisle
a81ac373c8 4.5.3 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-23 08:01:13 -05:00
Weblate
2004c90aeb Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-23 09:56:29 +01:00
Martin Lacina
983c36fd42 Translated using Weblate (Slovak) 
Currently translated at 83.8% (2690 of 3210 strings)

[CI skip]
 2015-12-23 09:56:29 +01:00
Michal Čihař
777a431e3d Merge branch 'MAINT_4_5_3' into QA_4_5 2015-12-23 09:55:56 +01:00
Michal Čihař
16d9e80671 Fix possible undefined variables in table operations 
Fixes #11749

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-23 09:55:36 +01:00
Michal Čihař
d0c79e0294 Merge remote-tracking branch 'origin/MAINT_4_5_2' into QA_4_5 2015-12-23 09:53:09 +01:00
Deven Bansod
fe5f69c401 Prevent unnecessary update when nothing is changed 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-21 18:27:03 +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ř
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ř
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
42a9a81cc0 4.5.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-20 04:39:50 -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
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
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
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
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
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
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
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
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
Michal Čihař
f5246d1dbe Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 21:22:15 +01:00
Παναγιώτης Παπάζογλου
52263431ee Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 16:58:37 +01:00
Anna Henningsen
59fdb334c8 Translated using Weblate (German) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 13:57:43 +01:00
Burak Yavuz
f39e5147b4 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 12:14:46 +01:00
Kristjan Räts
c86db814c3 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 12:07:20 +01:00
Michal Čihař
9d18e90afb Missing quoting of table in ALTER CONVERT query 
Fixes #11758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-17 11:33:55 +01:00
Michal Čihař
160d6e2e20 Merge remote-tracking branch 'weblate-4.5/QA_4_5' into QA_4_5 2015-12-16 08:13:08 +01:00