Commit Graph

85394 Commits

Author SHA1 Message Date
xmujay
71fcb2fe2c refactor server_status_queries.php: 1. move functions to lib file 2013-07-29 20:32:45 +08:00
Michal Čihař
1d2f4a5ad3 Merge pull request #545 from adamgsoc2013/ut_plu_dbi
test case for DBI/DBIMysql*
2013-07-28 11:18:56 -07:00
Michal Čihař
a413b6bb6b Merge pull request #544 from adamgsoc2013/UT_plu_table
Unit test case for User_Schema
2013-07-28 11:17:41 -07:00
Marc Delisle
0c21130100 Merge pull request #541 from scnakandala/gsoc_2013_2
Refactoring SQL executor
2013-07-28 10:03:35 -07:00
adamgsoc2013
da673ad8be test case for DBI/DBIMysql* 2013-07-28 23:10:55 +08:00
adamgsoc2013
6cae4843eb rename to test case function name 2013-07-28 23:06:27 +08:00
adamgsoc2013
6292715857 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table 2013-07-28 23:03:49 +08:00
adamgsoc2013
388a66cd4e Unit test case for User_Schema 2013-07-28 21:45:08 +08:00
Marc Delisle
cd0167fb80 Merge branch 'QA_4_0' 2013-07-28 09:36:15 -04:00
Marc Delisle
e73bfee67c 4.0.6-dev 2013-07-28 09:34:39 -04:00
Marc Delisle
6d2efd9c7b Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-28 09:32:57 -04:00
Marc Delisle
52b9b6c81f 4.0.5-rc1 2013-07-28 09:31:06 -04:00
Marc Delisle
fdb0ad1f69 Merge branch 'QA_4_0' 2013-07-28 06:26:12 -04:00
Marc Delisle
0e9e7f28a2 Fix merge conflicts 2013-07-28 06:25:48 -04:00
Marc Delisle
af5ca358d2 Fix merge conflicts 2013-07-28 06:23:57 -04:00
Marc Delisle
f5136aea9e Merge branch 'MAINT_4_0_4' into QA_4_0 2013-07-28 06:22:49 -04:00
Marc Delisle
ad54449d10 4.0.4.2 release 2013-07-28 06:22:27 -04:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Spun Nakandala
7b77857602 Query results operations not shown in Show PHP Code 2013-07-28 11:33:48 +05:30
Spun Nakandala
5d539b1b61 duplicate messages after without php code clicked corrected 2013-07-28 11:32:07 +05:30
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Dieter Adriaenssens
b9c814ed6d [security] Fix unencoded json object, see PMASA-2013-11 2013-07-28 01:50:46 +02:00
Michal Čihař
6df3c0adb5 Merge pull request #543 from madhuracj/pma_string
Pma string
2013-07-27 12:50:24 -07:00
Madhura Jayaratne
627ed59770 Fix failing tests 2013-07-28 01:10:22 +05:30
Madhura Jayaratne
09f1e0cb97 Fix typo 2013-07-28 01:00:34 +05:30
Madhura Jayaratne
dcfeeafe3b Update test cases 2013-07-28 00:56:02 +05:30
Madhura Jayaratne
a025dc7d2a Move interfaces into files of their own 2013-07-28 00:04:12 +05:30
Madhura Jayaratne
841ae562e3 Do not access $GLOBALS['PMA_String'] from StringNativeType class 2013-07-27 23:52:17 +05:30
Isaac Bennetch
b0da1d1a99 Generate image sprites (for hide navigation feature) 2013-07-27 14:12:12 -04:00
Isaac Bennetch
1a41ce1f59 Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables
Conflicts:
	ChangeLog
2013-07-27 14:01:35 -04:00
Madhura Jayaratne
bce4e73452 Simplify 2013-07-27 23:29:57 +05:30
Madhura Jayaratne
37233934a4 Use $this to refer to the instance 2013-07-27 23:29:10 +05:30
Spun Nakandala
3dd358746d removed include sql.php from import.php 2013-07-27 23:18:06 +05:30
Spun Nakandala
c44eb79b49 no use of the code segment 2013-07-27 23:18:04 +05:30
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
Madhura Jayaratne
f25e0e8229 Fix class name 2013-07-27 22:34:32 +05:30
Madhura Jayaratne
c03661e950 Fix indentation 2013-07-27 22:34:04 +05:30
Madhura Jayaratne
d103a17c29 These methods are now part of Validator class, hence no PMA_ prefix 2013-07-27 21:26:57 +05:30
Kasun Chathuranga
0cc2cc69a5 Change feature name from 'navigation' to 'navigationhiding' 2013-07-27 21:11:44 +05:30
Madhura Jayaratne
b31a9cd16f Simplify how inline edit link is added. 2013-07-27 20:10:12 +05:30
Madhura Jayaratne
2a28436bdd #4035 Query "inline" link disappears when turning off "Explain SQL" option 2013-07-27 20:03:26 +05:30
Madhura Jayaratne
8554a29105 Merge branch 'QA_4_0' 2013-07-27 18:10:08 +05:30
Madhura Jayaratne
bf79ce9101 Add metro theme to ignore list 2013-07-27 18:07:32 +05:30
Dieter Adriaenssens
ad8aa19097 remove duplicate code, CURLOPT_RETURNTRANSFER is set twice 2013-07-27 14:25:42 +02:00
Marc Delisle
ab7f0a143c Merge branch 'QA_4_0' 2013-07-27 06:33:34 -04:00
Marc Delisle
3fde4efd51 #3578 transformations for text/plain on a BLOB column 2013-07-27 06:32:58 -04:00
Marc Delisle
ea6582984e Return the correct db name 2013-07-27 05:19:24 -04:00
Marc Delisle
5dd6e4de3e Clarify comment 2013-07-26 17:24:22 -04:00
Weblate
b4182e3527 Merge remote-tracking branch 'origin/master' 2013-07-26 15:11:06 +02:00