Commit Graph

50038 Commits

Author SHA1 Message Date
Tyron Madlener
f10a0bd1ca adjusted to PMA_AddJSCode() 2011-08-09 10:36:18 +03:00
Tyron Madlener
82a1f9c033 addded PMA_AddJSCode() to load js code into the page header 2011-08-09 10:35:53 +03:00
Tyron Madlener
0466ac320b fix on dynamic monitor loading 2011-08-08 17:11:22 +03:00
Tyron Madlener
949bd599dc Merge l10n string 2011-08-08 17:01:52 +03:00
Tyron Madlener
d257c39339 Merge remote-tracking branch 'origin/master' 2011-08-08 16:58:35 +03:00
Tyron Madlener
44eac8a5a9 change overwritten by previous merge 2011-08-08 16:38:41 +03:00
Tyron Madlener
ce8b3cbda0 removed trailing commas from arrays 2011-08-08 16:35:33 +03:00
Tyron Madlener
8cdfa37d46 Merge remote-tracking branch 'origin/master'
Conflicts:
	js/functions.js
	js/server_status.js
	js/server_variables.js
	libraries/advisory_rules.txt
	server_status.php
2011-08-08 16:35:10 +03:00
Michal Čihař
f16efa15dd Whitespace cleanup 2011-08-08 15:23:27 +02:00
Michal Čihař
021e811653 Use standard way for passing messages 2011-08-08 15:23:20 +02:00
Tyron Madlener
cf95fbdcb5 server status page using new qtip function 2011-08-08 16:16:53 +03:00
Tyron Madlener
09fdda8131 - Moved style info from PMA_createQtip() into theme_right.css.php
- Adjusted style to look more like the tooltips we had originally
- Removed dHint class
2011-08-08 16:15:35 +03:00
Michal Čihař
662c96494f Fix and simplify theme selection js 2011-08-08 14:33:58 +02:00
Marc Delisle
79df74937c Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-08 08:27:28 -04:00
Marc Delisle
1fa702b45c Coding style 2011-08-08 08:27:10 -04:00
Tyron Madlener
bfdf28e24c Workaround too small value of suhosin.get.max_value_length 2011-08-08 08:25:20 -04:00
Michal Čihař
4d15c3d120 Remove debugging code, adjust coding style 2011-08-08 14:17:10 +02:00
Michal Čihař
b57e186331 Drop another ocurence of inline js 2011-08-08 13:53:41 +02:00
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Michal Čihař
84fda7ff95 Automatic form submission on change. 2011-08-08 13:24:53 +02:00
Tyron Madlener
7e22620ec2 added mysql < 5.5.8 check 2011-08-08 14:13:50 +03:00
Tyron Madlener
666732baf2 - Merged rgbcolor.js into canvg.js
- Status monitor now loads on demand (when tab is clicked)
2011-08-08 14:05:55 +03:00
Michal Čihař
51b54c954c Replace inline javascript 2011-08-08 12:04:23 +02:00
Michal Čihař
44f007a879 Add tests for theme manager 2011-08-08 11:54:23 +02:00
Michal Čihař
3c425a16bc Add test for PMA_List_Database for functions not requiring DB connection 2011-08-08 10:38:54 +02:00
Michal Čihař
56f29962ce Update po files 2011-08-08 10:07:44 +02:00
Pootle server
3499d8f79b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-08 10:06:23 +02:00
Michal Čihař
38d99b4e17 Use PMA_getIcon instead of duplicating logic 2011-08-08 10:05:22 +02:00
Michal Čihař
51dc70d35a Wrap long line 2011-08-08 09:57:47 +02:00
Michal Čihař
f9a713dea1 Use PMA_linkOrButton here as the query can be quite long 2011-08-08 09:56:43 +02:00
Michal Čihař
2f9ca4de99 Merge branch 'edit-view' of git://github.com/csware/phpmyadmin into int 2011-08-08 09:44:19 +02:00
Pootle server
9a04278d17 Merge remote-tracking branch 'origin/master' 2011-08-08 08:40:10 +02:00
shanyan baishui
59faf06b39 Translation update done using Pootle. 2011-08-08 08:33:16 +02:00
Madhura Jayaratne
21c3988cbf Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-08 10:35:05 +05:30
Madhura Jayaratne
7aef3ec756 Merge branch 'QA_3_4' 2011-08-08 10:25:45 +05:30
Madhura Jayaratne
da9d10a3ef Typo 2011-08-08 10:21:54 +05:30
Sven Strickroth
5f2a6ed865 Translation update done using Pootle. 2011-08-07 22:28:04 +02:00
Sven Strickroth
7eb7c00186 Translation update done using Pootle. 2011-08-07 22:26:57 +02:00
Sven Strickroth
25f727f41e Translation update done using Pootle. 2011-08-07 22:26:37 +02:00
Sven Strickroth
0807615885 Translation update done using Pootle. 2011-08-07 22:26:08 +02:00
Sven Strickroth
b46f0f1e20 Translation update done using Pootle. 2011-08-07 22:25:39 +02:00
Pootle server
c00b1e54a1 Merge remote-tracking branch 'origin/master' 2011-08-07 16:40:08 +02:00
Madhura Jayaratne
ff6b491a63 Typo 2011-08-07 18:49:34 +05:30
Madhura Jayaratne
a137097f20 Wrong ChangeLog entry 2011-08-07 18:41:04 +05:30
Madhura Jayaratne
275637daa2 ChangeLog entry for patch #3385954 2011-08-07 18:33:13 +05:30
Sven Strickroth
fcb4986598 there is no create_time-status for views
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-07 18:26:49 +05:30
Sven Strickroth
ed45a8e1f5 use i10n for error message
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2011-08-07 18:26:27 +05:30
Madhura Jayaratne
a11a782cb6 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-07 18:23:22 +05:30
Madhura Jayaratne
969c59e8a6 Merge branch 'QA_3_4'
Conflicts:
	server_status.php
2011-08-07 18:21:34 +05:30
Madhura Jayaratne
7b13b6f864 Documentation about suhosin.get.max_value_length limitation 2011-08-07 18:08:25 +05:30