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

1780 Commits

Author SHA1 Message Date
Piotr Przybylski
f578d0dadc Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 19:58:16 +02:00
Sven Strickroth
da677b0615 Fix typo 2011-08-16 19:10:14 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Michal Čihař
3bcfb26027 Merge remote-tracking branch 'tyron/master' 2011-08-16 12:30:24 +02:00
Tyron Madlener
63342fdf4a Hide js feature elements when js is disabled 2011-08-16 13:14:17 +03:00
Tyron Madlener
5bef74287d Run monitor when tab is focused 2011-08-16 13:13:43 +03:00
Piotr Przybylski
3782a6c89b Remove JS function: getElement 2011-08-16 00:34:44 +02:00
Michal Čihař
f552d312b3 Various JS fixes 2011-08-15 17:12:27 +02:00
Michal Čihař
a9b718d2e0 A little bit of coding style 2011-08-15 17:09:44 +02:00
Michal Čihař
bdc3d23292 Expand tabs 2011-08-15 17:08:51 +02:00
Michal Čihař
ba5b79d98b Remove trailing comma to avoid problems with MSIE 2011-08-15 17:05:44 +02:00
Ammar Yasir
ed98d7ead9 Added: Mousewheel zoom and panning feature 2011-08-15 17:18:07 +05:30
Marc Delisle
7546350978 Merge commit '90c010f9ca0dd52ce322c133f84b5321c2f40264' 2011-08-15 07:46:17 -04:00
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
8539600451 Use <strong> rather than <b>, remove it from translatable message 2011-08-15 09:57:08 +02:00
Michal Čihař
e5a15ca519 Translate as separate strings rather than huge string with HTML formatting 2011-08-15 09:55:58 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Michal Čihař
f6c930f002 Revert "Added: Missing rgbcolor.js file" 
This reverts commit 1b7e2f6c7b.
 2011-08-13 06:51:52 +02:00
Thilanka Kaushalya
69c14828ba Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-13 07:01:34 +05:30
Thilanka Kaushalya
90c010f9ca Fixed the issue of not showing the Docuemnts 2011-08-13 07:00:50 +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
Marc Delisle
8f7312956d Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339' 2011-08-12 14:40:56 -04:00
Ammar Yasir
8dd9309fcb Merge remote branch 'phpmyadmin/master' 2011-08-12 23:33:13 +05:30
Ammar Yasir
1b7e2f6c7b Added: Missing rgbcolor.js file 2011-08-12 23:30:21 +05:30
Ammar Yasir
ae5ef42bef Fixed: Timestamp for time associated fields needed extra 19800000 (+5:30) value 2011-08-12 23:15:38 +05:30
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
Ammar Yasir
67dc02f23d Fixed: false timestamp error 2011-08-12 20:06:27 +05:30
Ammar Yasir
557734c57f bug fix 2011-08-12 20:03:03 +05:30
Ammar Yasir
201331275b Fixed: yAxis min value determined on plot generation and not 0 by default 2011-08-12 18:38:53 +05:30
Marc Delisle
70b664a3bd Merge commit '3a672d43b814dbf63276f4631eb0a4fa83a235c5' 2011-08-12 08:01:31 -04:00
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
a24eeef70c Only send column order and visibility when AjaxEnable is set to true 2011-08-12 15:53:30 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Aris Feryanto
faa11abaed Fixed go to link text 2011-08-12 11:56:51 +08:00
Aris Feryanto
8073b74f20 Added hint for grid editing feature when hovering 'Edit' link in each table rows 2011-08-12 11:30:25 +08:00
Ammar Yasir
e3cb99d540 Added better support for datetime fields 2011-08-12 01:39:22 +05:30
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_select.js
 2011-08-12 00:10:17 +05:30
Tyron Madlener
cac3e6aee5 Fix: Error message not displayed 2011-08-11 19:37:04 +03:00
Tyron Madlener
772962d1b6 Fix: NaN values in query cache efficiency chart 2011-08-11 17:58:22 +03:00
Tyron Madlener
a8f2d96baa removed debug logs 2011-08-11 17:50:28 +03:00
Tyron Madlener
d94d681e7d Typo in Swap chart 2011-08-11 17:49:39 +03:00
Tyron Madlener
6bfa452f8d Fix: No "undefined" in add series and edit chart 2011-08-11 17:36:55 +03:00
Tyron Madlener
1120bb597a Fix: Don't show 'reset to default' if there is no config in localstorage 2011-08-11 17:25:13 +03:00
Tyron Madlener
ca94b919ac Fix: don't show incompatible message if theres no localstorage config 2011-08-11 17:20:40 +03:00
Tyron Madlener
df0eca21e3 Merge remote-tracking branch 'origin/master' 2011-08-11 17:11:39 +03:00
Tyron Madlener
bfef230b91 - New feature: Charting over calculated values through presets. Currently available: query cache efficiency and query cache usage 
- Fix sysinfo charts
 2011-08-11 17:10:12 +03:00
Marc Delisle
a84fd8e151 Merge commit 'e3d069f6536e90dd743fb85b0ee5003efea5d9ca' 2011-08-11 07:57:30 -04:00
Michal Čihař
f53800fb02 Merge remote-tracking branch 'tyron/master' 2011-08-11 13:35:37 +02:00
Tyron Madlener
71cb8b410c Run advisor automatically after opening advisor tab 2011-08-11 13:00:18 +03: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
e3d069f653 Add more comments in makegrid.js 2011-08-11 14:08:37 +08:00
Aris Feryanto
ba5598a190 Refactor makegrid.js 2011-08-11 13:35:51 +08:00
Marc Delisle
6756d536f3 Unused message 2011-08-10 10:11:10 -04:00
Marc Delisle
963e909afc Improve message 2011-08-10 10:05:23 -04:00
Aris Feryanto
a9cd487f0f Fix merge conflict with origin/master 2011-08-10 21:27:31 +08:00
Michal Čihař
b2bd74469d Wrap long line 2011-08-10 13:56:11 +02:00
Michal Čihař
92775ef136 Space is not needed here as well 2011-08-10 13:51:05 +02:00
Michal Čihař
c8c9b7501c Use pgettext for Next/Prev as it is needed for some translations (eg. Chinese) 2011-08-10 13:09:31 +02:00
Tyron Madlener
5caaf0ed29 more code cleanup 2011-08-10 13:01:00 +03:00
Michal Čihař
0e53f3bf83 Fix codemirror syntax highlighting 2011-08-10 08:22:17 +02:00
Tyron Madlener
03a76e2c74 Lots of codestyle cleanup + 1 bugfix for query analyzer 2011-08-09 22:51:17 +03:00
Aris Feryanto
0e441d93b2 Fix merge conflict with grid branch 2011-08-09 16:25:48 +08:00
Aris Feryanto
af099deba4 Grid edit: alert user when saving non-unique table 2011-08-09 15:53:58 +08:00
Aris Feryanto
0319a00d92 Fix bug - duplicate ID in some data and text for makegrid.js 2011-08-09 15:33:46 +08:00
Aris Feryanto
124b6793fb Grid edit: nullify lastXHR after post successful 2011-08-09 15:06:27 +08: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
0466ac320b fix on dynamic monitor loading 2011-08-08 17:11:22 +03:00
Tyron Madlener
949bd599dc Merge l10n string 2011-08-08 17:01:52 +03:00
Tyron Madlener
d257c39339 Merge remote-tracking branch 'origin/master' 2011-08-08 16:58:35 +03:00
Michal Čihař
0fc55bb503 Remove debugging code 2011-08-08 15:43:34 +02:00
Tyron Madlener
44eac8a5a9 change overwritten by previous merge 2011-08-08 16:38:41 +03:00
Tyron Madlener
ce8b3cbda0 removed trailing commas from arrays 2011-08-08 16:35:33 +03:00
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
Michal Čihař
f16efa15dd Whitespace cleanup 2011-08-08 15:23:27 +02:00
Michal Čihař
021e811653 Use standard way for passing messages 2011-08-08 15:23:20 +02:00
Tyron Madlener
cf95fbdcb5 server status page using new qtip function 2011-08-08 16:16:53 +03:00
Tyron Madlener
09fdda8131 - Moved style info from PMA_createQtip() into theme_right.css.php 
- Adjusted style to look more like the tooltips we had originally
- Removed dHint class
 2011-08-08 16:15:35 +03:00
Michal Čihař
662c96494f Fix and simplify theme selection js 2011-08-08 14:33:58 +02:00
Michal Čihař
4d15c3d120 Remove debugging code, adjust coding style 2011-08-08 14:17:10 +02:00
Michal Čihař
b57e186331 Drop another ocurence of inline js 2011-08-08 13:53:41 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Michal Čihař
84fda7ff95 Automatic form submission on change. 2011-08-08 13:24:53 +02: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ř
51b54c954c Replace inline javascript 2011-08-08 12:04:23 +02:00
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Aris Feryanto
7a20d6d4df Grid edit: turn off grid edit when AJAXEnable = off 2011-08-08 13:05:56 +08:00
Thilanka Kaushalya
3fdf5dd2ea Changed the logic of truncate table in table operations 2011-08-08 09:24:38 +05:30
Aris Feryanto
7b7f01cd6d Clear selection instead of disabling text selection 2011-08-08 10:28:29 +08:00
Aris Feryanto
a0391ec15a Fix bug - cursor permanently changed to arrow after reordering or resizing column 2011-08-08 10:26:55 +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
Ammar Yasir
33ad955596 Merge remote branch 'phpmyadmin/master' 2011-08-07 10:55:41 +05:30
Piotr Przybylski
0219728929 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-05 22:48:03 +02:00
Piotr Przybylski
23389d2e4f Server Synchronize: make it fully work on servers other than the first one 2011-08-05 22:38:10 +02:00
Aris Feryanto
ce7909e331 use PMA_urldecode 2011-08-06 01:23:33 +08:00
Tyron Madlener
8906aab33f Advisor: Variable names redirect to the variable on the variables page 2011-08-05 18:18:18 +03:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
4afb63d08f Upgrade to jQuery 1.6.2 
This should be compatible with 1.6.1 and my tests show no problems.
 2011-08-05 15:31:38 +02:00
Michal Čihař
f09d12cb4c Remove trailing commas from arrays, MSIE can add extra element in such case 2011-08-05 15:03:24 +02:00
Michal Čihař
eba14cfbca Saner loop declarations, always define start point 2011-08-05 15:00:35 +02:00
Michal Čihař
3cbf056e4b Avoid messing up with keywords 2011-08-05 14:58:08 +02:00
Michal Čihař
cf004d89ca Move PMD scripts to js directory. 
We should have all scripts in single place and this will include them in
compression on release.
 2011-08-05 14:52:47 +02:00
Tyron Madlener
f4afe963b6 Advisor: 
- l10n in php/js code
 - code style improvements
 - ui style improvements
 - syntax/run errors in advisory_rules.txt are now displayed in advisor tab
 2011-08-05 15:50:06 +03:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Michal Čihař
309c44e633 Merge remote-tracking branch 'tyron/master' 
Conflicts:
	js/functions.js
 2011-08-05 13:25:06 +02:00
Tyron Madlener
d368a81cca Chart import config now returned as application/json to prevent possible XSS attacks 2011-08-05 11:35:09 +03:00
Michal Čihař
754a42bcb5 Revert "Collapsible navigation frame: Fix for expand link disappeared after page load" 
This reverts commit b0290ca1bf.

Conflicts:

	js/common.js
	js/functions.js
 2011-08-05 09:41:02 +02:00
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
Michal Čihař
73fb08d3d8 Revert "Feature idea: Collapsible navigation frame" 
This reverts commit 5fb7f9cd17.

Conflicts:

	js/common.js
 2011-08-04 14:41:29 +02:00
Michal Čihař
262cced72f Coding style 2011-08-04 13:59:28 +02:00
Michal Čihař
41bbe32b12 Merge remote-tracking branch 'tyron/master' 
Conflicts:
	js/functions.js
 2011-08-04 13:58:20 +02:00
Aris Feryanto
53fec4ac4d Merge branch 'recent' into aris 2011-08-04 18:27:46 +08:00
Aris Feryanto
376cc353dc Recent table: fix bug - not work for db or table name containing custom characters 2011-08-04 18:27:37 +08:00
Aris Feryanto
0e39df6ca4 add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function 2011-08-04 16:27:47 +08:00
Tyron Madlener
63dd549550 - Status variables, new filter: 'Show unformatted values' 
- Advisory System v0.1
  - A simple rules engine implementation (advisor.lib.php)
  - 51 performance rules based on the mysqltuner 2.0 rules, heavily improved and some newly added (advisory_rules.txt)
  - 'Advisory' Tab displaying the recommendations
 2011-08-04 10:43:57 +03:00
Aris Feryanto
783a2deace Merge branch 'grid' into aris 2011-08-04 11:57:10 +08:00
Aris Feryanto
608f1a1cf0 Grid edit: fix bug - edited relational field not shown correctly when pulling the foreign key list 2011-08-04 11:57:00 +08:00
Madhura Jayaratne
3da9f02130 Merge branch 'master' into OpenGIS 2011-08-03 18:17:57 +05:30
Aris Feryanto
341e18b10f Merge branch 'grid' into aris 2011-08-03 11:59:03 +08:00
Aris Feryanto
28a18c1727 Grid edit: fix bug - not working if AjaxEnable set to false 2011-08-03 11:58:56 +08:00
Ammar Yasir
241caff781 Used AJAX to get data row on point select, hence reducing the amount of data to be sent from server initially for plot. 2011-08-03 09:17:16 +05:30
Ammar Yasir
e4b676e356 Merge remote branch 'phpmyadmin/master' 2011-08-03 09:15:29 +05:30
Aris Feryanto
91d85841fc Grid edit: fix bug - update where_clause precisely (previous version cannot handle space or special characters) 2011-08-03 10:21:41 +08:00
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-08-03 00:25:43 +02:00
Piotr Przybylski
54fbcaa140 Server synchronize: 
* change icons to 16x16
* fix tables layout
* merge 'Source' and 'Target' tables
 2011-08-02 23:30:51 +02:00
Piotr Przybylski
0427378a05 Allow to use noclick class on table level 2011-08-02 23:14:52 +02:00
Madhura Jayaratne
7fe1ce201f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-08-03 00:53:53 +05:30
Thilanka Kaushalya
3f7c35cd69 Fixed bug in refresing the navigation after table operations 2011-08-02 21:39:58 +05:30
Thilanka Kaushalya
5ee97c7787 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-02 21:34:28 +05:30
Thilanka Kaushalya
18310f6b40 Fixed bug in refresing the navigation after table operations 2011-08-02 21:33:47 +05:30
Michal Čihař
8f262140fa Improve coding style 2011-08-02 16:48:57 +02:00
Michal Čihař
b4a0b3f776 Remove tabs, remove dead code 2011-08-02 16:45:00 +02:00
Rouslan Placella
c17add38ed Fixed bug #3374802 - Comment on a column breaks inline editing 2011-08-02 16:15:39 +02:00
Aris Feryanto
5ccd1f9254 Merge branch 'grid' into aris 2011-08-02 17:02:29 +08:00
Tyron Madlener
5ec242bc14 Small improvements: 
- Byte value also for query_cache_limit
- In Status and Server variables, '_' and ' ' can be used interchangably, but only worked for the first occurence
- For analysing queries from slow query log, database name is passed on and selected prior to analyzing the query
- Timespan format also for Uptime
 2011-08-02 11:25:26 +03:00
Aris Feryanto
65bea22f1f Grid edit: fix bug - multi rows edit not work correctly on grid edited rows, if the primary key changed (case if there is a primary key) or some field changed (case if there is no primary key) 2011-08-02 13:07:25 +08:00
Aris Feryanto
5f154503d0 Grid edit: fix bug - (1) update delete confirmation message after grid editing, (2) change wrongly named variable, 'nonunique', copied from inline edit code 2011-08-02 13:02:05 +08:00
Aris Feryanto
8eff621a15 Fix bug - duplicate ID in some data and text for makegrid.js 2011-08-02 10:20:41 +08:00
Madhura Jayaratne
dc82360242 Prepares and insert GIS data to the input field on pressing 'enter' 2011-08-02 00:32:32 +05:30
Aris Feryanto
11e1ead21c Merge remote-tracking branch 'origin/master' into aris 2011-08-01 17:22:44 +08:00
Aris Feryanto
03503c914b Grid edit: fix bug - Clicking on other place while grid edit still loading, make the field become NULL, if it is NULLABLE 2011-08-01 17:21:07 +08:00
Aris Feryanto
080e0b6d00 Grid edit: fix bug - alert not shown when leaving edited page 2011-08-01 17:11:08 +08:00
Madhura Jayaratne
36c55adb9e Disabling causes problems as value is not passed. Use readonly. 2011-08-01 09:36:29 +05:30
Thilanka Kaushalya
66fbb2da26 Fixed the bugs in table copy of table operations 2011-07-31 22:53:02 +05:30
Madhura Jayaratne
7a955d4c66 GIS data editor to insert geometry type parameters 2011-07-31 21:55:21 +05:30
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
Tyron Madlener
b04ca6294a Merge remote-tracking branch 'origin/master' 
Conflicts:
	server_status.php
 2011-07-31 16:00:15 +03:00
Madhura Jayaratne
3efcd0e24b Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/madhuracj into OpenGIS 2011-07-31 16:24:20 +05:30
Madhura Jayaratne
ed5c01dc44 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-31 16:13:26 +05:30
Madhura Jayaratne
5ccc1dec16 Styles adjusted to suit the AJAX dialog 2011-07-31 16:11:16 +05:30
Madhura Jayaratne
516557716a Remove the content when AJAX dialog closes 2011-07-31 16:10:51 +05:30
Madhura Jayaratne
6ae969a5ee Serve OpenStreetMap.js locally 2011-07-31 16:10:14 +05:30
Ammar Yasir
00c420c74b Edit feature with support for string plot. Also made some optimizations to avoid unnecesarry replot 2011-07-31 12:50:24 +05:30
Ammar Yasir
df0848fa9c String plotting: truncated axis labels with length greater than 10. 2011-07-31 12:41:09 +05:30
Ammar Yasir
e83f3acd26 Added to 'How to use' message content, strings are converted into integers for plotting purpose. 2011-07-31 12:35:07 +05:30
Thilanka Kaushalya
6bde6363bb Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-31 12:21:06 +05:30
Thilanka Kaushalya
2784695154 Ajaxify the table coppy option in table operations 2011-07-31 12:20:17 +05:30
Madhura Jayaratne
6c6e43b78a Control selection based on the selected function. 2011-07-31 10:15:10 +05:30
Ammar Yasir
32969f3d42 Merge remote branch 'phpmyadmin/master' 2011-07-31 07:14:01 +05:30
Piotr Przybylski
b57fda5b3d Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 00:46:49 +02:00
Marc Delisle
7180596152 Typo 2011-07-30 14:13:08 -04:00
Madhura Jayaratne
aed7270cb9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-30 22:53:07 +05:30
Madhura Jayaratne
01976f1663 Handle the cases where URL is too long 2011-07-30 22:47:58 +05:30
Marc Delisle
99b68dff9e Better wording 2011-07-30 07:36:14 -04:00
Tyron Madlener
a2b6df6fb7 Merge remote-tracking branch 'origin/master' 2011-07-29 18:18:26 +03:00
Marc Delisle
d29674f9b1 Better wording 2011-07-29 10:06:49 -04:00
Marc Delisle
b2613f3495 Typo 2011-07-29 09:55:39 -04:00
Aris Feryanto
0d19760308 Fix bug in qTip when updating content using qTip API in IE 2011-07-29 18:18:30 +08:00
Aris Feryanto
aab31fec92 Merge branch 'grid' into aris 2011-07-29 18:12:44 +08:00
Aris Feryanto
49a4ee05c9 Merge remote-tracking branch 'origin/master' into aris 2011-07-29 18:12:41 +08:00
Aris Feryanto
4f5d6a59aa Grid edit: fix bug - wrong update on isCellEditActive value 2011-07-29 18:11:33 +08:00
Aris Feryanto
5cf1288f91 Grid edit: 2 fixes - update edited field correctly when SaveCellsAtOnce is false; enable edit field after save AJAX request is complete 2011-07-29 17:59:55 +08:00
Aris Feryanto
c2790e1195 Grid edit: fix disabled state 2011-07-29 17:12:42 +08:00
Aris Feryanto
8ae900a3f8 Grid edit: fix bug - alert everytime leave Browse page 2011-07-29 17:01:16 +08:00
Aris Feryanto
1e2f73c6e9 Fix bug: PMA_urlencode didn't encode space character correctly 2011-07-29 16:14:06 +08:00
Aris Feryanto
ac1703e7ff Grid edit: fix for WHERE clause handling 2011-07-29 16:13:25 +08:00
Tyron Madlener
3224527e0d Avoid js-code injection 2011-07-29 10:11:01 +03:00
Aris Feryanto
926f5950a9 Grid edit: detect nonunique class 2011-07-29 14:43:00 +08:00
Aris Feryanto
8f08c0283d Grid edit: correctly update the WHERE clause 2011-07-29 14:41:28 +08:00
Aris Feryanto
351afca2c7 Grid edit: null-related things 2011-07-29 12:48:39 +08:00
Tyron Madlener
0017203945 Chart Grid importing and exporting feature. 2011-07-28 19:59:17 +03:00
Aris Feryanto
540aef1817 Merge branch 'grid' into aris 2011-07-28 18:17:51 +08:00
Aris Feryanto
d5054f6775 Grid edit: add loading indicator when saving data 2011-07-28 18:17:17 +08:00
Aris Feryanto
f386972299 Merge branch 'grid' into aris 2011-07-28 18:05:48 +08:00
Aris Feryanto
a752c74d59 Grid edit: better AJAX request handling 2011-07-28 18:05:32 +08:00
Aris Feryanto
8d0138cfb6 Grid edit: better modification checking for relation field, when 'Relational display column' is chosen 2011-07-28 17:54:21 +08:00
Aris Feryanto
cf8f188a9e Merge branch 'grid' into aris 2011-07-28 17:46:08 +08:00
Aris Feryanto
d1c219b94e Grid edit: modification checking for TEXT data type 2011-07-28 17:45:59 +08:00
Aris Feryanto
0e55c083a9 Grid edit: update relation and transformation correctly 2011-07-28 16:46:51 +08:00
Aris Feryanto
7d3a3a07db Merge branch 'grid' into aris 2011-07-28 10:18:53 +08:00
Aris Feryanto
a6850dd089 Grid edit: fix bug - is not defined when cfg['SaveCellsAtOnce'] is false 2011-07-28 10:18:45 +08:00
Madhura Jayaratne
003496969e Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-28 06:01:39 +05:30
Piotr Przybylski
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
 2011-07-27 20:10:38 +02:00
Tyron Madlener
29168e1a0a Monitor: Chart title and series names now editable 2011-07-27 17:38:15 +03:00
Thilanka Kaushalya
f89a16ed81 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-27 19:57:08 +05:30
Tyron Madlener
b0290ca1bf Collapsible navigation frame: Fix for expand link disappeared after page load 2011-07-27 13:16:59 +03:00
Tyron Madlener
5fb7f9cd17 Feature idea: Collapsible navigation frame 2011-07-27 12:56:40 +03:00
Aris Feryanto
0d422a3a12 Merge branch 'grid' into aris 2011-07-27 17:49:48 +08:00
Aris Feryanto
685db48a79 Grid edit: fix bug - edited cell not saved when clicking on 'Save edited data' button, while the edit area still shown 2011-07-27 17:49:40 +08:00
Aris Feryanto
ea70863d15 Merge branch 'grid' into aris 2011-07-27 17:43:35 +08:00
Aris Feryanto
92385de0fe Grid edit: one query to save all edited cells at once 2011-07-27 17:43:13 +08:00
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
Aris Feryanto
b81acce4c9 Merge remote-tracking branch 'origin/master' into grid 2011-07-27 10:16:53 +08:00
Aris Feryanto
c3547776a7 Merge remote-tracking branch 'origin/master' into aris 2011-07-27 10:16:26 +08:00
Madhura Jayaratne
b48a250ca8 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-26 21:45:43 +05:30
Tyron Madlener
74ef217ffd Query Analyzer Dialog: 
- Show all explains
- Mark bad explain values as red
 2011-07-26 16:03:17 +03:00
Tyron Madlener
bbd1d9f26e Added documentation link to profiling status names 2011-07-26 13:35:35 +03:00
Aris Feryanto
4b0cd86ea7 Merge branch 'grid' into aris 2011-07-26 18:30:51 +08:00
Aris Feryanto
cb090c7e21 Grid edit: add configuration to save edited cell(s) at once 2011-07-26 18:30:40 +08:00
Tyron Madlener
f740cfb2bc Fixes on Monitor: 
- Removing chart didn't remove div element
- Loading from slow_log never returned any results
- slow_log query_time and lock_time wrongly calculated
- Grouping by ignoring variables, now also sums up all the count columns for slow query log results
- Wrong query profiling information
 2011-07-26 12:36:32 +03:00
Tyron Madlener
baa40842ed Better profiling durations formatting 2011-07-26 12:33:11 +03:00
Michal Čihař
9525cac85c Update CodeMirror to 2.12 2011-07-26 07:21:27 +02:00
Aris Feryanto
03a024f4e3 Grid edit: disable edited element when posting to server 2011-07-26 09:13:23 +08:00
Piotr Przybylski
487da6e7af Use $logAnalyseDialog instead of multiple lookups for $('#logAnalyseDialog') 2011-07-25 22:00:44 +02: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
Tyron Madlener
6d7244eeea - Live charting: Error message on invalid server response 
- Fixed bugged CPU chart not displaying anything
 2011-07-25 22:10:52 +03:00
Thilanka Kaushalya
5bd6aa27ad Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-25 22:24:52 +05:30
Thilanka Kaushalya
1635c5c0bc Ajaxify the Alter table order in Table operations 2011-07-25 22:22:13 +05:30
Ammar Yasir
9388cd35b6 Re:Validations for input form submit (missed addidng messages.php file) 2011-07-25 19:50:02 +05:30
Ammar Yasir
cb63a92b44 Merge remote branch 'phpmyadmin/master' 2011-07-25 19:46:55 +05:30
Ammar Yasir
d9486e2597 Validations for input form submit 2011-07-25 19:45:00 +05:30
Aris Feryanto
6750af6767 Merge branch 'grid' into aris 2011-07-25 18:10:34 +08:00
Aris Feryanto
e1d927efa7 Merge remote-tracking branch 'origin/master' into aris 2011-07-25 18:10:29 +08:00
Aris Feryanto
4c30640024 Grid edit: add truncated support for TEXT data type 2011-07-25 18:09:11 +08: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
Aris Feryanto
5faaa14bd7 Grid edit: fix bug - differentiating NULL and empty string 2011-07-25 17:08:51 +08:00
Aris Feryanto
b25ce5afa9 Grid edit: fix bug - support for SET and ENUM data type 2011-07-25 16:47:59 +08:00
Aris Feryanto
4bfa0b7e5b Grid edit: remove drop down arrow in text input box 2011-07-25 14:52:57 +08:00
Aris Feryanto
37027fdce3 Grid edit: fix for transformed relational field 2011-07-25 14:51:56 +08:00
Aris Feryanto
59cbf2a3f1 Grid edit: handle clicking on a link 2011-07-25 14:38:57 +08:00
Aris Feryanto
c0613bd7e9 Grid edit: remove 'edit mode' 2011-07-25 12:29:05 +08:00
Ammar Yasir
e09759bef8 Added support for ploting strings(char,varchar,enums) 2011-07-25 04:50:47 +05:30
Ammar Yasir
18a6f0b070 Merge remote branch 'phpmyadmin/master' 2011-07-25 04:49:22 +05:30
Marc Delisle
57e0b321f1 Typos 2011-07-24 14:41:46 -04: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
Piotr Przybylski
e94e42fb73 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-23 23:33:19 +02:00
Tyron Madlener
ace73f25bb - Added missing CSS Sprites, Icon sprites now also for PMA_linkOrButton() 
- Rewrote PMA_linkOrButton() to rely on Javascript, making the code way less complicated
- Removed legacy support of Javascript 1.1 or lower
- Fixed a bug in cases where PMA_linkOrButton() creates a form, which when clicked required a js confirm, the confirm is being displayed a second time after the form is submitted.
 2011-07-23 09:23:18 +03:00
Marc Delisle
97055ad6fe Typo 2011-07-22 14:33:28 -04:00
Thilanka Kaushalya
67ad16516b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-22 23:32:28 +05:30
Thilanka Kaushalya
710362f869 Fixed issues in enum editor in table insert column option 2011-07-22 23:31:44 +05:30
Ammar Yasir
6cc3ff46f8 Data point content is now displayed as a dialog box which opens on clicking a point and closes on finishing an edit 2011-07-22 17:53:13 +05:30
Ammar Yasir
bedd413217 Resolved merge conflict 2011-07-22 17:50:09 +05:30
Ammar Yasir
830f2fdaa7 Merge remote tracking branch 'phpmyadmin' 2011-07-22 16:58:52 +05:30
Ammar Yasir
7c66a8bed5 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/highcharts/highcharts.js
 2011-07-22 16:50:30 +05:30
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
Tyron Madlener
9ee8ff38c3 Replaced qtTip js library with non-minified version. 2011-07-22 11:41:13 +03:00
Tyron Madlener
2689428b38 debug logging for linux cpu chart 2011-07-22 11:39:59 +03:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Aris Feryanto
dd638b9bd4 Merge branch 'grid' into aris 2011-07-22 13:28:09 +08:00
Aris Feryanto
8570824beb Grid edit: fix bug - grid edit doesn't take 'server' variable into account 2011-07-22 13:27:36 +08:00
Aris Feryanto
647335cc69 Inline edit: fix bug - inline edit doesn't take 'server' variable into account 2011-07-22 13:27:25 +08:00
Aris Feryanto
225075af94 Grid edit: fix error in javascript, causing grid edit error in IE 2011-07-22 13:05:29 +08:00
Aris Feryanto
756ae599e9 Grid edit: press escape key anywhere to cancel editing 2011-07-22 12:04:47 +08:00
Aris Feryanto
2fd43bafb9 Grid edit: hide edit field when we click outside edit cell 2011-07-22 12:00:53 +08:00
Aris Feryanto
7d729361bb Grid edit: add loading icon when loading and posting data 2011-07-22 11:55:25 +08:00
Aris Feryanto
9c06a33982 Grid edit: fix bug - error when editing foreign values that must be browsed 2011-07-22 11:15:31 +08:00
Aris Feryanto
4d9715e6ca Merge remote-tracking branch 'origin/master' into grid 2011-07-22 09:10:35 +07:00
Thilanka Kaushalya
5288a55b98 Fixed issues of Add Columns 2011-07-22 07:40:14 +05:30
Madhura Jayaratne
47fdfad336 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/gis/pma_gis_geometrycollection.php
 2011-07-22 04:07:09 +05:30
Piotr Przybylski
74a00a110f Drizzle has no usable query log, hide appropriate features in Server Status 2011-07-21 23:23:34 +02:00
Piotr Przybylski
b364cfd211 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-21 22:56:21 +02:00
Thilanka Kaushalya
063b6bd544 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 23:55:31 +05:30
Thilanka Kaushalya
3a2d3e3c4e Ajaxified add columns option in table structure 2011-07-21 23:53:37 +05:30
Tyron Madlener
4925260d95 Call to a renamed function 2011-07-21 13:15:12 -04:00
Tyron Madlener
bf20f06683 Adjusted some places to adjust to current master changes, plus IE8 fix for Status page 2011-07-21 17:46:03 +03: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ř
ba395f545e Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 16:14:47 +02:00
Michal Čihař
5de716446c Fix coding style 2011-07-21 16:10:29 +02:00
Michal Čihař
e9c512fb9f Remove tabs 2011-07-21 16:09:44 +02:00
Michal Čihař
4720ed20fd Whitespace cleanup 2011-07-21 16:05:23 +02:00
Michal Čihař
0f9de30479 Coding style 2011-07-21 16:05:18 +02:00
Marc Delisle
47dd2a0143 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 09:54:28 -04:00
Marc Delisle
33b48269a5 Streamline jQuery usage 2011-07-21 09:54:09 -04:00
Michal Čihař
fd121f211a Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 15:53:04 +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
Marc Delisle
ce3f308741 Typo in variable name 2011-07-21 09:41:49 -04: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
Marc Delisle
810d1a21c8 Typos 2011-07-21 09:24:03 -04:00
Marc Delisle
33627e9533 Merge commit '788fb45a1d6c70d52e8b627023bf01de34a22a4d' 2011-07-21 09:18:44 -04:00
Tyron Madlener
0530016f38 With backgroundColor: 'transparent' Opera and IE draw black background on all charts. 
Using 'none' seems to work well on all major browsers
 2011-07-21 15:45:41 +03:00
Tyron Madlener
a7b9f38c61 Fixes wrong z-index of timepicker 2011-07-21 13:47:00 +02:00
Aris Feryanto
44fcdaf55b Add new feature: grid editing 2011-07-21 18:22:47 +07:00
Tyron Madlener
64d2cb7e5e Removed debug code 2011-07-21 13:43:21 +03:00
Tyron Madlener
c30d209146 Query Analyzer Dialog v0.1 2011-07-21 13:38:51 +03:00
Michal Čihař
97daa89610 Remove double spaces around else 2011-07-21 11:32:52 +02:00
Thilanka Kaushalya
788fb45a1d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 10:01:58 +05:30
Thilanka Kaushalya
d00cf18325 Fixed bugs in convert foot notes to tooltips logic 2011-07-21 10:01:21 +05:30
Madhura Jayaratne
6f35aaa8e4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
 2011-07-20 23:15:01 +05:30
Madhura Jayaratne
47762d7b14 Better organized JS code 2011-07-20 23:07:53 +05:30
Piotr Przybylski
6ab10cdf83 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-20 18:53:14 +02:00
Piotr Przybylski
75bb94f923 Fix strings 2011-07-20 18:52:28 +02:00
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_status.php
 2011-07-20 18:23:21 +02:00
Michal Čihař
fbc2bbdc49 Unlock session while serving JS messages 2011-07-20 15:04:52 +02:00
Madhura Jayaratne
015ad89680 Size of GIS visualization auto adjusted to fit the available space 2011-07-20 15:41:35 +05:30
Tyron Madlener
5022829ae6 Monitor Logs Feature: Grouping of Queries, ignoring variable data in WHERE Statements 2011-07-20 12:08:05 +03:00