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

354 Commits

Author SHA1 Message Date
Marc Delisle
0131d16548 Merge commit '010f19912460c8e3b925ff7b19f7e2f37361a339' 2011-07-13 09:04:51 -04:00
Rouslan Placella
ff7468b2cf Merge branch 'master' into rte 2011-07-12 14:54:42 +01: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
010f199124 Remove vertical support for inline edit 2011-07-11 15:15:24 +08:00
Thilanka Kaushalya
f778dfc5af Fixed the variable names in checkIndexName function 2011-07-08 21:09:13 +05:30
Thilanka Kaushalya
499dbe1ae6 Fixed bugs in checkIndexName 2011-07-08 09:27:10 +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
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
1bbb2ea37e Merge branch 'master' into rte 2011-07-04 15:36:27 +01: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
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
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
Thilanka Kaushalya
146a8da5e9 Ajaxified the multi column change in table structure 2011-06-27 07:23:25 -04: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
81adfeab7a CSS fix for the toggle button 2011-06-24 13:40:47 +01: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
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
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
Rouslan Placella
61329e5c87 Merge branch 'master' into rte 2011-06-20 18:26:50 +01: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
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
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
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
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
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
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
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