gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,844 Commits 12 Branches 481 Tags 2.4 GiB
ce77a26a73
Commit Graph

488 Commits

Author SHA1 Message Date
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
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
Madhura Jayaratne
fa3e058e25 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-08-09 06:16:12 +05:30
Tyron Madlener
8cdfa37d46 Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/server_variables.js
	libraries/advisory_rules.txt
	server_status.php
 2011-08-08 16:35:10 +03:00
Tyron Madlener
666732baf2 - Merged rgbcolor.js into canvg.js 
- Status monitor now loads on demand (when tab is clicked)
 2011-08-08 14:05:55 +03:00
Michal Čihař
38d99b4e17 Use PMA_getIcon instead of duplicating logic 2011-08-08 10:05:22 +02:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
Thilanka Kaushalya
e0d4dd51e6 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-07 16:22:03 +05:30
Thilanka Kaushalya
48a95cb479 Ajaxify table maintenance in table operations 2011-08-07 16:19:14 +05:30
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
 2011-08-04 20:19:43 +02:00
Madhura Jayaratne
d3bd2d5d91 Refractor common code to gis_data_editor.js. Remove hidden input to track null checkbox. 2011-07-31 18:33:02 +05:30
Madhura Jayaratne
6ae969a5ee Serve OpenStreetMap.js locally 2011-07-31 16:10:14 +05:30
Tyron Madlener
01e185831e Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	server_status.php
 2011-07-27 11:18:46 +03:00
Tyron Madlener
bbd1d9f26e Added documentation link to profiling status names 2011-07-26 13:35:35 +03:00
Piotr Przybylski
f2935d56d9 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	server_status.php
 2011-07-25 21:55:16 +02:00
Michal Čihař
f34dfda0fe Merge remote-tracking branch 'tyron/master' 
Conflicts:
	js/functions.js
	js/server_status.js
	js/sql.js
	libraries/common.lib.php
	server_status.php
	themes/pmahomme/css/theme_left.css.php
 2011-07-25 11:32:22 +02:00
Piotr Przybylski
e94e42fb73 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-23 23:33:19 +02:00
Marc Delisle
7e197b695e Fix merge conflicts 2011-07-23 08:25:49 -04:00
Marc Delisle
3534dda30a Fix merge conflicts 2011-07-23 08:16:00 -04:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
36298932e2 Spacing around if 2011-07-22 09:07:57 +02:00
Tyron Madlener
9f343e6ead Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 17:41:06 +03:00
Piotr Przybylski
f36b2e5441 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/db_links.inc.php
	libraries/server_links.inc.php
	tbl_structure.php
	themes/pmahomme/css/theme_right.css.php
 2011-07-21 16:21:16 +02:00
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 15:51:05 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
 2011-07-21 15:25:52 +02:00
Tyron Madlener
c30d209146 Query Analyzer Dialog v0.1 2011-07-21 13:38:51 +03:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Madhura Jayaratne
167d10385d Merge branch 'QA_3_4' 2011-07-21 08:59:35 +05:30
Madhura Jayaratne
58b48a3d45 bug #3367986 [navi] Drop field -> lost active table 2011-07-21 08:55:57 +05:30
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Marc Delisle
f63e1bb42a Local file inclusion vulnerability 2011-07-07 14:50:37 -04:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Aris Feryanto
66cb04ead5 Add new feature: show/hide column(s) while browsing a table 2011-06-24 18:18:43 +08:00
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Rouslan Placella
61329e5c87 Merge branch 'master' into rte 2011-06-20 18:26:50 +01:00
Thilanka Kaushalya
8604ba0303 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-18 22:38:44 +05:30
Thilanka Kaushalya
a8f258cb8d Added ajax dialog for table row change 2011-06-18 22:36:54 +05:30
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Piotr Przybylski
17f8e16141 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_processlist.php
 2011-06-15 15:38:04 +02:00
Aris Feryanto
b3faf9cf42 Merge branch 'tablesort' into aris 2011-06-15 07:23:37 +07:00
Aris Feryanto
ff5e4c8361 Merge branch 'colresize' into aris 2011-06-15 07:23:32 +07:00
Aris Feryanto
d28d7daba1 Fix merge conflict with origin/master 2011-06-15 07:23:06 +07:00
Aris Feryanto
5bf8536831 Fix bug in 'Remember Sorting': modified caused error in PHP 2011-06-15 07:10:16 +07:00
Rouslan Placella
dda7ce9c39 Merge branch 'master' into rte 2011-06-14 19:44:09 +01:00
Aris Feryanto
2d8932b95e Better column order remembering AJAX 2011-06-14 23:38:30 +07:00
Michal Čihař
4b73c39775 Always use long <?php tags 2011-06-14 14:21:48 +02:00
Aris Feryanto
8a87d944a5 Merge branch 'tablesort' into aris 2011-06-14 09:44:10 +07:00
Aris Feryanto
916db6a936 Remember sorting: Fix criteria for browsing, following PMA_isBrowsing 2011-06-14 09:41:32 +07:00
Rouslan Placella
ebfa1dd506 Fixed "Commands out of sync" error when calling a stored routine from sql.php 2011-06-13 18:10:22 +01:00
Tyron Madlener
f08b7d52ff 3 more bugfixes 2011-06-13 18:00:33 +02:00
Aris Feryanto
cf64d5282b Remember column order only in 'Browse' tab 2011-06-13 12:08:17 +07:00
Aris Feryanto
eb7c64dfad Merge remote-tracking branch 'origin/master' into colresize 2011-06-11 10:19:10 +07:00
Aris Feryanto
0b933d2614 Fix more bug: Reordering not work correctly if table structure changed 2011-06-09 14:43:34 +07:00
Tyron Madlener
f4fa0d9f79 - Dynamic chart with for the server status chart 
- Table chart replaced with a Highcharts generated chart that also behaves somewhat more intellegently
 2011-06-09 00:53:32 +02:00
Tyron Madlener
fcb3273c64 -Tabs +Spaces 2011-06-08 01:53:21 +02:00
Tyron Madlener
902fc1d95d - Replaced pChart profiling chart with highchart chart 
- Moved PMA_profilingResults() function code inline in sql.php as its used at only one place
 2011-06-07 21:32:05 +02:00
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Aris Feryanto
e1d0b67af6 Fix merge conflict caused by new syntax highlighter 2011-06-03 09:59:35 +07:00
Aris Feryanto
3b7f35d5c9 Add makegrid triggering in other files 2011-06-01 12:46:12 +07:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Aris Feryanto
9ae87854ed Add ability to resize column when browsing tables 2011-05-27 14:05:45 +07:00
Aris Feryanto
cc7eade6a5 Remember table sorting: Fix for table_ref error 2011-05-25 09:01:07 +07:00