gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,315 Commits 12 Branches 481 Tags 2.4 GiB
333ada932d
Commit Graph

107315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
333ada932d Merge branch 'QA_4_6' 2016-10-03 16:06:42 +02:00
Michal Čihař
aa19ffde32 Update SQL parser to 3.4.9 
- issue #12316 Correct export of complex SELECT statements
- issue #12080 Fixed parsing of subselect queries
- issue #11740 Fixed handling DELETE ... USING queries
- issue #12100 Fixed handling of CASE operator

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 16:06:10 +02:00
Deven Bansod
9419526304 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/zh_CN.po
 2016-10-03 14:20:10 +05:30
Deven Bansod
c202b7a87c Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-03 14:17:23 +05:30
Deven Bansod
6a53b89cb7 Escape database name properly to be used in MySQL wildcard statements 
Fix #12602

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 14:14:11 +05:30
Deven Bansod
b2d337814a Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-03 10:52:03 +05:30
Weblate
be1adf18e4 Merge remote-tracking branch 'origin/master' 2016-10-03 07:21:39 +02:00
Deven Bansod
77d1adcc47 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/mk.po
 2016-10-03 10:53:28 +05:30
Dadan Setia
8e684a1947 Translated using Weblate (Indonesian) 
Currently translated at 68.4% (2204 of 3219 strings)

[CI skip]
 2016-10-03 07:21:37 +02:00
an wei
6de8fad985 Translated using Weblate (Chinese (China)) 
Currently translated at 87.6% (2820 of 3219 strings)

[CI skip]
 2016-10-03 07:21:36 +02:00
Deven Bansod
4fb7d73401 Don't assume justBrowsing if there is a Join in the query 
Fix #12189

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 10:50:32 +05:30
Weblate
b9adbff762 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-03 07:20:15 +02:00
Dadan Setia
cc161ba310 Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2207 of 3206 strings)

[CI skip]
 2016-10-03 07:20:13 +02:00
an wei
0e0fdf985a Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2824 of 3206 strings)

[CI skip]
 2016-10-03 07:20:12 +02:00
Dragan Zlatkovski
ada8298508 Translated using Weblate (Macedonian) 
Currently translated at 17.2% (554 of 3206 strings)

[CI skip]
 2016-10-02 18:45:25 +02:00
Dragan Zlatkovski
128c0607ef Translated using Weblate (Macedonian) 
Currently translated at 17.2% (554 of 3219 strings)

[CI skip]
 2016-10-02 18:45:18 +02:00
Yogi Erka Julyansa Putra
a16d1c9a6a Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2208 of 3206 strings)

[CI skip]
 2016-10-02 18:37:48 +02:00
Yogi Erka Julyansa Putra
a266bf5016 Translated using Weblate (Indonesian) 
Currently translated at 68.4% (2205 of 3219 strings)

[CI skip]
 2016-10-02 18:37:40 +02:00
Deven Bansod
5f84046759 Make PHPCS happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-29 09:21:50 +05:30
Deven Bansod
d6571ef86c Merge branch 'QA_4_6' 
Conflicts:
	po/sk.po
 2016-09-28 20:09:45 +05:30
Deven Bansod
f54f8fa322 ChangeLog for #12579 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-28 20:07:44 +05:30
Deven Bansod
bba3ae2ab5 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-09-28 19:29:20 +05:30
Michal Čihař
7a80af393d Add missing escaping in sample regexp 
Fixes #12594

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-28 19:27:47 +05:30
Jozef Pistej
7084608fff Translated using Weblate (Slovak) 
Currently translated at 83.6% (2682 of 3206 strings)

[CI skip]
 2016-09-28 19:27:47 +05:30
Deven Bansod
59cd9bf3a1 Replace FROM clause aliases only if FROM clause is present 
Fix #12579

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-28 19:27:35 +05:30
Michal Čihař
353aadbafb Return HTTP 500 on fatal error 
This makes it clear that something is broken.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 13:22:30 +02:00
Michal Čihař
fe549c4e19 Test with PHP 7.1.0RC2 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 10:40:33 +02:00
Weblate
5511b39e16 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-27 09:23:54 +02:00
Jozef Pistej
f99aa69784 Translated using Weblate (Slovak) 
Currently translated at 83.6% (2682 of 3206 strings)

[CI skip]
 2016-09-27 09:23:54 +02:00
Weblate
baa3c739ea Merge remote-tracking branch 'origin/master' 2016-09-27 09:23:48 +02:00
Jozef Pistej
624c300db1 Translated using Weblate (Slovak) 
Currently translated at 83.1% (2675 of 3219 strings)

[CI skip]
 2016-09-27 09:23:48 +02:00
Michal Čihař
a8783aabec Merge branch 'QA_4_6' 2016-09-27 09:23:36 +02:00
Michal Čihař
2d316e47e1 Add missing escaping in sample regexp 
Fixes #12594

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:23:06 +02:00
Deven Bansod
02eeb21df8 Add missing Doc comment 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-26 21:51:22 +05:30
Deven Bansod
7fe62ef22e Remove extra space 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-26 21:48:58 +05:30
Michal Čihař
827ff6534d Merge branch 'QA_4_6' 2016-09-26 13:45:09 +02:00
Michal Čihař
a1c27b957c Cleanup code for getting table information 
Fixes #12475

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:44:57 +02:00
Michal Čihař
6cbcc319b1 Fix function name 
Fixes #12505

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:41:33 +02:00
Michal Čihař
86128d63f6 Merge branch 'QA_4_6' 2016-09-26 13:41:05 +02:00
Michal Čihař
d956922a61 Remove duplicate code in SQL escaping 
Fixes #12508

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:40:04 +02:00
Michal Čihař
8c253e91f6 Merge branch 'QA_4_6' 2016-09-26 13:36:25 +02:00
Michal Čihař
07b0f09232 Clarify documentation on ArbitraryServerRegexp 
- recommend using start/end of string in regexp
- add examples
- add note mentioning port inclusion in the match
- fixes #12511

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:35:41 +02:00
Michal Čihař
d37c42fb95 Merge branch 'QA_4_6' 2016-09-26 13:28:19 +02:00
Weblate
07e53c88c1 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-26 09:20:45 +02:00
Domen
2caac6c618 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-26 09:20:44 +02:00
Victor Volkov
a381b5a606 Translated using Weblate (Russian) 
Currently translated at 98.1% (3155 of 3213 strings)

[CI skip]
 2016-09-26 09:20:44 +02:00
Michal Čihař
e67c066c4e Merge branch 'QA_4_6' 2016-09-26 09:20:25 +02:00
Michal Čihař
6db9b77dcf Merge remote-tracking branch 'origin/QA_4_6' 2016-09-26 09:20:22 +02:00
Michal Čihař
b6263ede84 Use example.com as example domain 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 09:20:08 +02:00
Daniel Palmeira Huanca
02a708c7d0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.2% (2988 of 3206 strings)

[CI skip]
 2016-09-25 21:45:39 +02:00