gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,029 Commits 12 Branches 481 Tags 2.4 GiB
9f8615dfb4
Commit Graph

609 Commits

Author SHA1 Message Date
ayushchd
69b73a44b0 Bug fix #3818 After "Rename table ... to ..." left menu doesn't reflect changes 
The left navigationa and the other places where the old table name was
showing up, now updates if the table is renamed.
 2013-02-25 14:28:27 +05:30
shamika
071e3ad50a Bug Fix:#3813 grid editing utf8 set/enum value-resubmit with correcing errors 2013-02-24 20:45:53 +05:30
shamika
26021f05f8 Bug Fix:#3813 grid editing utf8 set/enum value 2013-02-24 13:02:14 +05:30
Atul Pratap Singh
b9c61c7dc1 Fix bug:3829 Enabling query profiling crashes javascript based navigation 2013-02-22 15:08:14 +05:30
Samith Dassanayake
c4d14774c3 Fixed #3833 Undefined variable: sql_limit_to_append. 
Initialized the varible sql_limit_to_append,
Since isset($x) returns true when $x=''(which is not the expected behaviour of the usage), used the function empty()
 2013-02-20 23:38:53 +05:30
Samith Dassanayake
bc57dfd265 Fixed #3789 Erroneous LIMIT clause in prettyprinted SQL. 
Moved the default sql limit append such that it will only get append, if the limit is not added to the sql query explicitly.
 2013-02-18 00:10:05 +05:30
Rouslan Placella
26c398e165 Disable ajax in sql confirmations 2013-02-08 19:49:50 +00:00
Rouslan Placella
4e297d9770 Fixed PHP error in sql.php 
Also see: 543fc6231a (L0R511)
 2013-02-08 18:34:11 +00:00
Marc Delisle
6da336cd60 Notice about missing non-unique column 2013-02-08 07:49:43 -05:00
Marc Delisle
9b04804201 Fix typo 2013-02-08 07:22:48 -05:00
Michal Čihař
57a97a7057 Use up to date links to bugs and feature requests 2013-02-04 11:52:47 +01:00
Dieter Adriaenssens
049f1a5802 unwrap line 2013-01-25 13:10:05 +01:00
Dieter Adriaenssens
76f871585d remove unused variables 2013-01-25 13:08:49 +01:00
Marc Delisle
431df615f2 Upgraded to jquery-ui-timepicker-addon 1.1.1 2013-01-01 11:50:04 -05:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Rouslan Placella
a64f8220d4 Fixed undefined variable 2012-11-30 13:19:52 +00:00
Rouslan Placella
3bcd9184f5 Fixed undefined index 2012-11-30 13:19:52 +00:00
Chanaka Indrajith
566bba52c3 Modify array keys 2012-11-28 23:40:47 +05:30
Rouslan Placella
543fc6231a Fixed confirmation dialog on sql.php. Bug #3583312 2012-11-27 15:04:30 +00:00
Rouslan Placella
1dd3b5f28d Fixed display of messages after executing queries 2012-11-25 13:59:59 +00:00
Rouslan Placella
fad01a58e5 Fixed responses to requests to create indexes on tbl_structure.php 2012-11-24 19:05:28 +00:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Rouslan Placella
efb83da243 Fixed syntax errors 2012-10-30 20:24:01 +00:00
Rouslan Placella
dc04f8f80a Display the message (with the outcome of the execution of the query) after ajax page requests 2012-10-30 20:24:00 +00:00
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Rouslan Placella
44fc88ded2 Always include the SQL results container so that makegrid can be used 2012-10-30 20:07:02 +00:00
Rouslan Placella
03c904bcf3 Ajaxification for "Bookamrk this SQL query" form 2012-10-30 20:07:02 +00:00
Rouslan Placella
05bf28386e Fixed conflicting variable name 2012-10-30 20:04:51 +00:00
Dieter Adriaenssens
3a3987b245 improve coding style 2012-10-11 17:51:07 +02:00
Marc Delisle
aee2ab3dbd Remove author names 2012-10-08 10:10:07 -04:00
Marc Delisle
996232b21a bug #3563799 [interface] Grid editing destroying huge amount of data 2012-10-08 09:58:23 -04:00
Madhura Jayaratne
e08ba66aa9 clean php javascript mix 2012-09-26 22:05:20 +05:30
Madhura Jayaratne
117962762f Remove html php mix 2012-09-26 21:50:56 +05:30
Madhura Jayaratne
f475ef27d4 Fix doc comment 2012-09-26 21:25:00 +05:30
Madhura Jayaratne
12224e2663 Remove some extraneous new lines 2012-09-26 21:11:59 +05:30
Michal Čihař
aa2477817d Fix typo 2012-09-24 12:26:47 +02:00
Michal Čihař
21f3acf3af Wrap long lines, replace inline html 2012-09-24 09:38:44 +02:00
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Madhura Jayaratne
7e169fcaef Coding style improvements 2012-08-31 01:27:17 +05:30
Madhura Jayaratne
78c36808e5 Fix method names 2012-08-30 23:17:25 +05:30
Dieter Adriaenssens
112f8b92e3 fix coding style : correct function parameter spacing 2012-08-30 17:56:11 +02:00
Dieter Adriaenssens
623de27ef2 use include(_once) in case of conditional including 2012-08-30 17:35:56 +02:00
Dieter Adriaenssens
3bbbe2e6a8 fix coding style : control structures 2012-08-30 17:25:42 +02:00
Michal Čihař
fa6c99e064 Whitespace cleanup 2012-08-28 14:45:51 +02:00
Michal Čihař
729cb2802f Use same message as in multi submits 2012-08-28 14:37:03 +02:00
Chanaka Indrajith
4beb0442ae Clear tranformation information when deleting Columns, VIEWs, Tables and Databses 2012-08-06 06:43:16 +05:30
Chanaka Indrajith
4465c287c1 Fixed an issue related to multiquery statements and routines modifications 2012-07-26 23:06:29 +05:30
Chanaka Indrajith
adcae901e1 Put some limitations for multiple results display mode 2012-07-23 00:13:35 +05:30
Chanaka Indrajith
42bff42aca Support for swap among databases in multiple queries 2012-07-22 18:33:02 +05:30
Chanaka Indrajith
9f1f8d6c75 Support for stored procedures with multiple queries 2012-07-22 16:22:49 +05:30
Chanaka Indrajith
d5acfed0e8 Multiple results support for SQL executions 2012-07-20 23:13:04 +05:30
Chanaka Indrajith
65f24f0e36 Renamed the function processParams() in PMA_DisplayResults class, to setProperties() 2012-07-11 21:09:33 +05:30
Chanaka Indrajith
49c7956a7a Introduce new function to set properties in PMA_DisplayResults class 2012-07-10 19:40:50 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Chanaka Indrajith
35f4599870 Modifications to PMA_printButton() function in common.lib.php and renamed as PMA_getButton()() 2012-06-14 13:15:03 +05:30
Chanaka Indrajith
253de23cf3 Resolved conflicts 2012-06-14 00:52:06 +05:30
Chanaka Indrajith
ba97627d1c Correction sql file and use docblock comment for constructor of PMA_DisplayResults class 2012-06-12 22:53:26 +05:30
Chanaka Indrajith
4e01dd5ae5 Resolved conflict in common.lib.php 2012-06-12 11:34:21 +05:30
Chanaka Indrajith
2aec4150b0 Implement constructor and use global variable instead of variable , which imported from superglobals for functions 2012-06-12 11:22:52 +05:30
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +01:00
Rouslan Placella
971db49c11 Expect JSON for every ajax request in JavaScript 2012-06-11 14:06:05 +01:00
Rouslan Placella
ae6e50a8a8 Drop display() from Header and Footer classes. The Response class will do all the rendering. 2012-06-11 14:06:04 +01:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +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
243727043d Removed the last references to the old header files 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
Rouslan Placella
bf219df66d Merge branch 'QA_3_5' 
Conflicts:
	enum_editor.php
 2012-06-11 14:01:46 +01:00
Rouslan Placella
ddd1eac480 Fixed bug #3534311 - Grid editing incorrectly parses ENUM/SET values 2012-06-11 14:00:18 +01:00
Chanaka Indrajith
0f86dd7152 Renamed display_tbl.lib.php file as DisplayResults.class.php 2012-06-09 19:45:03 +05:30
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