webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

10206 Commits

Author SHA1 Message Date
Michal Čihař
3f0122b6f4 Merge branch 'QA_4_6' 2016-10-04 12:17:21 +02:00
Michal Čihař
a7786dd93a Changelog for #12582 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:17:02 +02:00
Michal Čihař
7f35b62c06 Merge branch 'QA_4_6' 2016-10-04 11:51:46 +02:00
Michal Čihař
cd4c8374b1 Fixed regexp for matching browser versions 
Fixes #12615

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:51:29 +02:00
Deven Bansod
f04aa22cc6 Merge branch 'QA_4_6' 2016-10-04 10:59:31 +05:30
Deven Bansod
46ae500508 ChangeLog entry for #12419 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-04 10:59:05 +05:30
Michal Čihař
fc5bb4a278 Merge branch 'QA_4_6' 2016-10-03 19:38:40 +02:00
Michal Čihař
4ba041720f Changelog entry for #12584 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:36:33 +02:00
Michal Čihař
0292b89c4a Merge remote-tracking branch 'origin/pull/12596' into QA_4_6 2016-10-03 19:35:07 +02:00
Michal Čihař
200a92b738 Merge remote-tracking branch 'origin/pull/12601' into QA_4_6 2016-10-03 19:33:48 +02:00
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
5c74f44357 ChangeLog entry for #12455 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-30 11:00:30 +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
9bd75db679 ChangeLog entry for #12327 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-27 13:51:30 +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ř
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
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
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
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
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
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
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ř
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
Michal Čihař
61d8dc4791 Merge branch 'QA_4_6' 2016-09-19 10:47:31 +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
4605f0b1c9 Merge branch 'QA_4_6' 2016-09-16 18:39:41 +05:30
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
Michal Čihař
08d491d021 Merge branch 'QA_4_6' 2016-09-16 10:37:59 +02:00
Michal Čihař
350be95a53 Changelog entry for #12553 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:37:22 +02:00
Michal Čihař
6047e229b7 Merge branch 'QA_4_6' 2016-09-16 10:35:16 +02:00
Michal Čihař
ea90f28551 Changelog for #12548 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:34:55 +02:00
Deven Bansod
b6952bbe55 ChangeLog entry for #12554 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:59:00 +05:30
Deven Bansod
4f1432eb2f ChangeLog entry for #12300 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:57:26 +05:30
Deven Bansod
734b69b418 ChangeLog entry for #12487 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:56:09 +05:30