Commit Graph

359 Commits

Author SHA1 Message Date
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
Eric Krona
3151d41d0e Activated codemirror for inline edits of queries. 2012-02-01 11:47:24 +01:00
Marc Delisle
072162a3f5 rfe #3292013 Dialogs when dropping indices 2012-01-02 08:54:07 -05:00
Marc Delisle
554a55134d Fix merge conflicts 2011-12-28 08:44:04 -05:00
Marc Delisle
f7a9d2a36a bug #3463933 [display] SELECT DISTINCT displays wrong total records found 2011-12-28 08:40:31 -05:00
Marc Delisle
87ecb350c9 bug #3340842 [structure] Error dropping index of non-existing column 2011-12-20 08:33:20 -05:00
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
Michal Čihař
663958b564 Use same logic for printing SQL results as elsewhere 2011-10-24 14:17:02 +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
abe93510a2 Merge branch 'QA_3_4' 2011-09-29 21:17:26 +05:30
Madhura Jayaratne
55d1360b7e To avoid a notice on undefined variable 2011-09-29 21:14:11 +05:30
Madhura Jayaratne
0ad7567d3f Merge branch 'QA_3_4' 2011-09-28 18:20:07 +05:30
Madhura Jayaratne
37dff12901 bug #3390832 [display] Delete records from last page breaks search 2011-09-28 18:17:39 +05:30
Madhura Jayaratne
09d48a6554 Coding style improvements 2011-09-28 13:32:14 +05:30
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
Marc Delisle
87c7d027ac Missing text next to these icons 2011-09-15 12:37:12 -04:00
Madhura Jayaratne
9d83d2fc35 Load jquery.sprintf.js on demand 2011-09-14 10:06:54 +05:30
Madhura Jayaratne
e3bcd9f7cf JS files for gis_data_editor loaded dynamically 2011-09-13 08:31:10 +05:30
Aris Feryanto
036d1a8397 Correctly show error message when unable to save UI property 2011-08-29 15:00:06 +08:00
Michal Čihař
66a2dc25c4 Whitespace cleanup 2011-08-25 08:37:53 +02:00
Michal Čihař
5cfb049561 Include sprintf for gis_data_editor.js 2011-08-25 08:37:45 +02:00
Piotr Przybylski
8cd8760256 Create PMA_is_system_schema() function which checks whether current database server treats it as a system schema 2011-08-23 22:48:14 +02:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
2011-08-17 16:39:43 +02:00
Madhura Jayaratne
d501fc1fe6 Merge branch 'OpenGIS' 2011-08-17 18:02:25 +05:30
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Aris Feryanto
5e60aa8380 Fix merge conflict with origin/master 2011-08-17 13:41:38 +08:00
Aris Feryanto
88f3796f1e Grid edit: add datetimepicker support for date, datetime, and timestamp field 2011-08-17 13:12:31 +08:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS
Conflicts:
	tbl_select.php
2011-08-13 14:12:46 +05:30
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
2011-08-12 22:02:40 +02:00
Thilanka Kaushalya
a3343a7736 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-12 22:52:02 +05:30
Thilanka Kaushalya
6b3f10523e Added table results for actions in Table maintenance in Table options 2011-08-12 22:47:23 +05:30
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Dieter Adriaenssens
45aac8dbf4 coding style 2011-08-11 21:37:36 +02:00
Marc Delisle
a84fd8e151 Merge commit 'e3d069f6536e90dd743fb85b0ee5003efea5d9ca' 2011-08-11 07:57:30 -04:00
Michal Čihař
0829162550 Merge remote-tracking branch 'tyron/master' into integration
Conflicts:
	js/functions.js
2011-08-11 11:25:18 +02:00
Aris Feryanto
ba5598a190 Refactor makegrid.js 2011-08-11 13:35:51 +08:00
Aris Feryanto
e65fc63e71 Incomplete inline edit feature removal 2011-08-10 22:49:23 +08:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Tyron Madlener
e4924833c7 Load flashcanvas.js only for IE version below 9 2011-08-10 10:51:42 +03:00