gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,635 Commits 12 Branches 481 Tags 2.4 GiB
929cb3d63f
Commit Graph

1001 Commits

Author SHA1 Message Date
Rouslan Placella
bcedd1c97a Fixed jumpy animation in PMA_slidingMessage() 2011-06-22 12:49:21 +01: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
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
Marc Delisle
cf3930d29f Complete the code change for form renaming (rowsDeleteForm to resultsForm) 2011-06-20 16:25:11 -04: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
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