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

107265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
9982834c95 Merge commit '43c5a3abdc6aeee6022249e3291ff4e49ee492b9' 2016-09-22 09:48:16 +02:00
Michal Čihař
d219c4f474 Merge pull request #12578 from devenbansod/fix_error_in_adcaf7c 
Fix error in adcaf7c
 2016-09-22 09:47:42 +02:00
Deven Bansod
f4877a7826 Assign LIMIT clause only to syntactically correct queries 
Assigning LIMIT clause to an syntactically-wrong query is not needed.
Also we would want to show the true query and the true error message to the query executor

Fix #12321

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:26:02 +05:30
Michal Čihař
3ba4c10adf Document date verification as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-22 08:47:06 +02:00
Deven Bansod
2d69d40fa2 Fix error in adcaf7c 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-22 12:01:47 +05:30
Weblate
621186a300 Merge remote-tracking branch 'origin/master' 2016-09-21 17:55:16 +02:00
Deven Bansod
fe05fdaa56 Merge branch 'QA_4_6' 2016-09-21 21:27:15 +05:30
Deven Bansod
abc1172440 ChangeLog for #12382 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:25:32 +05:30
조영민
186674f4eb Translated using Weblate (Korean) 
Currently translated at 77.4% (2494 of 3219 strings)

[CI skip]
 2016-09-21 17:55:15 +02:00
yanagimoto
aa26a4df5c Translated using Weblate (Japanese) 
Currently translated at 70.8% (2280 of 3219 strings)

[CI skip]
 2016-09-21 17:55:14 +02:00
Niemand Jedermann
d12e8b9e7c Translated using Weblate (German) 
Currently translated at 99.9% (3218 of 3219 strings)

[CI skip]
 2016-09-21 17:55:13 +02:00
Xavier Navarro
9287f46d24 Translated using Weblate (Catalan) 
Currently translated at 99.6% (3209 of 3219 strings)

[CI skip]
 2016-09-21 17:55:13 +02:00
Deven Bansod
adcaf7ca4b Use intval to prevent XSS instead, and use numeric to check valid datatype 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:24:00 +05:30
Weblate
43c5a3abdc Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-21 17:53:23 +02:00
조영민
f1b54f3b5f Translated using Weblate (Korean) 
Currently translated at 78.0% (2501 of 3206 strings)

[CI skip]
 2016-09-21 17:53:22 +02:00
yanagimoto
1e5dfe6a03 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2284 of 3206 strings)

[CI skip]
 2016-09-21 17:53:22 +02:00
Niemand Jedermann
9396518775 Translated using Weblate (German) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-21 17:53:21 +02:00
Xavier Navarro
1acf38c05e Translated using Weblate (Catalan) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-21 17:53:21 +02:00
Deven Bansod
05cd315074 Merge branch 'QA_4_6' 2016-09-20 23:05:41 +05:30
Deven Bansod
54063a75c3 ChangeLog entry for #12575 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 23:03:50 +05:30
Deven Bansod
5a456eb1ea Fix extra spaces in field name in adding key and dropping field 
Fix #12575

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 22:55:23 +05:30
Deven Bansod
bcebfc81ed Merge branch 'QA_4_6' 2016-09-20 17:02:47 +05:30
Deven Bansod
b463665b13 ChangeLog entry for #12242 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 17:02:00 +05:30
Deven Bansod
38cb18b0de Fix #12242 : Edit routine detail dialog does not fill "Return length" field in mysql functions 
Use correct field to get the details about the length of returning value's datatype

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 17:00:15 +05:30
Michal Čihař
fa17f2459e Merge branch 'QA_4_6' 2016-09-20 09:12:54 +02:00
Michal Čihař
d519c9039e Update SQL parser to 3.4.7 
- issue #12298 Fixed export of view definitions

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-20 09:11:55 +02:00
Michal Čihař
3a4cad1596 Merge pull request #12568 from devenbansod/fix_12526 
Remove token from links and icon links in Navigation bar
 2016-09-19 13:01:43 +02:00
Michal Čihař
ad87644941 Merge branch 'QA_4_6' 2016-09-19 11:36:54 +02:00
Michal Čihař
f7f03127f7 Store create options in serapate array instead of polluting global namespace 
This is just a minor cleanup to avoid possible problems when MySQL
create table options would collide with our variable names.

See also issue #12567

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-19 11:34:43 +02:00
Michal Čihař
7fc28626fd Merge branch 'QA_4_6' 2016-09-19 10:51:50 +02:00
Michal Čihař
5c0af8facf Merge remote-tracking branch 'origin/pull/12556' into QA_4_6 2016-09-19 10:51:45 +02:00
Michal Čihař
bccd690673 Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 2016-09-19 10:50:39 +02:00
Michal Čihař
337e5755c0 Merge remote-tracking branch 'origin/pull/12555' into QA_4_6 2016-09-19 10:48:54 +02:00