nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,447 Commits 1 Branch 0 Tags
301e3c43e329933778f66a51a2ba7204e1eb12ee
Commit Graph

3778 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
lorilee
d5ba4231ec SQL export option "CREATE PROCEDURE / FUNCTION / EVENT" default set to true 2010-06-15 23:37:25 -04:00
lorilee
a2dfd7170a Added functions used to display file select forms in import 2010-06-15 23:36:20 -04:00
lorilee
fe90e236cd Quick export 2010-06-15 16:21:44 -04:00
Marc Delisle
f1d8953670 fix conflicts 2010-06-13 08:59:05 -04:00
Marc Delisle
ae8ddbf15b bug #2986422 [import] Results for query are not displayed 2010-06-13 08:42:24 -04:00
Marc Delisle
485e1736b6 make inline editing work for all cases of fmtType 2010-06-12 08:45:24 -04:00
Michal Čihař
8dfdcca68b Merge branch 'QA_3_3' 2010-06-11 12:41:33 +02:00
Michal Čihař
1e2731dc96 [engines] Fix getting InnoDB status. 2010-06-11 12:41:18 +02:00
lorilee
c257099b6a Removed inline javascript, modified formatting 2010-06-11 01:26:36 -04:00
lorilee
b43cea6007 Modified label text and formatting 2010-06-11 01:26:35 -04:00
lorilee
344823818f Modified label text 2010-06-11 01:26:35 -04:00
lorilee
a9ce5c1555 Modified label text, removed inline javascript, modified style of Go button, added import notification for plugins 2010-06-11 01:26:35 -04:00
lorilee
0b10c6387b Modified label text, removed inline javascript, modified formatting 2010-06-11 01:26:35 -04:00
lorilee
56ee880bbf Added default for XML structure/data 2010-06-11 01:26:35 -04:00
lorilee
d36b1a7593 New import page; reorganized formatting 2010-06-11 01:26:35 -04:00
lorilee
2ae79998d2 Changed div ID name 2010-06-11 01:26:34 -04:00