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

107298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Weblate
611add5b93 Merge remote-tracking branch 'origin/master' 2016-09-25 20:17:51 +02:00
Deven Bansod
28afa87302 Make phpcs happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-25 23:49:51 +05:30
Domen
9bfee724b5 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-09-25 20:17:50 +02:00
Victor Volkov
e60a006019 Translated using Weblate (Russian) 
Currently translated at 97.3% (3134 of 3219 strings)

[CI skip]
 2016-09-25 20:17:50 +02:00
Daniel Palmeira Huanca
a5f2f98f31 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.6% (2984 of 3219 strings)

[CI skip]
 2016-09-25 20:17:49 +02:00
Deven Bansod
44b96a37e0 Merge branch 'QA_4_6' 2016-09-23 11:12:34 +05:30
Deven Bansod
2f0ec14993 Refactor check function instead of separate function 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-23 11:12:06 +05:30
Deven Bansod
1a54c61360 Merge branch 'QA_4_6' 2016-09-23 09:44:24 +05:30
Deven Bansod
316e0004cc ChangeLog entry for #12461 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-23 09:43:35 +05:30
Deven Bansod
57030736e0 Merge branch 'QA_4_6' 2016-09-22 14:12:29 +05:30
Deven Bansod
19c91010c6 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-09-22 14:10:37 +05:30
Deven Bansod
5a9813e11f Do not backquote the user and host if already backquoted 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 14:09:36 +05:30
Michal Čihař
be8e64d4ea Document setting verbose name for Docker 
See https://github.com/phpmyadmin/docker/issues/54

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-22 09:57:29 +02:00
Michal Čihař
df8a3693bf Merge branch 'QA_4_6' 2016-09-22 09:51:04 +02:00
Michal Čihař
35011c0170 Changelog entry for #12321 and #12580 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-22 09:50:58 +02:00
Michal Čihař
b83ba03bd4 Merge pull request #12580 from devenbansod/fix_12321 
Assign LIMIT clause only to syntactically correct queries
 2016-09-22 09:50:16 +02:00
Michal Čihař
fd2215c469 Merge branch 'QA_4_6' 2016-09-22 09:48:22 +02:00