Commit Graph

15448 Commits

Author SHA1 Message Date
lorilee
083f81b59d Corrected a tiny typo which ruined everything 2010-06-28 20:52:56 -04:00
lorilee
301e3c43e3 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-28 20:50:26 -04:00
lorilee
f1a5ae3a9f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-28 20:49:56 -04:00
lorilee
cd7b5448f9 ENUM/SET editor 2010-06-28 20:48:41 -04:00
lorilee
8b2aa5282a ENUM/SET editor 2010-06-28 20:48:24 -04:00
lorilee
5c7ee416b3 ENUM/SET editor styles 2010-06-28 19:14:21 -04:00
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +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
Michal Čihař
1d8d6b32ef Merge branch 'QA_3_3' 2010-06-28 13:49:31 +02:00
Michal Čihař
f70bd16ce3 Merge remote branch 'origin/MAINT_3_3_4' into QA_3_3 2010-06-28 13:48:34 +02:00
Marc Delisle
af6c9cf8a8 3.3.4 release 2010-06-28 07:38:57 -04:00
Marc Delisle
c699af70e9 3.3.4 release 2010-06-28 07:37:55 -04:00
Marc Delisle
9c3ad0c8b1 3.3.4 release 2010-06-28 07:36:13 -04: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
e6932ed398 Causes the correct radio button to be selected in the import file location form 2010-06-24 16:57:28 -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
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
ardavies
6bb0cef536 Translation update done using Pootle. 2010-06-23 14:34:18 +02:00
lorilee
d5175bc7df Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-22 21:12:41 -04:00
lorilee
4792d21a8a Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-22 21:10:54 -04:00
lorilee
40b9e360ad Fixed the <sup> tag in the "File name template" label so it doesn't push the next row to the right 2010-06-22 21:08:01 -04:00
lorilee
0a456e8681 Updated file selection form 2010-06-22 21:07:43 -04:00
lorilee
c8898f764c Organized the code and added comments; Updated styles for the submit button 2010-06-22 20:43:10 -04:00
lorilee
ee19189db1 Added new import/export styles for this theme 2010-06-22 20:41:34 -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
Burak Yavuz
38920314c4 Translation update done using Pootle. 2010-06-21 19:58:06 +02:00
Burak Yavuz
09d224e4ee Translation update done using Pootle. 2010-06-21 19:57:53 +02:00
Burak Yavuz
4dad58999f Translation update done using Pootle. 2010-06-21 19:56:56 +02:00
Burak Yavuz
d02118d91d Translation update done using Pootle. 2010-06-21 19:41:51 +02:00
Burak Yavuz
6d3ebc6e7d Translation update done using Pootle. 2010-06-21 19:41:24 +02:00
Burak Yavuz
47b0d60872 Translation update done using Pootle. 2010-06-21 19:36:04 +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
Michal Čihař
318ebf8bb5 Sort language files. 2010-06-20 16:22:54 +02:00
Michal Čihař
7f77f618d9 Fix truncated translation. 2010-06-20 16:21:19 +02:00
Michal Čihař
41b2a7802c Update translation based on ones in master. 2010-06-20 16:20:16 +02:00
Michal Čihař
4f56db9d93 Fixup of language update script. 2010-06-20 16:15:38 +02:00
Marc Delisle
3efb889d61 3.3.5-dev 2010-06-20 06:27:15 -04: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
8390525de8 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-18 16:47:29 -04:00
lorilee
90a8e88b72 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-18 16:46:56 -04:00