Commit Graph

170 Commits

Author SHA1 Message Date
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
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
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Piotr Przybylski
4a5cb00df5 Fix jQuery UI version number
It's 1.8.16, not 1.8.6
2011-10-11 02:00:45 +02:00
Piotr Przybylski
ac365e0262 Upgrade jQuery UI to 1.8.6 2011-10-10 22:35:36 +02:00
Madhura Jayaratne
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Dieter Adriaenssens
ac088aaee0 use include() instead of require() when including file conditionally 2011-09-23 00:46:58 +02:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Michal Čihař
16b0a64d0b Merge branch 'QA_3_4' 2011-08-17 09:59:53 +02:00
Michal Čihař
5146970826 Escape displayed user input 2011-08-17 09:57:29 +02:00
Michal Čihař
97439c45f0 This is already done 2011-08-17 09:50:42 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS
Conflicts:
	tbl_select.php
2011-08-13 14:12:46 +05:30
Aris Feryanto
351afca2c7 Grid edit: null-related things 2011-07-29 12:48:39 +08:00
Aris Feryanto
e1da98ae85 Grid edit: fix bug - notice line above SQL query now shown correctly 2011-07-29 11:43:00 +08:00
Aris Feryanto
0e55c083a9 Grid edit: update relation and transformation correctly 2011-07-28 16:46:51 +08:00
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
2011-07-24 23:05:35 +05:30
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Madhura Jayaratne
2795a9061c Resolve problems due to merge commit 2011-07-10 22:13:50 +05:30
Madhura Jayaratne
1bc0473fe2 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
Conflicts:
	tbl_replace.php
2011-07-03 21:42:04 +05:30
Piotr Przybylski
a28d43abf3 Updated MySQL function list 2011-07-01 20:37:57 +02:00
Madhura Jayaratne
b8ddd56d78 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-30 10:01:33 +05:30
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Madhura Jayaratne
da6fe46a4d GISFromWKB functions in data insert/edit window fixed. 2011-06-25 21:24:07 +05:30
Madhura Jayaratne
63900d0094 GIS data editor for environments without JavaScript support.
GIS data preserved while editing.
2011-06-25 19:39:31 +05:30
Marc Delisle
131e9caa5f Merge commit '81ebc00206d6aee95900b1c28b0212ee79d3bb25' 2011-06-15 09:09:23 -04:00
Thilanka Kaushalya
09fad13dcb Added the update row count in db structure 2011-06-14 21:51:21 +05:30
Aris Feryanto
3b7f35d5c9 Add makegrid triggering in other files 2011-06-01 12:46:12 +07:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00