Commit Graph

200 Commits

Author SHA1 Message Date
Chanaka Indrajith
e5a4596de7 Merge remote branch 'upstream/master' 2012-07-01 09:08:37 +05:30
Marc Delisle
2c6f80aa47 Bug #3539142 Normal INSERT does not show the statement 2012-06-30 15:00:15 -04:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Alex Marin
3fa180b228 oop: merge master, fix commits 2012-06-27 19:52:37 +03:00
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Chanaka Indrajith
1cc49d32d9 Resolved conflicts 2012-06-27 07:06:34 +05:30
Madhura Jayaratne
c150a4d31c Coding style fixes 2012-06-23 21:48:58 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Thilina Buddika
f999925313 merge upstream 2012-06-22 22:19:56 +05:30
Alex Marin
b0248d0e4d oop: fix transformations bug 2012-06-20 20:44:28 +03:00
Alex Marin
11596ca702 oop: merge master, fix conflicts 2012-06-20 18:35:00 +03:00
Alex Marin
02dbd14fc7 oop: integrate transformations - no errors, but not working. 2012-06-20 16:28:10 +03:00
Madhura Jayaratne
c84ec82994 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-19 21:16:02 +05:30
Thilina Buddika
66a2709334 some formating and correct wrong requre_onece in tbl_replace 2012-06-18 08:37:51 +05:30
Thilina Buddika
563f8628f6 impllemented a function to replace tbl_replace_fileds-inc 2012-06-17 14:43:36 +05:30
Thilina Buddika
c1e3fb7b16 print html using addHTML function in tbl-change 2012-06-17 00:11:10 +05:30
Thilina Buddika
c48e274802 change the code for detecting ajax request 2012-06-16 23:35:25 +05:30
Thilina Buddika
e9aa768ed2 change some functions signatures 2012-06-16 19:14:22 +05:30
Thilina Buddika
da9509dac0 code improvement 2012-06-16 17:46:27 +05:30
Thilina Buddika
fa2bcbc5e6 correct wrong function signature 2012-06-16 10:56:47 +05:30
Thilina Buddika
beb526cefa remove warning messages 2012-06-16 10:28:44 +05:30
Thilina Buddika
7a7a18fd0e remove warning messages 2012-06-16 10:17:51 +05:30
Madhura Jayaratne
15a436de74 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-14 06:18:24 +05:30
Chanaka Indrajith
253de23cf3 Resolved conflicts 2012-06-14 00:52:06 +05:30
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +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
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Madhura Jayaratne
baa0643696 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-10 20:37:22 +05:30
Madhura Jayaratne
0941d2c664 Various coding style improvements 2012-06-10 20:36:20 +05:30
Chanaka Indrajith
0f86dd7152 Renamed display_tbl.lib.php file as DisplayResults.class.php 2012-06-09 19:45:03 +05:30
Thilina Buddika
4bb74c50db fixed table edit bug 2012-06-09 09:56:39 +05:30
Thilina Buddika
51ea088549 merge upstream master 2012-05-23 18:18:16 +05:30
Thilina Buddika
b52448fe34 code improvement in tbl_replace 2012-05-23 18:14:21 +05:30
Thilina Buddika
5fe1b0e3e7 change variable names 2012-05-22 01:08:35 +05:30
Thilina Buddika
019ff12437 bug fixing in tbl_change and new functionn for tbl_replace 2012-05-18 09:03:00 +05:30
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
49a7f12e4e Include CodeMirror globally 2012-04-25 23:47:24 +01:00
Jo Michael
05699a7ac4 Add Codemirror to tbl_replace (SQL box after inserting rows) 2012-04-15 05:40:39 +02:00
Marc Delisle
dd5aae9a67 jQuery UI is already included from common.inc.php 2012-04-09 09:09:07 -04:00
Marc Delisle
ef95bce35b Final removal of grab_globals script 2012-03-27 13:04:46 -04:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Madhura Jayaratne
3b8323d374 Code style improvements 2012-03-03 09:28:42 +05:30
Marc Delisle
87183ee0e1 Remove BLOBstreaming support; will need to run update-po after releasing version 3.5 2012-02-17 09:25:45 -05:00
Madhura Jayaratne
f5ffad3583 Merge branch 'QA_3_4'
Conflicts:
	libraries/tbl_replace_fields.inc.php
2012-01-22 12:10:44 +05:30
Madhura Jayaratne
3c7b233d9c bug #3477063 [edit] Missing set fields and values in generated INSERT query 2012-01-22 11:55:28 +05:30
Marc Delisle
ac95cf21a8 Merge branch 'QA_3_4' 2012-01-21 06:56:25 -05:00
Marc Delisle
346c70d6fd bug #3469254 [edit] Setting data to NULL and drop-downs 2012-01-21 06:56:16 -05:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00