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

354 Commits

Author SHA1 Message Date
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
Aris Feryanto
96a253bfcc Remove debugging message 2011-05-24 16:51:30 +07:00
Aris Feryanto
c1cd10a14f Only remember sorting in Browse tab, modify the so SQL pretty printer works 2011-05-24 16:41:51 +07:00
Aris Feryanto
07de5495c4 RememberSorting: add some checking before retrieving/remembering sorting 2011-05-24 15:11:39 +07:00
Aris Feryanto
be32b88ec0 Remember table sorting in session variable 2011-05-24 13:49:00 +07:00
Piotr Przybylski
be748a7d84 Case insensitive comparisons to check for I_S, tread D_D as I_S 2011-05-17 00:00:21 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Marc Delisle
b2b1953db1 Start to replace warning level with error level 2011-05-03 18:52:37 -04:00
Madhura Jayaratne
e13f033d95 These are strings. 2011-04-14 07:17:53 +05:30
Madhura Jayaratne
cc05f48f3c Bug #3207730 [AJAX] Inline edit and Relational display column 2011-04-11 10:55:58 +05:30
Marc Delisle
5d147c25af Bug #3281316 Loading message stays on screen for too long 2011-04-10 09:01:31 -04:00
Atul Pratap Singh
6acf4acd25 auto get back to the Table Operations tab 2011-03-28 14:22:36 +02:00
Marc Delisle
bb3f6affea Obey the ShowSQL directive also for inline edit 2011-03-26 07:57:02 -04:00
Madhura Jayaratne
2038266f88 For Bug #3207730 Inline edit and Relational display column 2011-03-23 18:08:35 +05:30
Madhura Jayaratne
abfb718c89 Inline edit extended to fields of type set. 2011-03-01 20:42:51 +05:30
Madhura Jayaratne
aa6fe093d6 Inline edit fine-tuned for enum fields 2011-02-24 08:36:01 +05:30
Madhura Jayaratne
3b8bbf254a Bug #3188108 Inline edit break the hyperlink of foreign keyed value 2011-02-21 18:05:51 +05:30
Madhura Jayaratne
bd8126735f Inline edit fails for foreign keys. 2011-02-18 00:34:19 +05:30
Michal Čihař
054e265cdb Remove useless reference to feature tracker 2011-02-17 17:17:21 +01:00
Michal Čihař
c1398b4ff1 PMA_mysqlDie pulls headers, no need to do it again. 2011-02-17 13:45:58 +01:00
Michal Čihař
439a24c6a2 bug #3183548 [ajax] AJAX response needs HTTP header as well. 
Otherwise we would use default charset from PHP insted of utf-8 we use.
 2011-02-17 10:08:18 +01:00
Michal Čihař
e9bac1dfbb Merge branch 'QA_3_3' 2011-02-11 14:23:54 +01:00
Michal Čihař
a5464b4daf Avoid using all users query as default when browsing. 2011-02-11 14:23:34 +01:00
Michal Čihař
1164c5b7fb Add link to documentation 2011-02-10 10:37:58 +01:00
Michal Čihař
9517f08a96 Make this sentence 2011-02-10 10:33:47 +01:00
Michal Čihař
69c0a887fc bug #3177136 [interface] Indicate that bookmark is being used on browse. 2011-02-10 10:15:07 +01:00
Marc Delisle
5464b54e17 Start implementing conditional Ajax (in results page) 2011-01-22 09:50:12 -05:00
Marc Delisle
c72cc2c8f5 Browse foreign values did not work with inline edit 
Use known message "Browse foreign values" instead of "Search foreign
data"
Use jQuery to attach handler instead of "onclick" for
browse_foreigners.php when called from sql.php
 2010-12-24 07:50:42 -05:00
Michal Čihař
57265808b8 Do not fail if transformations are not enabled for this table, but request asks to enable them. 2010-12-02 17:20:09 +01:00
Michal Čihař
89f03ef81b bug #3123433 [interface] Avoid double escaping of MySQL errors. 
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
 2010-12-02 17:14:59 +01:00
Michal Čihař
219f5a4fb9 Whitespace cleanup. 2010-12-02 17:13:47 +01:00
Marc Delisle
08c0f4e921 undefined variables 2010-10-31 05:51:38 -04:00
Marc Delisle
fe5577568d bug #3072492 Error for wrong SQL disappears 2010-10-08 06:23:27 -04:00
Marc Delisle
e91e87861b make USE work in the context of ajaxification 2010-10-03 07:45:15 -04:00
Marc Delisle
582fe81aa3 notice on undefined variable 2010-09-04 07:55:26 -04:00