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ř
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
Rouslan Placella
75fd7df711 Merge branch 'master' into rte 2011-06-24 13:49:55 +01:00
Rouslan Placella
81adfeab7a CSS fix for the toggle button 2011-06-24 13:40:47 +01:00
Aris Feryanto
cab875f3df Merge branch 'hidecol' into aris 2011-06-24 18:20:31 +08:00
Aris Feryanto
66cb04ead5 Add new feature: show/hide column(s) while browsing a table 2011-06-24 18:18:43 +08:00
Thilanka Kaushalya
6104ef1ba4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-24 14:57:34 +05:30
Thilanka Kaushalya
045499bd75 Ajaxify the multi row export in table 2011-06-24 14:54:46 +05:30
Piotr Przybylski
0e535038a1 Allow to drop database when AllowUserDropDatabase is true 2011-06-23 23:28:04 +02:00
Tyron Madlener
becd7b0d1e tiny fix 2011-06-23 20:41:25 +02:00
Tyron Madlener
3fba1ffea0 Live charting grid v0.1 2011-06-23 20:35:02 +02:00
Tyron Madlener
a08bfa3964 Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-22 20:45:14 +02:00
Rouslan Placella
4f4efd231d Better "event scheduler" functionality 2011-06-22 18:27:32 +01:00
Rouslan Placella
bcedd1c97a Fixed jumpy animation in PMA_slidingMessage() 2011-06-22 12:49:21 +01:00
Tyron Madlener
eb48fc2efb - Fixes race condition in live charting (when the user changes the refresh rate while there is a POST request to get new data the live chart had 2 timeouts running concurrently) 
- Some fixes on l10n as suggested by Michal on the mailing list
 2011-06-22 13:23:26 +02:00
Tyron Madlener
c7cf7574e4 - Status page now displaying server variable Questions instead of the sum of the Com_ statements. 'Questions' is an established performance measure, the sum of the Com_ statements is not 
- Query pie chart displays always at least 7 statement types
- Live charts now use the server time on the x-axis, making them independent of time-zones
 2011-06-22 10:22:22 +02:00
Michal Čihař
a0ee259418 Merge remote-tracking branch 'tyron/master' 
Conflicts:
	server_status.php
 2011-06-22 08:32:48 +02:00
Rouslan Placella
d67f457421 PMA_slidingMessage() must accept invalid input objects. 2011-06-21 21:51:49 +01:00
Rouslan Placella
180f0882df undefined is a keyword, not a string 2011-06-21 19:43:45 +01:00
Rouslan Placella
1e61f723b8 Merge branch 'rte_bugfix' 2011-06-21 19:42:17 +01:00
Rouslan Placella
70656e2b6a Made the 'object' parameter for PMA_slidingMessage() optional 2011-06-21 19:29:48 +01:00
Rouslan Placella
84d62e1fd8 Fixed incorrect queuing of objects in PMA_slidingMessage() 2011-06-21 18:46:41 +01:00
Marc Delisle
0add8b61f8 This typo gives an error in IE 8 2011-06-21 12:49:14 -04:00
Tyron Madlener
3e4744df45 - Removes horizontal row hover js code, as this is already working with the CSS :hover alone 
- Working checkbox selection for vertical display mode
 2011-06-21 15:05:21 +02:00
Marc Delisle
723e51dfdb Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f' 2011-06-21 08:13:41 -04:00
Aris Feryanto
238ceb8f98 Merge branch 'colresize' into aris 2011-06-21 12:37:55 +07:00
Aris Feryanto
24a257ffce Column reordering: add checking for different server 2011-06-21 12:25:31 +07:00
Madhura Jayaratne
b261436a03 Merge remote branch 'remotes/madhura/master' 
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
 2011-06-21 07:33:40 +05:30
Ammar Yasir
eaea003064 Added some features 
-> Limit on max number of rows retreived(500)
 -> An instruction link regarding how to use
 -> Resize plot by dragging it by the bottom right corner
 -> Two additional search criteria
 2011-06-21 05:04:00 +05:30
Ammar Yasir
fb8a4956a8 Merge remote branch 'phpmyadmin/master' 2011-06-21 04:35:24 +05:30
Marc Delisle
cf3930d29f Complete the code change for form renaming (rowsDeleteForm to resultsForm) 2011-06-20 16:25:11 -04:00
Tyron Madlener
70e52953c1 - Awesome: Set the graph background to transparent - now you can embedd you exported graphs everywhere \o/ 
- Some better formatting for tbl_chart.js
 2011-06-20 21:31:50 +02:00
Tyron Madlener
e7f2afe8ce - Label for live chart refresh rate list 
- Better alignment for query pie chart
- some variable escaping for variable editing
 2011-06-20 21:15:23 +02:00
Rouslan Placella
61329e5c87 Merge branch 'master' into rte 2011-06-20 18:26:50 +01:00
Marc Delisle
3cb56a2b9e Merge commit 'c450d876a6ed77cf52709db1a4b29ed8b1a97a29' 2011-06-20 08:04:45 -04:00
Rouslan Placella
ae55e9b8f8 Removed unnecessary AJAX messages from the routines functionalities. 2011-06-20 11:40:23 +01:00
Michal Čihař
aa83986a29 Merge remote-tracking branch 'tyron/master' 2011-06-20 11:50:06 +02:00
Thilanka Kaushalya
c450d876a6 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-19 23:23:29 +05:30
Thilanka Kaushalya
bdea8c332b Added ajax dialog for change in vertical rows 2011-06-19 23:23:10 +05:30
Marc Delisle
1be932c707 Merge commit 'e34e0e1f860b951c591bb08908c18838d512b69b' 2011-06-19 08:09:12 -04:00
Marc Delisle
29bb225b92 Must use .prop() instead of .attr() here 2011-06-19 07:55:02 -04:00
Thilanka Kaushalya
59dfaee0d7 Added the update resultsForm when there in single pageination 2011-06-19 11:30:43 +05:30
Thilanka Kaushalya
0f1a038b2d Fixed the bugs at table multi row change option 2011-06-19 10:42:43 +05:30
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
Aris Feryanto
e34e0e1f86 Fix bug: (1) Disable column reordering for EXPLAIN and SHOW syntax, (2) Show mark tooltip only when column is markable 2011-06-18 21:19:33 +07:00
Rouslan Placella
be0f02abf5 Merge branch 'QA_3_4' 2011-06-17 21:10:47 +01:00
Rouslan Placella
ada8916b98 bug #3319466 [edit] Inline query edit does not escape special characters 2011-06-17 21:10:00 +01:00
Tyron Madlener
5c44a40248 Bugfixes, Adjustments and Server variable editing 2011-06-17 19:04:00 +02:00
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Rouslan Placella
6ba8170aab Validation for fields that can be too long in routine ditor. 2011-06-17 15:08:13 +01:00
Rouslan Placella
a5a4312825 Submit Routines dialogs forms when the enter key is pressed. 2011-06-17 14:40:18 +01:00
Rouslan Placella
9b77820b7d Focus on a relevant input element after opening a dialog (routines functionality). 2011-06-17 14:03:26 +01:00
Madhura Jayaratne
ef17d6e9f6 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-17 18:17:14 +05:30
Madhura Jayaratne
f10bf59a8d Change cursor when dragging 2011-06-17 18:09:39 +05:30
Marc Delisle
edf3e1ad32 Should use kibibytes here, see http://en.wikipedia.org/wiki/Kibibyte 2011-06-17 08:16:13 -04:00
Rouslan Placella
c0ceb2d75c Added more animations to routine functionalities 2011-06-17 13:16:05 +01:00
Rouslan Placella
f8c3da7885 Introduced JavaScript function PMA_slidingMessage() 2011-06-17 13:15:34 +01:00
Madhura Jayaratne
56d60fd8a5 Added OpenLayers library 2011-06-17 17:23:28 +05:30
Michal Čihař
75f916fd3c Merge remote-tracking branch 'tyron/master' 
Conflicts:
	server_status.php
 2011-06-17 09:11:36 +02:00
Madhura Jayaratne
d466571b9c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-17 07:33:44 +05:30
Rouslan Placella
d90bad9a8b Patch #3316969 PMA_ajaxShowMessage() does not respect timeout 2011-06-16 16:15:12 -04:00
Ammar Yasir
1653fd340c Plot functionality using Hihcharts 2011-06-17 01:31:31 +05:30
Ammar Yasir
9498f5d4cd Merge remote branch 'phpmyadmin/master' 2011-06-17 01:06:38 +05:30
Madhura Jayaratne
4338b70d9f Merge branch 'QA_3_4' 
Conflicts:
	js/sql.js
 2011-06-16 21:23:12 +05:30
Madhura Jayaratne
9d2269d297 bug #3317293 [edit] Inline edit places HTML line breaks in edit area 2011-06-16 21:05:54 +05:30
Tyron Madlener
f771e68a73 - Fix for: If the moseout event on the row highlighting fails to get called (e.g. when having html code in the row), the toggle class will wrongly assign the hover class next time the element is being hovered over 
- Better formatted PMA_createChart()
 2011-06-16 15:05:08 +02:00
Tyron Madlener
ab5d9b278a Cleaned up code 2011-06-16 15:03:04 +02:00
Rouslan Placella
a8f8d3e7a8 Animate the insertion of new routines into the list 2011-06-16 11:44:06 +01:00
Madhura Jayaratne
3792b786d8 JavaScript code moved into .js file 2011-06-16 09:56:02 +05:30
Madhura Jayaratne
3c28961b9f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
 2011-06-16 08:52:31 +05:30
Tyron Madlener
6f4b0f88d2 - Server variables that represent bytes are convert to a byte format (e.g. 16 EiB instead of 18,446,744,073,709,551,616) 
- A javascript code snippet that cuts off long strings (such as the optimizer_switch variable) so the whole table stays in view without scrolling.
 2011-06-15 20:36:58 +02:00
Madhura Jayaratne
0886178859 Merge branch 'QA_3_4' 2011-06-15 20:10:54 +05:30
Madhura Jayaratne
396e4e9979 bug #3315741 [display] Inline query edit broken 2011-06-15 20:06:26 +05:30
Michal Čihař
f79a619326 Merge remote-tracking branch 'tyron/master' 
Conflicts:
	server_status.php
 2011-06-15 15:46:11 +02:00
Marc Delisle
131e9caa5f Merge commit '81ebc00206d6aee95900b1c28b0212ee79d3bb25' 2011-06-15 09:09:23 -04:00
Marc Delisle
0e5c8a9497 Merge commit 'b3faf9cf42c98de53c1722c15208554a81ff62cf' 2011-06-15 08:06:30 -04:00
Tyron Madlener
efc9f6ddc4 Chart export now works with IE8 2011-06-15 13:17:19 +02:00
Thilanka Kaushalya
81ebc00206 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-15 11:36:40 +05:30
Thilanka Kaushalya
161f8977fa Fixed the delay at dialog load in table insert 2011-06-15 11:35:59 +05:30
Madhura Jayaratne
6a2cc63558 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-15 07:06:47 +05:30
Madhura Jayaratne
6c79283e17 New panning arrows and zooming controls to match OSMs. 2011-06-15 07:04:24 +05:30
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
Tyron Madlener
2216824c90 - Newest canvg version from trunk fixing display of hidden elements 
- Some attempts to get png export working for IE8 (needs flashcanvas)
 2011-06-14 20:55:37 +02: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
Thilanka Kaushalya
b18be4eaec Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-14 21:53:12 +05:30
Thilanka Kaushalya
09fad13dcb Added the update row count in db structure 2011-06-14 21:51:21 +05:30
Aris Feryanto
3750dcbb2f Column resizing & reordering: better support without javascript 2011-06-14 22:47:19 +07:00
Rouslan Placella
279ef37298 Warn the user if the definition of a stored function does not contain a return statement. 2011-06-14 15:45:39 +01:00
Rouslan Placella
48681dfd81 Hide the parameter "length" for datatypes that do not support this in the routine editor. 2011-06-14 15:32:44 +01:00
Madhura Jayaratne
db06c5a912 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-14 18:52:52 +05:30
Madhura Jayaratne
9f4c4c91cf Labels for visualizations with OpenStreetMaps. New icon for the 'Visualize GIS data' link. 2011-06-14 18:49:32 +05:30
Rouslan Placella
e2834cd49d Generate the type dropdown for Routine editor in PHP, not JavaScript. 2011-06-14 12:02:10 +01:00
Rouslan Placella
889cce8583 Fixed inconsistent escaping of special characters in Routines functionalities. 2011-06-14 11:38:35 +01:00
Aris Feryanto
770b1c7dd3 Fix: column resizing & reordering under db_search.php (also enable inline edit support) 2011-06-14 11:55:35 +07:00
Aris Feryanto
823decbaf4 Add 'Click to mark' hint 2011-06-14 09:37:51 +07:00
Aris Feryanto
8493052a2f Fix column resizing and reordering compatibility with IE 2011-06-14 08:40:04 +07:00
Tyron Madlener
d26cace15b Traffic charting for traffic tab on status page 2011-06-13 23:36:07 +02:00
Tyron Madlener
f08b7d52ff 3 more bugfixes 2011-06-13 18:00:33 +02:00
Tyron Madlener
5d5285e289 When exporting a chart as png, canvg renders hidden elements. In the case of pie chart it renders overlapping texts. 
This patch fixes this for text and path elements. This bug is also reported to the original canv author.
 2011-06-13 17:59:58 +02:00
Tyron Madlener
9db1342b2a Bug Fixes 2011-06-13 16:45:31 +02:00
Rouslan Placella
8db8527337 Show the sql_query to the user when dropping Routines, Events and triggers and fix classes in the list. 2011-06-13 15:14:31 +01:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Tyron Madlener
16749a0435 2 more points in graphs 2011-06-13 14:56:31 +02:00
Thilanka Kaushalya
2be90c3907 Added update the tablesForm in db insert 2011-06-13 18:11:00 +05:30
Rouslan Placella
17b8f21ccd Fixed bug where new routines were not added to the list of routines, if the list was empty. 2011-06-13 10:31:01 +01:00
Aris Feryanto
4d27d21e80 No reorder column for table with only 1 column 2011-06-13 13:46:18 +07:00
Aris Feryanto
cf64d5282b Remember column order only in 'Browse' tab 2011-06-13 12:08:17 +07:00
Aris Feryanto
c89e0aa2ab Merge hint for column sorting 2011-06-13 11:21:09 +07:00
Aris Feryanto
039d56f975 Better CSS unit 2011-06-13 10:14:08 +07:00
Thilanka Kaushalya
8b2439f4a7 added the buttonYes click actions 2011-06-12 23:02:32 +05:30
Madhura Jayaratne
28a9b971bf Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-12 20:14:31 +05:30
Madhura Jayaratne
5f09cf550f Visualize GIS data with OpenStreetMap as a base layer 2011-06-12 20:04:23 +05:30
Aris Feryanto
78e7565cfd Fix bug in column reordering tooltip 2011-06-12 10:58:15 +07:00
Aris Feryanto
83f7170304 Preloading of column pointer arrow 2011-06-12 10:51:53 +07:00
Aris Feryanto
7c18b8106a Better jQuery animation for column reordering popup balloon 2011-06-12 10:29:15 +07:00
Aris Feryanto
eb7c64dfad Merge remote-tracking branch 'origin/master' into colresize 2011-06-11 10:19:10 +07:00
Aris Feryanto
b81ae2e6cc Add column dragging hint & some css prettifier 2011-06-11 10:17:58 +07:00
Tyron Madlener
d00ea89935 Fix: Reinitialize pie chart when refreshing the query tab 2011-06-10 19:55:05 +02:00
Rouslan Placella
d8da233e0c Merge branch 'master' into rte 2011-06-10 18:46:59 +01:00
Tyron Madlener
da8124e689 Fixed refresh in variables tab 2011-06-10 19:44:33 +02:00
Tyron Madlener
3ce1e7f759 Small improvements 2011-06-10 19:26:29 +02:00
Thilanka Kaushalya
af73dd335d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-10 22:55:31 +05:30
Marc Delisle
54c062c0ad Merge branch 'QA_3_4' 2011-06-10 12:55:02 -04:00
Rouslan Placella
c422694746 Patch #3313326 Some tooltips do not disappear 2011-06-10 12:53:33 -04:00
Thilanka Kaushalya
f2588c536d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-10 22:15:57 +05:30
Rouslan Placella
11e3b20a9e Some small improvements to the AJAX integration of the Routines Editor 2011-06-10 15:26:49 +01:00
Tyron Madlener
2f156ee6ec - SVG Export working 
- Smaller chart markers
 2011-06-10 16:06:51 +02:00
Rouslan Placella
91a4c15796 AJAX integration for routine execution functionality. 2011-06-10 15:01:46 +01:00
Tyron Madlener
2bf553247b Clear timeout once refresh rate has changed and display what the select list is for 2011-06-10 15:35:51 +02:00
Tyron Madlener
bccbff41ae Configurable refresh rate for real-time charts in the status page 2011-06-10 15:17:52 +02:00
Tyron Madlener
b3c9881572 Better realtime chart behaviour when the chart hasn't been filled with data yet 2011-06-10 14:23:46 +02:00
Aris Feryanto
fcf671b382 Use __() for string in 'Restore column order' button, change javascript code style 2011-06-10 17:27:11 +07:00
Thilanka Kaushalya
b53ac0870c Apply ajax behavior to the insert to table option in db structure 2011-06-10 11:06:36 +05:30
Aris Feryanto
07c067a832 Fix for 'Restore column order' 2011-06-10 09:32:39 +07:00
Aris Feryanto
3ba2aa4463 Fix: remove system's drag and drop when dragging table header link 2011-06-10 08:47:47 +07:00
Aris Feryanto
53d7bfa2b1 Change 'Restore table' button to 'Restore column order' 2011-06-10 08:05:37 +07:00
Rouslan Placella
463a49a3ec Some small code improvements for db_routines.js 2011-06-09 21:25:18 +01:00
Rouslan Placella
4baa133671 Comments and coding guidelines fixes for db_routines.js 2011-06-09 21:23:01 +01:00
Rouslan Placella
82847a80b8 JS integration for parameter options in Routines Editor. 2011-06-09 21:08:26 +01:00
Tyron Madlener
659252cd71 pChart is not needed anymore 2011-06-09 20:08:38 +02:00
Tyron Madlener
831da843c1 Fixes of some bugs 2011-06-09 20:08:17 +02:00
Tyron Madlener
dc433429e8 Don't add duplicates to xaxis 2011-06-09 16:06:04 +02:00
Tyron Madlener
21b65e56f4 A currently rather strange series selection to behave similar to the old charting system 2011-06-09 15:36:41 +02:00
Tyron Madlener
c928d53ef8 Fix that single column results work too 2011-06-09 12:33:07 +02: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
Ammar Yasir
763fa66d72 Merge remote branch 'phpmyadmin/master' 2011-06-09 02:54:33 +05:30
Rouslan Placella
3a6a30d5ba Merge brach 'master' into 'rte' 2011-06-08 12:07:43 +01:00
Aris Feryanto
d0e41349ee Add disabled state for 'Restore table' button 2011-06-08 13:58:12 +07: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
Rouslan Placella
a9787c89b9 Improved form validation for the Routines Editor. 2011-06-07 19:55:56 +01:00
Marc Delisle
31bbba5e76 Merge branch 'QA_3_4' 2011-06-07 11:44:31 -04:00
Marc Delisle
2d56821c0f Improved fix for bug #3313210 2011-06-07 11:43:30 -04:00
Marc Delisle
b5e733a2e3 Merge branch 'QA_3_4' 2011-06-07 11:10:18 -04:00
Marc Delisle
82ac1e8028 bug #3313210 [interface] Columns class sometimes changed for nothing 2011-06-07 11:06:38 -04:00
Tyron Madlener
f47ce5dde3 Fixed refreshrate 2011-06-07 14:56:34 +02:00
Tyron Madlener
855532ea2e replace pChart with highchart for the query statistics 2011-06-07 14:54:51 +02:00
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Marc Delisle
ce65b14ced Change redundant message 2011-06-07 06:29:32 -04:00
Aris Feryanto
5ed509bd89 Fix column resize bug: wrong resize when RepeatCells work 2011-06-07 12:51:22 +07:00
Aris Feryanto
d64685c25a Add column reordering compatibility with RepeatCells configuration 2011-06-07 12:32:24 +07:00
Rouslan Placella
0189a62776 Merge branch 'master' into rte 2011-06-06 17:18:35 +01:00
Piotr Przybylski
db07b65c65 Add missing 'server' argument to PMA_reloadRecentTable 
Was causing token regeneration on non-default servers, if the next action required valid token it would fail
 2011-06-06 16:40:43 +02:00
Tyron Madlener
ed40e7f7bb Small changes/fixes 2011-06-06 15:46:01 +02:00
Tyron Madlener
775beaca22 More secure chart export 2011-06-06 15:26:06 +02:00
Michal Čihař
d147fd26db Update keywords to list from http://dev.mysql.com/doc/refman/5.5/en/reserved-words.html 2011-06-06 15:01:50 +02:00
Rouslan Placella
870ab261ae Consistent font size for the Export feature of Routines, Triggers and Events. 2011-06-06 13:55:56 +01:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Tyron Madlener
9abc87d3a5 Connection / Process charting on the server traffic tab 2011-06-06 13:50:17 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Rouslan Placella
493e573f52 Integrated the Routine Editor with CodeMirror. 2011-06-06 12:40:54 +01:00
Tyron Madlener
fe9844cb13 Small code improvements 2011-06-06 13:16:35 +02:00
Rouslan Placella
6f7b52627b Attached syntax highlited editor to Routine, Trigger and Event export dialogs. 2011-06-06 11:10:50 +01:00
Rouslan Placella
c830bdd857 Moved Routine Editor validation into a function. 2011-06-06 10:52:15 +01:00
Rouslan Placella
8f670c6ae2 Better placement for the submit button in the Routine Editor. 2011-06-06 10:50:40 +01:00
Rouslan Placella
bab400e1d0 Made Routine Editor dialog modal. 2011-06-06 10:25:55 +01:00
Aris Feryanto
e16b77c0a5 Add different column pointer for vertical display 2011-06-06 16:03:08 +07:00
Aris Feryanto
b0717ff8d5 Inline edit: fix compatibility with custom 'action column' (RowActionLinks) position 2011-06-06 14:54:07 +07:00
Aris Feryanto
86d787267d Fix column resizing and reordering compatibility with custom actions column position 2011-06-06 14:51:22 +07:00
Ammar Yasir
a4fda9e8f9 Merge remote branch 'phpmyadmin/master' 2011-06-06 04:16:55 +05:30
Marc Delisle
1e0cff6161 Merge branch 'QA_3_4' 2011-06-05 06:30:23 -04:00
Jo Michael
7996a36575 patch #3311539 Inline Edit does not escape backslash 2011-06-05 06:29:46 -04:00
Marc Delisle
82823d67fe Merge branch 'QA_3_4' 2011-06-05 06:14:33 -04:00
Marc Delisle
86d3b7e58c bug #3307616 [edit] Inline edit updates multiple duplicate rows 2011-06-05 06:13:11 -04:00
Marc Delisle
a7a2098006 - ChangeLog entry for "AJAX for Add a user in Database privileges 
- Fix whitespace inside function calls
 2011-06-05 05:40:55 -04:00
Thilanka Kaushalya
b9c0f5b01a Modified the indentation of the sever privileges js 2011-06-05 07:57:52 +05:30
Rouslan Placella
35454870e5 Merge branch 'master' into rte 2011-06-04 20:26:11 +01:00
Rouslan Placella
2434f0628c AJAX integration for Routines editor. 2011-06-04 20:20:59 +01:00
Thilanka Kaushalya
ba71acb32e Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-04 23:14:58 +05:30
Thilanka Kaushalya
48f5745492 Fixed the bug at add user in db ckeck privileges 2011-06-04 23:13:39 +05:30
Ammar Yasir
af1f872d81 Merge remote branch 'phpmyadmin/master' 2011-06-04 13:55:18 +05:30
Madhura Jayaratne
7fca97fdde Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-04 01:30:20 +05:30
Madhura Jayaratne
75091e52fd Merge branch 'QA_3_4' 
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.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/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
 2011-06-04 00:36:51 +05:30
Madhura Jayaratne
612f8f3d67 Partial fix for bug #3291306 - Inline edit does not honor bit fields. Works with mysqli extension. 2011-06-04 00:02:11 +05:30
Thilanka Kaushalya
67b67faa71 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-03 22:50:39 +05:30
Thilanka Kaushalya
65c8851e03 Bug fixed on header warning 2011-06-03 22:48:18 +05:30
Madhura Jayaratne
17c222f83e Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
 2011-06-03 15:59:08 +05:30
Tyron Madlener
e551c09604 js error fix when exporting a chart 2011-06-03 12:10:53 +02:00
Aris Feryanto
e1d0b67af6 Fix merge conflict caused by new syntax highlighter 2011-06-03 09:59:35 +07:00
Aris Feryanto
13bcc44628 Fix bug in firefox 4 / ubuntu 11.04, column resize buggy for the second click on the same column 2011-06-03 09:47:25 +07:00
Tyron Madlener
9fdbb850bb Proof of concept for svg->canvas->image export of charts 2011-06-02 22:00:42 +02:00
Rouslan Placella
9bf9726bf9 Merge branch 'master' into rte 2011-06-02 20:10:21 +01:00
Rouslan Placella
7103156e50 Moved some code around to ease merging with master. 2011-06-02 20:09:06 +01:00
Michal Čihař
42e1fc1533 Fix detection whether there is SQL editor to handle 2011-06-02 17:01:17 +02:00
Michal Čihař
745877a6a0 Fix clearing the query box for non table based SQL 2011-06-02 16:20:37 +02:00
Michal Čihař
961f170b51 Whitespace cleanup 2011-06-02 16:09:21 +02:00
Tyron Madlener
207bfd47e3 - Fix: Hide refresh button only for current tab 
- Fix: Tablesorter sorts thousands-seperated values correctly
 2011-06-02 15:22:28 +02:00
Michal Čihař
3cb40926c0 Remove other not needed files 2011-06-02 15:07:57 +02:00
Michal Čihař
796b81ac99 Make field insert buttons work with CodeMirror 2011-06-02 15:01:19 +02:00
Michal Čihař
e1748cdda9 Make SQL buttons work with CodeMirror 2011-06-02 14:59:08 +02:00
Michal Čihař
05f5ee8efe Consistent handling of all SQL butttons 2011-06-02 14:55:11 +02:00
Michal Čihař
e1c3a524bb Docs 2011-06-02 14:54:23 +02:00
Michal Čihař
1a20d4e3a3 Update CodeMirror2 to latest git for configurable scrolling 2011-06-02 14:46:06 +02:00
Michal Čihař
4be1821a8f Remove not needed CodeMirror files 2011-06-02 14:42:59 +02:00
Michal Čihař
896f8debec Handle missing attributes 2011-06-02 14:40:48 +02:00
Michal Čihař
a6b4e3a4b9 Use MySQL mode instead of plsql 2011-06-02 14:37:31 +02:00
Michal Čihař
4c84ece64d Initial implementation of MySQL mode in CodeMirror, based on our list of keywords 2011-06-02 14:37:10 +02:00
Michal Čihař
28f97eb3c1 Hook CodeMirror to SQL editor 2011-06-02 14:24:16 +02:00
Michal Čihař
0968f5bb60 Initial import of complete codemirror 2011-06-02 13:40:19 +02:00
Rouslan Placella
255d7dcf00 Merge remote-tracking branch 'origin/master' into rte 2011-06-02 11:07:24 +01:00
Michal Čihař
d5f18d4e7f Merge branch 'integration' 
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
 2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Aris Feryanto
dfc7171d6f Fix column reordering's compatibility with IE8. No graying table anymore 2011-06-02 15:00:16 +07:00
Aris Feryanto
2e9b5a08d2 Add column pointer when reordering and some fixes for Original theme 2011-06-02 12:09:58 +07:00
Aris Feryanto
9fbbafdf7c Disable noSelect after drag ended 2011-06-01 23:39:15 +07:00
Tyron Madlener
948b858253 Default refreshrate 3sec => 5sec 2011-06-01 18:34:43 +02:00
Tyron Madlener
349a650357 clear timeouts properly 2011-06-01 18:31:57 +02:00
Thilanka Kaushalya
344f7a57d3 Message undifined bug fixed in add new user to server privileges 2011-06-01 21:41:36 +05:30
Tyron Madlener
3b6e192671 - Don't loose "sortability" when switching between realtime and static data 
- Chart: display 0 as first value
 2011-06-01 18:01:39 +02:00
Tyron Madlener
71cc8fec3d - Query chart: 
- Point tooltip now shows what type of queries have been issued
 - Changed data from 'Seconds per Query' to 'Seconds since last refresh'
 2011-06-01 17:49:27 +02:00
Aris Feryanto
1ab6f82e1d Fix: restrict action column header to be moved 2011-06-01 22:25:29 +07:00
Rouslan Placella
5f9fed0b5c Refactored JS used to drop Routines, Triggers and Events. 2011-06-01 16:11:06 +01:00
Rouslan Placella
80fa502e22 Refactored JS used to export Routines, Triggers and Events. 2011-06-01 15:36:11 +01:00
Madhura Jayaratne
1dcf7fb0f2 For Firefox compatibility. 2011-06-01 19:42:11 +05:30
Aris Feryanto
211d76b012 Added new feature: column reordering. Some fixes in column resizing 2011-06-01 17:59:09 +07:00
Tyron Madlener
f76b91fdb1 Reinitalize tablesorter after refresh 2011-06-01 11:21:45 +02:00
Aris Feryanto
3cf69dfbb8 Some optimization for column resize script 2011-06-01 13:11:53 +07:00
Aris Feryanto
3b7f35d5c9 Add makegrid triggering in other files 2011-06-01 12:46:12 +07:00
Aris Feryanto
d174e8b41c Use of .find for code consistency 2011-06-01 10:39:45 +07:00
Madhura Jayaratne
f873dc11b6 Better handling of zooming 2011-06-01 08:17:15 +05:30
Aris Feryanto
c4c57b86c3 Column resize: fix compatibility with inline edit 2011-06-01 09:25:36 +07:00
Ammar Yasir
70167fed52 Made suggested change to tbl_select.php and tbl_zoom_select.php 2011-06-01 01:22:31 +05:30
Rouslan Placella
9e19d03ed5 Fixed jQuery animation when dropping Routines, Triggers and Events. 2011-05-31 19:21:53 +01:00
Madhura Jayaratne
aa7c7d771d Zoom relative to the cursor position 2011-05-31 23:21:31 +05:30
Thilanka Kaushalya
14b5515d3a Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-05-31 23:16:28 +05:30
Thilanka Kaushalya
b1c12a0b74 Added Ajax behaviour to Add a new user in database privileges 2011-05-31 23:15:24 +05:30
Madhura Jayaratne
df96763525 Removes the second SVG element unnecessarily added. Visualization width set to 600. 2011-05-31 22:41:09 +05:30
Tyron Madlener
8d5850674b Sorting indicators in the column headers 2011-05-31 15:50:50 +02:00
Tyron Madlener
6938866d81 +source version, -minified version 2011-05-31 15:50:03 +02:00
Ammar Yasir
c7cef3b0ba Refactored the tbl_select.php and tbl_zoom_select.php code in libraries/tbl_select.lib.php 
Parts refactored are:
-> Setting titles
-> getting fields list
-> setting sub-tabs
-> setting table header of QBE display
-> displaying foreign data
-> search criteria input elements
 2011-05-31 19:02:50 +05:30
Ammar Yasir
e794690417 Merge remote branch 'phpmyadmin/master' 2011-05-31 18:59:28 +05:30
Tyron Madlener
cbaecced9f Replaced minified highchart files with source files 2011-05-31 12:14:14 +02:00
Tyron Madlener
d1d495fdda Highcarts (unminivied) source files 2011-05-31 12:03:17 +02:00
Rouslan Placella
77c8f4c624 Merge remote-tracking branch 'origin' into rte 2011-05-31 10:58:55 +01:00
Aris Feryanto
f4b47d4cf0 Support column resizing for vertical display mode 2011-05-31 10:50:56 +07:00
Aris Feryanto
566851d210 Add trigger to remake the resizable column when an ajax request is done 2011-05-31 09:46:25 +07:00
Aris Feryanto
25ae3e2387 Add checking to first column (actions) span for resizing column 2011-05-31 09:23:37 +07:00
Tyron Madlener
3d62f95c89 Revert "timepicker.js is redundant, its already in the jquery ui js file" 
This reverts commit a0302c666c.
 2011-05-30 22:57:08 +02:00
Tyron Madlener
b366c76f42 Merge remote-tracking branch 'origin/master' 
Conflicts:
	themes/pmahomme/css/theme_right.css.php
 2011-05-30 22:46:02 +02:00
Tyron Madlener
4885b174da - Implemented more reusable code for realtime charting 
- added 'queries per second' chart in the query statistics tab
- removed test chart
- fixed kill process url
 2011-05-30 22:37:18 +02:00
Madhura Jayaratne
b2e498cbaf Modify GIS data visualization to use SVG 2011-05-31 00:58:53 +05:30
Madhura Jayaratne
c76da35c99 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-31 00:57:56 +05:30
Madhura Jayaratne
abb988ceb5 Add jquery.svg.js, jquery.mousewheel.js jquery.event.drag-2.0.min.js libraries 2011-05-31 00:50:12 +05:30
Madhura Jayaratne
d458379844 Remove flot library 2011-05-31 00:49:45 +05:30
unknown
62cb0f85b0 Don't show 5 second long success message when reloading privs 2011-05-30 12:45:04 -04:00
Tyron Madlener
58da05381c Added realtime charting of processes with the highcart lib for testing 2011-05-30 17:01:09 +02:00
Ammar Yasir
b225436331 Merge remote branch 'phpmyadmin/master' 2011-05-29 12:14:04 +05:30
Marc Delisle
f0fcf7e11f Revert "- add vim modeline" 
This reverts commit 4a4d312edb.

Was not necessary for 3.4 and produces merge conflicts
 2011-05-27 16:13:48 -04:00
unknown
4a788b1505 Small adjustments 2011-05-27 19:34:53 +02:00
unknown
b161f43ec9 Don't show 5 second long success message when reloading privs 2011-05-27 19:25:33 +02:00
Rouslan Placella
5673db8f7a Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-27 17:51:41 +01:00
Rouslan Placella
22c9117c06 Load the Export data for Routines asynchronously. 2011-05-27 14:59:36 +01:00
Ammar Yasir
459b57ca57 Merge remote branch 'phpmyadmin/master' 2011-05-27 17:46:30 +05:30
Thilanka Kaushalya
293a7d6244 Changed the number of columns in the create table dialog in to defalut value 2 2011-05-27 15:55:02 +05:30
Thilanka Kaushalya
948b13f02b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-05-27 15:46:12 +05:30
Aris Feryanto
9ae87854ed Add ability to resize column when browsing tables 2011-05-27 14:05:45 +07:00
Madhura Jayaratne
c7667f535d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-27 01:21:14 +05:30
Rouslan Placella
2f24e5b6b5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-26 20:32:35 +01:00
Marc Delisle
434d233e5b - vim modeline 
- remove tab characters
 2011-05-26 13:16:06 -04:00
Marc Delisle
4a4d312edb - add vim modeline 
- remove tab characters
 2011-05-26 13:07:08 -04:00
Marc Delisle
89e54ceb3a These must now be accessed with .prop() 2011-05-26 13:01:06 -04:00
Ammar Yasir
7396fa3aa9 Designed the zoom-search form(tbl_zoom_select.php) 
-> User selecte exactly two columns.
-> Generates two queries, one for each column criteria.
 2011-05-26 12:22:16 +05:30
Rouslan Placella
be50463835 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-25 21:16:46 +01:00
Madhura Jayaratne
71ac83fa28 New spatial icons. 2011-05-25 23:52:56 +05:30
Madhura Jayaratne
f08f9bce7e On creation or alteration spatial indexes do not allow 1. Multiple columns 2. Specifying prefix 2011-05-25 23:52:28 +05:30
Madhura Jayaratne
76fc463f1c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-25 23:41:04 +05:30
Thilanka Kaushalya
07f553f3f2 Added the PMA_createTableDialog function in functions js file 2011-05-25 23:32:43 +05:30
Thilanka Kaushalya
f0c56fd49a merged chages in navigation.js 2011-05-25 22:29:17 +05:30
Thilanka Kaushalya
42c36b1fb8 Bug fixed the create table option in navigation panel 2011-05-25 21:03:13 +05:30
Aris Feryanto
05d20b31da Recent tables: Additional fix for frame_navigation.PMA_reloadRecentTable() not found 2011-05-25 09:25:32 -04:00
Aris Feryanto
6c938c0f73 Recent tables: Fix for frame_navigation reference not found 2011-05-25 08:15:33 -04:00
Rouslan Placella
0659c39435 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-24 22:33:51 +01:00
Madhura Jayaratne
336b5358ab Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-25 00:51:31 +05:30
tyron
df9bcddd39 re-initialize ajax loaded tooltip 2011-05-24 19:30:42 +02:00
tyron
cd17b9721b Ajax refresh for all tabs now 2011-05-24 18:29:27 +02:00
tyron
573da119a4 Merge remote-tracking branch 'origin/master' 2011-05-24 16:18:01 +02:00
tyron
c3dda3823a Fixed caching bug, added ajax refresh for variables table 2011-05-24 15:58:19 +02:00
tyron
a0302c666c timepicker.js is redundant, its already in the jquery ui js file 2011-05-24 15:56:55 +02:00