Commit Graph

403 Commits

Author SHA1 Message Date
Chanaka Indrajith
253de23cf3 Resolved conflicts 2012-06-14 00:52:06 +05:30
Chanaka Indrajith
ba97627d1c Correction sql file and use docblock comment for constructor of PMA_DisplayResults class 2012-06-12 22:53:26 +05:30
Chanaka Indrajith
4e01dd5ae5 Resolved conflict in common.lib.php 2012-06-12 11:34:21 +05:30
Chanaka Indrajith
2aec4150b0 Implement constructor and use global variable instead of variable , which imported from superglobals for functions 2012-06-12 11:22:52 +05:30
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +01:00
Rouslan Placella
971db49c11 Expect JSON for every ajax request in JavaScript 2012-06-11 14:06:05 +01:00
Rouslan Placella
ae6e50a8a8 Drop display() from Header and Footer classes. The Response class will do all the rendering. 2012-06-11 14:06:04 +01:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
635023c791 relation.lib.php is already included by common.inc.php 2012-06-11 14:06:03 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
243727043d Removed the last references to the old header files 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Rouslan Placella
bf219df66d Merge branch 'QA_3_5'
Conflicts:
	enum_editor.php
2012-06-11 14:01:46 +01:00
Rouslan Placella
ddd1eac480 Fixed bug #3534311 - Grid editing incorrectly parses ENUM/SET values 2012-06-11 14:00:18 +01:00
Chanaka Indrajith
0f86dd7152 Renamed display_tbl.lib.php file as DisplayResults.class.php 2012-06-09 19:45:03 +05:30
Chanaka Indrajith
92b71154be Introduce DisplayResults class 2012-06-08 12:13:15 +05:30
Marc Delisle
5c53fb643a Fix merge conflicts 2012-05-24 12:34:15 -04:00
Chanaka Indrajith
7092aa4e99 Merge remote branch 'upstream/master' 2012-05-14 17:46:46 +05:30
Rouslan Placella
7b3ffe10cb Moved parameters check out of the header file 2012-05-13 00:28:34 +01:00
Rouslan Placella
843fce6b5a Moved generation of print summary for queries to sql.php - allows better reuse of header_printview.inc.php 2012-05-13 00:02:59 +01:00
Marc Delisle
a44ee59093 jqPlot for profiling chart 2012-05-11 14:28:08 -04:00
Chanaka Indrajith
bf15800089 Remove HTML rendering inside the functions in display_tbl.lib.php file itselves 2012-05-11 16:05:55 +05:30
Rouslan Placella
28923b496e Renamed tbl_common.php to tbl_common.inc.php for better consistency 2012-05-05 16:44:27 +01:00
Rouslan Placella
2c805ade8b Dropped tbl_links.inc.php 2012-05-05 16:44:27 +01:00
Rouslan Placella
7b85c709a8 Dropped server_links.inc.php 2012-05-05 16:44:27 +01:00
Jo Michael
161a5a9321 Fix new checkstyle warnings 2012-04-29 03:16:11 +02:00
Jo Michael
6839781e88 Fix checkstyle MultiLineAssignment warnings 2012-04-29 02:16:40 +02:00
Michal Čihař
0e26eeb56a Move comments out of if statement 2012-04-27 11:40:11 +02:00
Rouslan Placella
49a7f12e4e Include CodeMirror globally 2012-04-25 23:47:24 +01:00
Rouslan Placella
ebb5a21045 Merge branch 'QA_3_5' 2012-04-25 21:06:18 +01:00
Rouslan Placella
403fd46818 Fixed bug #3521416 - JS error when editing index 2012-04-25 21:05:41 +01:00
Jo Michael
13644d8591 Short-hand notation for jQuery document.ready event 2012-04-21 02:44:18 +02:00
Alex Marin
4de7d3c83d bookmark sql query after checking errors 2012-04-20 17:21:06 +03:00
Alex Marin
b02e8adc3c avoid assignment in condition 2012-04-20 16:41:12 +03:00
Jo Michael
8744f8cf66 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false 2012-04-13 01:43:32 +02:00
Jo Michael
b0e67c419c Fix PHP notices 2012-04-09 23:09:51 +02:00
Marc Delisle
dd5aae9a67 jQuery UI is already included from common.inc.php 2012-04-09 09:09:07 -04:00
Jo Michael
104ec11200 No additional spaces in "(query took ...)" message 2012-04-08 23:03:58 +02:00
Madhura Jayaratne
e8dc6f846b Merge branch 'QA_3_5'
Conflicts:
	sql.php
2012-04-07 16:10:59 +05:30
Madhura Jayaratne
e10ece8214 bug #3515666 [display] Profiling chart shows wrong data 2012-04-07 16:00:20 +05:30
Madhura Jayaratne
90b2d66317 Merge branch 'QA_3_5' 2012-03-26 22:16:35 +05:30
Madhura Jayaratne
54084929a5 bug #3510784 [edit] Limit clause ignored when sort order is remembered 2012-03-26 22:01:11 +05:30
Jo Michael
c36a9113e0 Replaced td[align] with td[class] due to HTML5 2012-03-18 19:53:43 +01:00
Jo Michael
9842f01444 Replaced HTML5-obsolete <tt> tags with <code> 2012-03-18 18:04:50 +01:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Michal Čihař
a5b5c2e541 Clearer confirmation of query 2012-03-14 16:15:18 +01:00
Marc Delisle
92ef8d8a8b Confirmation after a bookmark creation needs these $_GET parameters 2012-03-12 17:07:57 -04:00
Marc Delisle
0de997c268 $_POST and bookmark creation 2012-03-11 08:17:55 -04:00
Marc Delisle
8a44f287f5 No longer depend on grab_globals.lib.php for $_GET variables 2012-03-04 07:10:29 -05:00
Michal Čihař
9bb5535199 Provide Show all button for reasonably small tables 2012-02-08 10:03:05 +01:00