Commit Graph

4154 Commits

Author SHA1 Message Date
Crack
83f1397f0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-28 16:42:29 +02:00
Marc Delisle
4986ee0174 lang directory no longer exists; I guess this mechanism is no longer needed 2010-06-28 09:25:45 -04:00
Crack
c91c105da8 added missing file 2010-06-27 12:43:54 +02:00
Adnan
cba214aee4 Export Relation Schema: deleting wrong name files 2010-06-26 11:16:11 +05:00
Crack
e842432c7e User preferences:
- add icons to category tabs
- user overrides were unavailable in CSS files
- apply saved configuration immediately after save, reload navigation frame if it's affected
- disabled overrides marked in user preferences forms
2010-06-26 01:04:17 +02:00
Adnan
dd217e8dff Export Relation Schema: renaming files + renaming classes according to pear standards 2010-06-25 19:14:47 +05:00
lorilee
2ef4025ec9 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-24 17:25:25 -04:00
lorilee
ab8bbae65b Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-24 17:15:39 -04:00
lorilee
8984ffffbb Modified label text, added "doc" links 2010-06-24 17:14:20 -04:00
lorilee
0ede5e680b Changed label name, added a hint for the "column names" field 2010-06-24 16:56:52 -04:00
lorilee
66c6a30185 Changed input element ID names to make more sense 2010-06-24 16:55:55 -04:00
Adnan
7660295dca Schema Classes structure, PDF and SVG 2010-06-24 20:39:46 +05:00
Adnan
8dc2149272 Merge remote branch 'origin/master' into export_branch 2010-06-24 20:32:35 +05:00
Adnan
0e9f6247e4 Revert "schema classes structure"
This reverts commit 589eef3280.
2010-06-24 20:26:14 +05:00
Marc Delisle
1be2d538df fix merge conflicts 2010-06-24 10:09:19 -04:00
Stéphane Pontier
4c0e653de0 patch #2932113 Slow export when having lots of databases 2010-06-24 10:01:21 -04:00
Adnan
fc838dd0cb Merge remote branch 'origin/master' into export_branch 2010-06-24 18:31:54 +05:00
Adnan
589eef3280 schema classes structure 2010-06-24 18:31:42 +05:00
lorilee
0a456e8681 Updated file selection form 2010-06-22 21:07:43 -04:00
lorilee
c9fa5b476e <li> tags only shown when there is content in between them 2010-06-22 20:40:11 -04:00
lorilee
6913ce2a42 Removed inline CSS 2010-06-22 20:38:52 -04:00
Crack
e5238f3845 add $cfg['UserprefsDisallow'] and allow setting it in setup script
correct IE opacity issue for "restore default value" button
fix regressions introduced in previous commit
2010-06-21 19:12:25 +02:00
Crack
d09c35f5a8 setup script - better config file generation 2010-06-21 18:46:23 +02:00
Crack
0dc5d2e2b1 markers for field errors 2010-06-21 16:24:34 +02:00
Crack
3a8de5a716 make form definition structure the same for setup script and user preferences 2010-06-21 15:24:07 +02:00
Crack
9f44d864b6 user preferences saving and integration 2010-06-20 21:34:13 +02:00
Michal Čihař
8b1b49a6b2 Merge branch 'MAINT_3_3_4' into QA_3_3
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-06-20 16:24:28 +02:00
Marc Delisle
12edc03e2f 3.3.5-dev 2010-06-20 06:25:07 -04:00
Marc Delisle
d10de675ce 3.3.4-rc1 2010-06-20 06:20:39 -04:00
Marc Delisle
b95666b22d 3.3.4-rc1 2010-06-20 06:01:52 -04:00
lorilee
d481a691cb Modified the Kanji encoding feature formatting to match the rest of the export/import forms 2010-06-19 11:49:48 -04:00
lorilee
02e896e423 Modified the Kanji encoding feature formatting to match the rest of the import form 2010-06-19 11:49:31 -04:00
lorilee
991d461e06 Fixed code indentation, added back Kanji encoding feature that I accidentally removed, modified the formatting to match the rest of the export form 2010-06-19 11:38:28 -04:00
lorilee
5d751f1fe2 Fixed XHTML syntax problems 2010-06-18 16:34:10 -04:00
lorilee
9fd0613a51 Revert "Fixed XHTML syntax problemsloris-computer:/Library/WebServer/Documents/gsoc Lori$ git commit libraries/common.lib.php"
This reverts commit 92779ae9c0.
2010-06-18 16:23:33 -04:00
lorilee
ddd265fb62 Fixed XHTML syntax problems 2010-06-18 16:22:52 -04:00
lorilee
7227949dfb Fixed XHTML syntax problems 2010-06-18 16:15:16 -04:00
lorilee
b967bd9169 Fixed XHTML syntax problems 2010-06-18 16:14:48 -04:00
lorilee
92779ae9c0 Fixed XHTML syntax problemsloris-computer:/Library/WebServer/Documents/gsoc Lori$ git commit libraries/common.lib.php
Fixed XHTML syntax problems
2010-06-18 16:14:09 -04:00
lorilee
71ee3e6421 Fixed XHTML syntax problems 2010-06-18 16:12:41 -04:00
lorilee
3ba5c8e0f4 Fixed XHTML syntax problems 2010-06-18 16:11:52 -04:00
Crack
d68f2db904 add warnings if pma_userconfig is not present 2010-06-18 20:22:34 +02:00
Crack
114869eb7a updated paths 2010-06-18 19:36:00 +02:00
Crack
3ff76ffcf5 moved forms definition files 2010-06-18 19:33:24 +02:00
Crack
b2e232b582 Added pmadb table for preferences storage
Removed some messages from messages.inc.php
2010-06-18 17:53:53 +02:00
Crack
c7b304b6e6 improve js validators
add missing validations and language strings
2010-06-16 23:54:35 +02:00
lorilee
9dbe9f4115 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-15 23:45:44 -04:00
lorilee
43c0b30a29 Merge remote branch 'origin' 2010-06-15 23:45:00 -04:00
lorilee
347cfc7eaa The default plugin options should be displayed on the import form but not on the export form (because of quick export) 2010-06-15 23:39:42 -04:00
lorilee
135868db80 Updated the formatting for selecting a file to import 2010-06-15 23:38:28 -04:00