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
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
Tyron Madlener
40ccdcb236 Remove duplicate intialization 2011-07-19 15:04:26 -04:00
Tyron Madlener
97b1375605 Remove duplicate intialization 2011-07-19 21:44:53 +03:00
Thilanka Kaushalya
7c3dfb454c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-19 23:00:12 +05:30
Thilanka Kaushalya
1c333e0a08 Fixed iid dulplication issue in footnote convertion using classes 2011-07-19 22:59:22 +05:30
Marc Delisle
964664525c Streamline jQuery usage 2011-07-19 12:16:16 -04:00
Marc Delisle
7a40f19f8a Streamline jQuery usage 2011-07-19 12:02:56 -04:00
Michal Čihař
dce30ddee1 Merge branch 'master' into integration 2011-07-19 14:23:11 +02:00
Michal Čihař
0eb853b250 Delete wrongly merged files 2011-07-19 14:23:04 +02:00
Tyron Madlener
67ec8263db Fixes wrong z-index of timepicker 2011-07-19 12:59:13 +03:00
Piotr Przybylski
08d4e5a5b8 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/htmlword.php
 2011-07-18 22:20:33 +02:00
Tyron Madlener
a4064cd8ab Monitor: Log table filtering and summation 2011-07-18 13:13:40 +03:00
Madhura Jayaratne
0e4435266b Change of classes to avoid conflicts with classes used in tbl_gis_visualization.js 2011-07-18 14:03:21 +05:30
Madhura Jayaratne
2a402a3103 OpenStreetMaps based data visualization for GIS data editor 2011-07-18 13:43:46 +05:30
Madhura Jayaratne
5a6379f93e SVG based data visualization for GIS data editor 2011-07-17 16:59:25 +05:30
Thilanka Kaushalya
2111910a07 Fixed bugs in modified initTooltips function in functions.js file 2011-07-17 07:18:07 +05:30
Thilanka Kaushalya
f2ff3c3dc0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-16 20:42:32 +05:30
Thilanka Kaushalya
4e19ef1cbf MOdified init tooltips function 2011-07-16 20:36:31 +05:30
Madhura Jayaratne
d85c777c78 Chose the correct GIS type 2011-07-16 14:17:17 +05:30
Madhura Jayaratne
1b9ddd2efa These should be PMA_messages[] 2011-07-16 13:23:11 +05:30
Madhura Jayaratne
ba93a625b9 Make JS messages translatable. 2011-07-16 13:14:29 +05:30
Madhura Jayaratne
7af88c04c7 Cleanup spaces 2011-07-16 11:05:53 +05:30
Madhura Jayaratne
ed23518a44 Handle adding polygons and geometry objects 2011-07-16 10:50:22 +05:30
Madhura Jayaratne
ffb970f169 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-16 02:18:41 +05:30
Madhura Jayaratne
83d8d3a8ed Handle adding linestrings and inner rings. Better comments 2011-07-16 02:11:18 +05:30
Madhura Jayaratne
b2d703dbea Add points with JavaScript 2011-07-16 00:29:00 +05:30
Rouslan Placella
10cbf3bd60 Merge branch 'QA_3_4' 2011-07-15 19:31:43 +01:00
Rouslan Placella
9eba5726bd Fixed bug #3363221 - Missing Server Parameter on inline sql query 2011-07-15 19:31:29 +01:00
Madhura Jayaratne
166b571964 Non JS version does not need this parameters. 2011-07-15 23:13:00 +05:30
Rouslan Placella
1a82ae1f11 Merge branch 'QA_3_4' 2011-07-15 16:32:30 +01:00
Rouslan Placella
3ec3c7ee17 Fixed bug #3367993 - Missing "Generate Password" button 2011-07-15 16:32:18 +01:00
Madhura Jayaratne
56090dd46f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-15 18:35:32 +05:30
Madhura Jayaratne
f5bd53fae0 Remove hidden fields not used. 2011-07-15 18:31:15 +05:30
Marc Delisle
87306f1377 Merge commit '2dfd913e2b9ef792224fba5e37306e58a464ba4e' 2011-07-15 08:29:14 -04:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Aris Feryanto
2dfd913e2b Fix bug in qTip when updating content using qTip API in IE 2011-07-15 10:21:42 +07:00
Ammar Yasir
36ec09e6cc Changed 'How to use?' lnk message onClick event function from this.remove() to PMA_ajaxRemoveMessage() 2011-07-15 02:18:29 +05:30
Ammar Yasir
c01e39a716 xAxis type changed to linear (earliear it defaulted to timeseries) 2011-07-15 00:43:41 +05:30
Ammar Yasir
811996e92a Merge remote branch 'phpmyadmin/master' 2011-07-15 00:38:31 +05:30
Madhura Jayaratne
6e7c3adbc1 Trigger AJAX calls on data change and update the output 2011-07-15 00:27:31 +05:30
Madhura Jayaratne
fd0cb076c0 Better styling for GIS data editor. 2011-07-15 00:03:48 +05:30
Tyron Madlener
a5df22ced5 Merge remote-tracking branch 'origin/master' 
Conflicts:
	ChangeLog
	Documentation.html
	db_events.php
	db_routines.php
	db_structure.php
	db_triggers.php
	js/db_structure.js
	js/functions.js
	js/indexes.js
	js/makegrid.js
	js/messages.php
	js/sql.js
	js/tbl_structure.js
	libraries/Table.class.php
	libraries/common.lib.php
	libraries/config.default.php
	libraries/config/messages.inc.php
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
	libraries/database_interface.lib.php
	libraries/db_events.inc.php
	libraries/db_links.inc.php
	libraries/display_tbl.lib.php
	libraries/tbl_links.inc.php
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/br.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
	server_status.php
	tbl_triggers.php
	themes/original/css/theme_right.css.php
	themes/original/jquery/jquery-ui-1.8.override.css
	themes/pmahomme/css/theme_right.css.php
	themes/pmahomme/jquery/jquery-ui-1.8.override.css
 2011-07-14 17:23:35 +03:00
Madhura Jayaratne
c97bb57925 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/madhuracj into OpenGIS 2011-07-14 19:45:16 +05:30
Madhura Jayaratne
b1634f80fd GIS data editor extended for JS enabled browsers 2011-07-14 19:39:39 +05:30
Tyron Madlener
bf23143424 Merge remote-tracking branch 'origin/master' 
Conflicts:
	ChangeLog
	Documentation.html
	db_events.php
	db_routines.php
	db_structure.php
	db_triggers.php
	js/db_structure.js
	js/functions.js
	js/indexes.js
	js/makegrid.js
	js/messages.php
	js/sql.js
	js/tbl_structure.js
	libraries/Table.class.php
	libraries/common.lib.php
	libraries/config.default.php
	libraries/config/messages.inc.php
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
	libraries/database_interface.lib.php
	libraries/db_events.inc.php
	libraries/db_links.inc.php
	libraries/display_tbl.lib.php
	libraries/tbl_links.inc.php
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/br.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
	server_status.php
	tbl_triggers.php
	themes/original/css/theme_right.css.php
	themes/original/jquery/jquery-ui-1.8.override.css
	themes/pmahomme/css/theme_right.css.php
	themes/pmahomme/img/s_sortable.png
	themes/pmahomme/jquery/jquery-ui-1.8.override.css
 2011-07-14 15:56:31 +03:00
Tyron Madlener
da943ecbf7 PMA Icons to sprites part 1 2011-07-14 15:37:08 +03:00
Madhura Jayaratne
1d9ef02608 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-13 23:55:14 +05:30
Aris Feryanto
26e20d8da3 Fixed qTip conflict with column highlighting in horizontal mode 2011-07-14 00:20:17 +07:00
Aris Feryanto
b2e4728fc8 Change showHint function name to updateHint (in file makegrid.js) 2011-07-13 23:59:50 +07:00
Aris Feryanto
b314125759 Hint in browse-mode: Add PMA_createqTip function in 'function.js' file and make qTip style to match previous hint style 2011-07-13 23:56:41 +07:00
Piotr Przybylski
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Tyron Madlener
7c1bebd2ec Fix: Toolbar clickable in edit mode 2011-07-13 16:57:20 +03:00
Tyron Madlener
587ff3ab2b Hide settings popup when clicking rearrange charts 2011-07-13 16:36:50 +03:00
Tyron Madlener
86f24ec280 Chart ordering is now also saved. 2011-07-13 16:29:04 +03:00
Marc Delisle
0131d16548 Merge commit '010f19912460c8e3b925ff7b19f7e2f37361a339' 2011-07-13 09:04:51 -04:00
Tyron Madlener
564150bd52 some fixes 2011-07-13 13:47:55 +03:00
Tyron Madlener
db00fef993 - Monitor: Columns instead of chart width/height 2011-07-13 13:36:03 +03:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25:06 +02:00
Tyron Madlener
a46d881e82 more fixes 2011-07-13 11:22:23 +03:00
Tyron Madlener
39ad135dca sortableTable: Fixed misplaced elements bug 2011-07-13 10:33:47 +03:00
Tyron Madlener
cc279ff982 Some bugfixes for the new sortable table system 2011-07-12 21:39:35 +03:00
Tyron Madlener
a506d25b6d Code cleanup, replaced jquery ui sortable with new sortableTable plugin 2011-07-12 21:07:34 +03:00
Tyron Madlener
1c6a388ca0 Programmed jQuery plugin 'sortableTable'. This allows for way better arrangement of the chart grid on the Monitor tab, once fully supported (use columns as width measure instead of chart width/height). 2011-07-12 21:04:08 +03:00
Rouslan Placella
ff7468b2cf Merge branch 'master' into rte 2011-07-12 14:54:42 +01:00
Madhura Jayaratne
be8ce3d5b6 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-07-12 19:04:47 +05:30
Rouslan Placella
265a5cebc0 Fixed bug introduced in previous commit: new rows always inserted at the bottom of the list. 2011-07-12 14:25:38 +01:00
Madhura Jayaratne
e7135574bd Trim the name before being displayed as the tooltip. 2011-07-12 14:21:48 +05:30
Thilanka Kaushalya
9fad9b9810 Changed variable name according to jquery objects 2011-07-12 06:52:08 +05:30
Ammar Yasir
cdf70921a4 Fixed misfunction of edit mode 2011-07-12 06:51:20 +05:30
Ammar Yasir
d5d9b38af0 Merge remote branch 'phpmyadmin/master' 2011-07-12 06:50:46 +05:30
Tyron Madlener
e2dae437e1 - No CPU,Memory & Swap Charts for DB servers that are not localhost 
- Everything now internationalized (phew, this took a while)
 2011-07-11 20:42:19 +03:00
Piotr Przybylski
b57bc2ff5d Merge remote-tracking branch 'origin/master' into drizzle 2011-07-11 19:41:21 +02:00
Thilanka Kaushalya
215eb80df9 Fixed bugs in table change and table index 2011-07-11 22:58:05 +05:30
Rouslan Placella
eb33912d8d Merge branch 'master' into rte 2011-07-11 12:30:47 +01:00
Aris Feryanto
d5eca34f4f Try to use qtip to display hint in browse-mode 2011-07-11 15:59:27 +08:00
Aris Feryanto
010f199124 Remove vertical support for inline edit 2011-07-11 15:15:24 +08:00
Thilanka Kaushalya
290cf579b2 Added tableCheckEditForm option to the table change 2011-07-11 12:00:40 +05:30
Thilanka Kaushalya
d8b578b6ab Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-11 11:04:00 +05:30
Thilanka Kaushalya
3d7cfa7b97 Fixed bug in check index type in initiation 2011-07-11 11:03:35 +05:30
Aris Feryanto
954d39b305 Merge branch 'hidecol' into aris 2011-07-11 09:52:37 +08:00
Aris Feryanto
ecade8433a Show/hide column: fix bug - use .text instead of .html to handle special column name 2011-07-11 09:52:02 +08:00
Marc Delisle
900f5c3368 Merge commit '673ed34d94b549d0c316ed880c32d644c6a379eb' 2011-07-10 16:09:13 -04:00
Tyron Madlener
68b3152a05 Monitor: Save settings to localStorage v0.1 2011-07-10 19:40:51 +03:00
Madhura Jayaratne
4ae5cb0799 Merge branch 'QA_3_4' 2011-07-10 18:00:46 +05:30
Madhura Jayaratne
58d25ddcb8 Typo 2011-07-10 17:58:35 +05:30
Madhura Jayaratne
a546479680 bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL 2011-07-10 17:55:56 +05:30
Thilanka Kaushalya
673ed34d94 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-10 15:24:09 +05:30
Thilanka Kaushalya
ee2653639a Fixed bugs in enum editor 2011-07-10 15:23:20 +05:30
Ammar Yasir
d90a58d061 Some indentation errors fixed from previous commit 2011-07-10 08:37:15 +05:30
Ammar Yasir
362a57f7e1 Functionality for edit data points added (primitive) 2011-07-10 08:14:00 +05:30
Ammar Yasir
ea171beebe Merge remote branch 'phpmyadmin/master' 2011-07-10 08:13:46 +05:30
Aris Feryanto
991deb415b Fix merge conflict with bug fix for show/hide column feature 2011-07-10 10:07:05 +08:00
Aris Feryanto
7c4e0114e9 Show/hide column: fix bug - clickable area in column visibility checkbox list not span correctly if columns have short names 2011-07-10 10:04:06 +08:00
Aris Feryanto
63c7cee5d9 Merge remote-tracking branch 'origin/master' into hidecol 2011-07-10 09:59:51 +08:00
Piotr Przybylski
1962e36e33 Remove unused getElementsByClassName 2011-07-09 23:39:12 +02:00
Piotr Przybylski
e808b244d7 Remove unused addEvent and removeEvent 2011-07-09 23:38:29 +02:00
Piotr Przybylski
5b1c85455c Simplify fractionReplace 2011-07-09 23:31:58 +02:00
Tyron Madlener
c2fbe0cc25 More usability improvements 2011-07-09 23:15:50 +03:00
Piotr Przybylski
382c020a85 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-09 21:50:23 +02:00
Tyron Madlener
b0e977c835 Monitor: Usability improvements 2011-07-09 21:49:25 +03:00
Tyron Madlener
23a248b980 Now actually does group INSERTs 2011-07-09 19:59:42 +03:00
Tyron Madlener
ab4bf6d737 Monitor Log analyzer: This change should hopefully reduce insert length and group together inserts into same table 2011-07-09 19:01:06 +03:00
Piotr Przybylski
26038eb6b5 Fix page height 
Optimize selector
 2011-07-09 17:59:49 +02:00
Piotr Przybylski
e8a0602f7b Sortable columns in plugin list 2011-07-09 17:33:45 +02:00
Thilanka Kaushalya
0750275cc2 Added single column change option in table structure 2011-07-09 00:14:55 +05:30
Piotr Przybylski
26483ccc19 Better plugin list 2011-07-08 19:46:19 +02:00
Thilanka Kaushalya
8a6fc88a8c Added datapickers in insert form in dialog 2011-07-08 21:57:29 +05:30
Thilanka Kaushalya
f778dfc5af Fixed the variable names in checkIndexName function 2011-07-08 21:09:13 +05:30
Rouslan Placella
612d6a1ff1 Standardized all "name" attributes for input fields of the Routines, Triggers and Events editors 2011-07-08 16:05:46 +01:00
Thilanka Kaushalya
526c72652f Fixed bugs in index edit in table structure 2011-07-08 15:35:28 +05:30
Tyron Madlener
87736c6b6d Monitor Log loading: Better feedback 2011-07-08 11:38:57 +03:00
Thilanka Kaushalya
ddb7769013 Fixed bugs od index edit in table structure 2011-07-08 14:04:57 +05:30
Aris Feryanto
9ec2daa4c6 Remove vertical support for column resizing/reordering 2011-07-08 15:41:09 +08:00
Aris Feryanto
705bdd7356 Merge branch 'hidecol' into aris 2011-07-08 15:22:34 +08:00
Aris Feryanto
dbf06b6a1b Show/hide column: fix bug - hint is still shown when we can't toggle column visibility (i.e., when there is only 1 column available) 2011-07-08 15:22:27 +08:00
Thilanka Kaushalya
499dbe1ae6 Fixed bugs in checkIndexName 2011-07-08 09:27:10 +05:30
Ammar Yasir
c520c098ad On submit of an edit, the data point remains selected in the plot. 2011-07-08 02:34:49 +05:30
Ammar Yasir
12c1471c9b Changed text for 'How to use?' link 9$js_messages['strDisplayHelp']) 2011-07-08 02:26:56 +05:30
Thilanka Kaushalya
ba6e1fc879 Moved checkIndexName function to functions js file and rewrite it using jquery 2011-07-07 23:52:22 +05:30
Tyron Madlener
b1405cd68d Monitor: log selection feature v0.1 2011-07-07 20:28:49 +03:00
Ammar Yasir
57dc8ce4a5 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	libraries/config.default.php
	tbl_select.php
 2011-07-07 21:00:10 +05:30
Ammar Yasir
41715e512a Removed mode feature, appended a missing configuration directive and changed help link duration to 10sec 2011-07-07 20:53:32 +05:30
Tyron Madlener
c9b2f3c69c Small improvements 2011-07-07 13:07:37 +03:00
Thilanka Kaushalya
4dfac4da81 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-06 19:56:58 +05:30
Thilanka Kaushalya
37641b3404 Fixed bugs in index edit 2011-07-06 19:55:57 +05:30
Tyron Madlener
7e9dad57f3 - Monitor instructions dialog allowing you to set some log vars 2011-07-06 15:28:59 +02:00
Rouslan Placella
d1f0b34ab5 Merge branch 'master' into rte 2011-07-06 14:18:36 +01:00
Rouslan Placella
492884984b Comments and whitespace for JS files for Routines, Triggers and Events 2011-07-06 14:06:30 +01:00
Marc Delisle
e9126d2318 Merge commit 'c97ef9d53c554a4e5de6180247ca6d63709db77f' 2011-07-06 08:17:45 -04:00
Aris Feryanto
c97ef9d53c Show/hide column: fix bug - column resizer border's height not updated after toggling column visibility 2011-07-06 09:54:38 +08:00
Tyron Madlener
2ed35f7f70 Upgraded to highcharts v2.1.5 2011-07-05 21:13:49 +02:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Tyron Madlener
b8fbb9d1af Work on the Server Monitor and other things 2011-07-05 17:35:10 +02:00
Rouslan Placella
5d48637abc Added validation for the Events editor 2011-07-05 16:25:08 +01:00
Rouslan Placella
9c11b373fb Added '---' to otherwise empty table cells in the routines editor. 2011-07-05 15:45:43 +01:00
Rouslan Placella
a2751ee65b LINTed the JavaScript for Routines, Triggers and Events. 2011-07-05 14:18:31 +01:00
Rouslan Placella
bc2cd16c4c Moved code common to Routines, Triggers and Events from "functions.js" to "rte/common.js" 2011-07-05 13:19:58 +01:00
Rouslan Placella
357d84e52f Merge branch 'master' into rte 
Conflicts:
	js/db_routines.js
 2011-07-05 13:13:31 +01:00
Rouslan Placella
70c70db139 Fix for bug #3353856 - AJAX dialogs use wrong font-size 2011-07-05 13:03:08 +01:00
Rouslan Placella
e947712358 Do not insert not preserved events from the past into the list of events. Also use same logic for other items. 2011-07-05 12:53:49 +01:00
Rouslan Placella
3b19b53934 Move JS code for Routines, Triggers and Events into a separate folder 2011-07-05 12:40:33 +01:00
Rouslan Placella
5769a2143c Moved more item-specific code out of rte_common.js 2011-07-05 12:28:25 +01:00
Rouslan Placella
15ad6605b1 Set 'maxlength' of input fields in HTML, instead of validating against a maximum length in JS. 2011-07-05 11:38:46 +01:00
Rouslan Placella
55d2358359 Factored out the JS for the editor of Routines, Triggers and Events and moved it into a namespace. 2011-07-05 11:30:22 +01:00
Tyron Madlener
9d71927551 Small improvements/fixes 2011-07-05 09:23:58 +02:00
Ammar Yasir
28b142b5c3 Made some changes 
-> Browse Mode makes the dialog fields disabled
  -> New name for max row to plot directive
  -> Show/Hide search criteria
  -> Link for displaying Help
 2011-07-05 05:22:38 +05:30
Ammar Yasir
03a1a84b78 Test 2011-07-05 05:21:16 +05:30
Ammar Yasir
602a64a1d2 Added the Show/Hide search criteria feature 2011-07-04 21:59:17 +05:30
Ammar Yasir
78f93fdd3c Merge remote branch 'phpmyadmin/master' 2011-07-04 21:58:47 +05:30
Rouslan Placella
1bbb2ea37e Merge branch 'master' into rte 2011-07-04 15:36:27 +01:00
Rouslan Placella
064d399d87 Merge branch 'QA_3_4' 
Conflicts:
	tbl_indexes.php
 2011-07-04 13:03:14 +01:00
Rouslan Placella
2ec0de3a9f Fix for bug #3350790 - JS error in Table->Structure->Index->Edit 2011-07-04 12:51:17 +01:00
Tyron Madlener
cdffaf3115 Small adjustments and linux cpu usage fixed 2011-07-04 11:33:11 +02:00
Marc Delisle
3c0853dc68 Merge commit '61ea5e765db6c9382ef8fba9ab27737664b2d6cc' 2011-07-03 07:29:03 -04:00
Thilanka Kaushalya
311804dd72 Removed the modification for the multi row Export in Table Browse 2011-07-03 10:52:16 +05:30
Thilanka Kaushalya
05519a2bca Changed the link name in show hide indexes 2011-07-02 21:17:37 +05:30
Thilanka Kaushalya
71bb5415d8 Added show hide option for index table in table structure 2011-07-02 15:16:00 +05:30
Thilanka Kaushalya
d33590a544 Resolved conflicts 2011-07-01 23:50:58 +05:30
Thilanka Kaushalya
0cb77d14ba Ajaxify Index edit in table structure 2011-07-01 23:39:23 +05:30
Madhura Jayaratne
9fde1b5b23 Merge branch 'QA_3_4' 2011-07-01 23:00:57 +05:30
Madhura Jayaratne
4d1540cc1c bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 2011-07-01 22:58:35 +05:30
Rouslan Placella
8c13805344 Prototype imlementation of the events editor 2011-07-01 16:46:17 +01:00
Rouslan Placella
58d97f87ee Fix broken trigger links after edit operation 2011-07-01 16:45:03 +01:00
Tyron Madlener
29f73bf0f0 Monitor (abusing demo server for debugging :D): 
- Fix for cached mem, cpu load under linux
- Linux memory and swap are stacked
 2011-07-01 12:52:55 +02:00
Ammar Yasir
2a4c47c0a2 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	tbl_select.php
 2011-07-01 15:34:39 +05:30
Ammar Yasir
543df4c802 Added interface for browsing/editing points 2011-07-01 15:31:56 +05:30
Tyron Madlener
7ff7e3c32d fix for linux cpu usage 2011-07-01 11:24:47 +02:00
Tyron Madlener
31ea2ca2c8 CPU, Memory and SWAP Usage charts for Windows and Linux 2011-07-01 10:55:52 +02:00
Aris Feryanto
61ea5e765d Shift+click: fix bug 'shift+click not working after pressing next, end, etc.' 2011-07-01 16:19:58 +08:00
Rouslan Placella
7ee2c09770 Properly attach datepickers to AJAX dialogs. 2011-06-30 17:16:17 +01:00
Tyron Madlener
cf1c711445 chartGrid: Refreshrate and chart size can be changed now 2011-06-30 17:44:47 +02:00
Rouslan Placella
cf61fb1270 Prototype integration of Triggers editor. 2011-06-30 13:12:26 +01:00
Rouslan Placella
b4b56ed461 Merge branch 'master' into rte 
Conflicts:
	db_routines.php
	libraries/db_events.inc.php
	libraries/rte/rte_routines.lib.php
 2011-06-30 11:42:16 +01:00
Tyron Madlener
3366e1f97b 2 small bugfixes 2011-06-29 21:01:43 +02:00
Tyron Madlener
0d64558f73 - Chartgrid: 
- Buttons for edit/remove chart
  - Charts can be removd now
 2011-06-29 19:11:45 +02:00
Tyron Madlener
3a8764cff3 2 bugfixes for correct alignment in image buttons, bug is reported on the highcharts forums 2011-06-29 19:09:48 +02:00
Tyron Madlener
ed848569df - Print icon inside export menu, saving us from the additional button 
- Custom buttons can now be added
 2011-06-29 19:08:08 +02:00
Aris Feryanto
9ae693eb06 Merge branch 'hidecol' into aris 2011-06-29 10:29:17 +08:00
Aris Feryanto
d6fce49ca0 Show/hide column: fix bug in IE8, checkbox in column visibility list not shown 2011-06-29 10:27:34 +08:00
Aris Feryanto
b140a6091c Disable text selection only for shift-click enabled table 2011-06-29 00:13:54 +08:00
Rouslan Placella
cbafdb9a1f Refactored some routine, trigger and event manipulation code 2011-06-28 17:11:53 +01:00
Aris Feryanto
6665c1a889 Merge branch 'hidecol' into aris 2011-06-28 17:52:31 +08:00
Aris Feryanto
5304f19396 Fix bug when hovering 'More' under 'Structure' tab 2011-06-28 17:51:59 +08:00
Aris Feryanto
b97aeef6b6 Fix bug in shift+click 2011-06-28 10:25:11 +08:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08:00
Aris Feryanto
216b4e80b2 Better shift+click handling 2011-06-28 09:33:09 +08:00
Tyron Madlener
7f9797bc6a Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-27 13:53:55 +02:00
Marc Delisle
1970c357a3 These are jQuery objects 2011-06-27 07:39:47 -04:00
Marc Delisle
f7157a5fc6 Typos 2011-06-27 07:32:14 -04:00
Thilanka Kaushalya
1d9f5cdf73 Fixed bugs in show error message ine multi row change in table structure 2011-06-27 07:24:08 -04:00
Thilanka Kaushalya
610509e384 Fixed bugs in multi column change in table structure 2011-06-27 07:23:52 -04:00
Thilanka Kaushalya
146a8da5e9 Ajaxified the multi column change in table structure 2011-06-27 07:23:25 -04:00
Aris Feryanto
22ff715452 Merge branch 'hidecol' into aris 2011-06-27 12:10:51 +08:00
Aris Feryanto
4932550801 Show/hide column: remove hide button, add column visibility hint, and some prettification 2011-06-27 11:53:57 +08:00
Thilanka Kaushalya
f48271b74b Fixed bugs in show error message ine multi row change in table structure 2011-06-26 23:28:34 +05:30
Thilanka Kaushalya
3345899ca2 Fixed bugs in multi column change in table structure 2011-06-25 21:26:56 +05:30
Tyron Madlener
2c1a5f3ef9 - Live charting grid: Now you can add new charts to the grid 
- Bugfixes
 2011-06-25 17:05:33 +02:00
Thilanka Kaushalya
bc049c6311 Ajaxified the multi column change in table structure 2011-06-25 16:57:54 +05:30
Aris Feryanto
8686c60c8b Merge branch 'hidecol' into aris 2011-06-25 00:58:03 +08:00
Aris Feryanto
d7857edc28 Show/hide column: optimize background image prefetching 2011-06-25 00:57:31 +08:00
Rouslan Placella
dc6be930be Revert "CSS fix for the toggle button" 
This reverts commit 81adfeab7a.
 2011-06-24 13:54:54 +01:00