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

105943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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ř
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ř
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
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ř
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
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
316e0004cc ChangeLog entry for #12461 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-23 09:43:35 +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ř
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ř
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
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
43c5a3abdc Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-21 17:53:23 +02:00
Deven Bansod
abc1172440 ChangeLog for #12382 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:25:32 +05:30
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
조영민
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
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
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ř
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ř
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ř
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
Michal Čihař
e2ac325a7a Merge remote-tracking branch 'origin/pull/12557' into QA_4_6 2016-09-19 10:46:56 +02:00
Deven Bansod
3992bd65be Translated using Weblate (German) 
Currently translated at 99.8% (3201 of 3206 strings)

[CI skip]
 2016-09-19 10:34:39 +02:00
dingo thirteen
d800fc1679 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-19 10:34:38 +02:00
Deven Bansod
ea5870bb9b Fix class name in export test comments 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-18 12:04:38 +05:30
Michal Čihař
9d27af821c Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-09-16 16:05:31 +02:00
Michal Čihař
2fc2c25aaf Fix documentation to match state after PMASA-2016-54 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 15:59:42 +02:00
Deven Bansod
71cce8e2f5 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-09-16 18:38:31 +05:30
Deven Bansod
14340f9c31 ChangeLog entry for #12272 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 18:37:03 +05:30
Deven Bansod
a588880750 Special handling for radio fields after cloning on tbl insert page 
Fix #12272

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 18:33:28 +05:30