gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,544 Commits 12 Branches 481 Tags 2.4 GiB
98e71f8805
Commit Graph

143 Commits

Author SHA1 Message Date
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
Marc Delisle
b2b1953db1 Start to replace warning level with error level 2011-05-03 18:52:37 -04:00
Marc Delisle
bb3f6affea Obey the ShowSQL directive also for inline edit 2011-03-26 07:57:02 -04:00
Marc Delisle
23f897f34f Bug #3184858 Inline edit not accessible in some cases 2011-02-20 08:41:41 -05:00
Michal Čihař
4a6adc7e29 Do not send html headers for ajax request in this case. 2011-02-17 14:30:44 +01:00
Marc Delisle
45eb47fe14 Merge branch 'QA_3_3' 2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813 Bug #3153409 [core] 0 row(s) affected 2011-01-08 13:44:28 -05:00
Marc Delisle
2d68ee8974 clarify variable name 2010-12-05 07:14:52 -05:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
94b7567ec8 Merge remote branch 'origin/master' 2010-08-03 18:25:19 +05:30
Marc Delisle
148eab9121 must set the LONGBLOB field to NULL to remove a BLOB reference 2010-07-31 07:07:02 -04:00
Barry Leslie
279a8f8f21 The use of PBMS is not dependent on a primary key 2010-07-29 09:58:23 -04:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
ninadsp
4190a5883a Improved handling of relational fields after saving inline edits. Still need to fix the anchor that is being generated, where clause is missing 2010-07-28 02:58:38 +05:30
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
ab2e4e925e correct insertion of BLOB field reference 2010-07-22 14:37:42 -04:00
Marc Delisle
362aa516ac undefined $primary_field 2010-07-22 14:10:58 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
7d11c0aa92 Added ids to some HTML elements on tbl_change.php and modified the 
output of tbl_replace.php for Ajax requests.
 2010-07-10 17:07:37 +05:30
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Marc Delisle
c38f34393f gettext conversion 2010-05-12 12:30:00 -04:00
Michal Čihař
dfa712179b Also this one is used later. 2010-04-22 20:40:47 +02:00
Michal Čihař
ae63490dd9 Can not unset is_insert here, it is used later. 2010-04-22 20:38:43 +02:00
Michal Čihař
c2de4dd8d9 Add full uncompressed version of jquery ui. 2010-04-15 09:34:52 +02:00
Marc Delisle
3ca82375d5 continue removing author names in code 2010-04-05 09:16:36 -04:00
Michal Čihař
a2a0d9bb38 Avoid multiple loading of jQuery. 2010-04-01 17:19:37 +02:00