Commit Graph

186 Commits

Author SHA1 Message Date
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
2010-08-19 14:45:18 +02:00
Michal Čihař
a590931896 Make mailing lists link translatable as well. 2010-08-19 14:18:53 +02:00
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/config.values.php
2010-07-26 20:24:57 +02:00
Michal Čihař
d291827444 No need to require_once footer
It is the last thing executed anyway (ends with exit).
2010-07-26 16:20:24 +02:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/relation.lib.php
2010-07-24 18:34:52 +02:00
lorilee
98ef84ebc3 New main page design 2010-07-23 20:31:52 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
104ac11c1d import and export for user preferences (currently JSON file only)
add preferences reset
2010-07-08 19:01:09 +02:00
Crack
104b40cb11 rename file 2010-07-08 12:36:09 +02:00
Crack
101bbeefb6 link to user preferences on main page (not working yet) 2010-06-01 14:32:10 +02:00
Marc Delisle
7925c03896 gettext conversion 2010-05-11 13:05:43 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Michal Čihař
a2a0d9bb38 Avoid multiple loading of jQuery. 2010-04-01 17:19:37 +02:00
Marc Delisle
6ff307b546 remove inline js from main.php 2010-03-27 15:01:13 -04:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
783892518c Replace MooRainbow with a jQuery color picker 2010-03-25 13:27:58 -04:00
Dieter Adriaenssens
27a56224ff Merge branch 'QA_3_3'
Conflicts:
	ChangeLog
	tbl_change.php
2010-03-17 22:14:47 +01:00
Dieter Adriaenssens
142b1e2183 Changed link to git repository on main page 2010-03-17 19:52:11 +01:00
Michal Čihař
201d0e892c Load mootools in every page. 2010-01-25 11:49:46 +00:00
Michal Čihař
5b4ce35e69 rfe #2838080 [interface] Show warning when javascript is disabled. 2010-01-21 10:58:11 +00:00
Michal Čihař
78b00824eb [core] Updated mootools to fix some glitches with Safari.
Mootools are now in separate files as distributed upstream.
2010-01-04 15:35:23 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
e9777b1261 bug #2910000 [gui] ShowServerInfo should hide all server info from main page 2009-12-09 17:53:48 +00:00
Michal Čihař
f6e8832f27 [security] warn about existence of config directory on main page 2009-03-25 08:32:33 +00:00
Michal Čihař
50502ea835 Use official names for wiki (wiki.phpmyadmin.net) and demo server (demo.phpmyadmin.net). 2009-03-24 12:56:58 +00:00
Michal Čihař
a2d9d8308c rfe #1731967 Check for relations support on main page. 2009-03-03 13:54:37 +00:00
Michal Čihař
2126e8e3fb rfe #2127987 warn when session.gc_maxlifetime is less than cookie validity 2008-11-30 13:35:23 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
c3c3d86216 bug #2187193 [interface] ShowChgPassword setting not respected 2008-10-22 17:03:22 +00:00
Michal Čihař
85cdc82d4d Cookie auth now autogenerates blowfish_secret, but it has some limitations and you still should set it in config file 2008-09-03 13:27:43 +00:00
Marc Delisle
13ccc773bd Italian update; escape quotes in strCustomColor 2008-08-27 16:49:50 +00:00
Marc Delisle
e2b2ad2f1d handle when ServerDefault is 0 2008-07-20 14:45:58 +00:00
Marc Delisle
15bafa3c33 no custom color picker if JS is not active 2008-07-19 15:15:59 +00:00
Marc Delisle
d0c0771de0 mooRainbow.css only if needed 2008-07-19 07:31:22 +00:00
Marc Delisle
d3687045ae mooRainbow fix for mootools 1.2; Reset buton for custom color 2008-07-15 19:28:27 +00:00
Marc Delisle
2ac75d4591 upgrade to mootools 1.2; temporarily deactivate the color picker that does not work with this mootools version 2008-07-14 19:52:16 +00:00
Marc Delisle
bb2c1fbb8d color picker (work in progress) 2008-07-10 17:53:31 +00:00
Marc Delisle
fe78d240bb b to strong, and remove bold for MySQL charset 2008-07-09 15:24:44 +00:00
Marc Delisle
1f1013b3ce PHP extension 2008-07-09 14:35:37 +00:00
Sebastian Mendel
3483d15075 omit "Actions" if no actions ... 2008-07-09 14:05:13 +00:00
Marc Delisle
c77ab35eb5 more simple titles 2008-07-09 13:23:19 +00:00
Marc Delisle
e33b92a267 remove redundant phpMyAdmin 2008-07-09 13:03:56 +00:00
Sebastian Mendel
c28818ecee tweaked main page layout 2008-07-09 12:40:17 +00:00
Sebastian Mendel
a147613e3a tweaked main page layout 2008-07-09 11:31:32 +00:00
Marc Delisle
42d36c90e6 RFE 1752686, remove "Reload privileges" from home page, it is already on the Privileges page 2008-06-26 16:14:57 +00:00