352 Commits

Author SHA1 Message Date
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ř
9e2a3f207b Ignore non default themes in git. 2010-08-17 13:38:37 +02:00
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
ninadsp
2ca8e1eea2 Added the loading gif from the themes to the ajax notification 2010-08-06 20:29:09 +05:30
ninadsp
7acb4cb99d Finalised CSS rules for the Ajax notification division. It now centers correctly and handles not very large messages pretty well. 2010-08-04 22:58:05 +05:30
lorilee
75353d1c4a Fixed unwanted spaces in nested lists in IE 2010-08-02 14:14:27 -07:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
2010-08-01 23:19:21 +02:00
lorilee
fb0aa49817 ENUM/SET editor fix for IE 2010-07-30 15:17:27 -07:00
lorilee
9877db1626 Fix for positioning in different browsers plus IE6 bug 2010-07-30 12:30:40 -07:00
Crack
9adc2597c5 short comments for inputs:
- information whether SQL validator is enabled for Validate link
- information about required extensions (SOAP, compression)
- information for constrained values (eg. MaxDbList)
2010-07-30 00:47:20 +02:00
lorilee
f1686d5172 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	libraries/display_export.lib.php
2010-07-29 14:12:36 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Martynas Mickevicius
b0888714b6 Merge commit 'origin/master' into local
Conflicts:
	server_status.php
2010-07-29 14:14:26 +03:00
lorilee
8120a00af7 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-28 15:03:28 -07:00
lorilee
566c7cc9c8 Main page redesign 2010-07-28 15:00:19 -07:00
lorilee
401757e44d Main page redesign 2010-07-28 14:59:52 -07:00
Marc Delisle
2816b870c3 new labels for table operations; fix CSS 2010-07-28 05:44:03 -04:00
Crack
5a3ec082d8 fix user preferences in phpmyadmin.css.php
fix css for LightTabs
fix values in <select> lists
2010-07-27 23:15:23 +02:00
Michal Čihař
442294fa60 [interface] Fixed rendering of error/notice/info titles background. 2010-07-27 09:48:37 +02:00
Michal Čihař
659bd9c838 Add trop/empty links to table operations tab. 2010-07-27 09:39:23 +02:00
lorilee
960f6ef3ff Updated hidden actions dropdown 2010-07-26 15:46:52 -07:00
Crack
5afd385f30 create menu for menu tabs which don't fit in one line
fix tooltip.js error when not in pma frame
2010-07-25 22:10:38 +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
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	libraries/display_export.lib.php
2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
2010-07-23 20:43:35 -07:00
lorilee
98ef84ebc3 New main page design 2010-07-23 20:31:52 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Crack
7ac7e24d8c more styling for disabled options
new "Developer" tab (by default all options are disabled, users can't modify them)
fixed UserprefsDisallow export in setup script
2010-07-22 01:29:36 +02:00
Michal Čihař
95fe228814 Adjust formatting for darkblue theme as well. 2010-07-21 13:46:20 +02:00
Michal Čihař
06cf763358 [interface] Better formatting for SQL validator results. 2010-07-21 13:45:32 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	libraries/display_export.lib.php
2010-07-20 15:23:12 -07:00
lorilee
21ab3539b3 For the hidden table actions 2010-07-20 13:31:24 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
b4dd5771c4 Prevents wrapping in the 'more' cell; reduced horizontal space needed for more actions dropdown 2010-07-19 17:35:32 -07:00
lorilee
ed20d1ebd1 Prevents wrapping in the 'more' cell; reduced horizontal space needed for more actions dropdown 2010-07-19 16:56:38 -07:00
lorilee
554271572d Merge branch 'gsoc' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	themes/darkblue_orange/css/theme_right.css.php
2010-07-16 16:52:49 -07:00
Crack
0b30a339fa css for Darkblue/orange 2010-07-16 11:30:51 +02:00
lorilee
223ed40efa Copying over the new styles from original theme 2010-07-16 00:15:39 -07:00
lorilee
7b46075360 Fixed bug where non-footnote notices were being hidden; footnotes given their own div classes 2010-07-16 00:09:58 -07:00
lorilee
622dcd5eed Copying over new styles from the original theme 2010-07-14 13:10:18 -07:00
lorilee
b63b7552d0 Fixed bug where footnotes don't show up with JavaScript disabled 2010-07-14 12:42:29 -07:00
Crack
7a5fd62810 allow users to easily work with preferences stored in session (when pmadb is disabled): after logging in, user is presented with a message asking whether settings from localStorage should be loaded 2010-07-14 21:28:24 +02:00
lorilee
9badb87f1a Reveal-on-hover table structure actions 2010-07-14 11:55:31 -07:00
lorilee
38434e77fd Improved tooltip for JavaScript-enabled browsers (superscripts changed to icons) 2010-07-13 17:46:22 -07:00
Crack
b3ae73f2aa ui fixes 2010-07-12 19:24:07 +02:00
Crack
625b9edca8 show message when preferences are saved to localStorage 2010-07-12 14:02:45 +02:00
Crack
bcaecbf10a allow user preferences to work without pmadb, but warn users about that 2010-07-09 20:37:04 +02:00
lorilee
e90f8e4d89 Added a title to the export page to show the current export mode (server/database/table) 2010-07-08 12:30:50 -07:00
lorilee
af5486fccc Moved inline css from display_export.lib.php here 2010-07-08 12:01:16 -07:00