nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,012 Commits 1 Branch 0 Tags
4a75c9b26e6e63349fd128ae3c4a831729a02dcb
Commit Graph

98 Commits

Author SHA1 Message Date
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
Michal Čihař
dd80998080 Merge remote branch 'adnan/export_branch' 2010-08-23 10:21:22 +02:00
Adnan
13abea596a Merge remote branch 'origin/master' into export_branch 2010-08-20 11:34:36 +05: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
Adnan
27fe8e4658 Indenation fix in functions.js 2010-08-19 17:32:43 +05:00
Adnan
ae877a1de6 UserInterface show/hide Schema Generation Options Available 2010-08-18 12:27:02 +05:00
Adnan
821b8b134e Merge remote branch 'origin/master' into export_branch 2010-08-16 04:52:53 +05:00
lorilee
7d0d1c1d01 Hide table actions dropdown only when mouse leaves the dropdown 2010-08-14 11:47:19 -07:00
lorilee
1c0b81d477 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-09 13:36:31 -07:00
lorilee
6f833918e9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-09 13:35:27 -07:00
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
lorilee
646627b911 Updated tooltips using the new tooltip plugin; the code in js/functions.js was moved from js/tooltip.js (with new code appended); <sup> IDs not needed 2010-08-05 18:05:25 -07:00
Marc Delisle
d46bb6d877 remove custom MIME type change for BLOB streaming because in its current version it can be a very costly operation 2010-08-03 16:21:17 -04:00
lorilee
1119d9f723 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-02 14:17:59 -07:00
lorilee
701bc67342 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-02 14:17:22 -07:00
Adnan
bdf033115b Merge remote branch 'origin/master' into export_branch 2010-08-02 10:46:50 +05: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
Marc Delisle
f9f987f544 Merge branch 'QA_3_3' 2010-07-31 14:54:34 -04:00
Marc Delisle
7951b2bacc bug #3034026 [confirmation] TRUNCATE queries get no confirmation request 2010-07-31 14:54:05 -04:00
lorilee
fb0aa49817 ENUM/SET editor fix for IE 2010-07-30 15:17:27 -07:00
lorilee
8214c32340 Colspan should change to 3 when actions are hidden 2010-07-30 12:31:15 -07:00
lorilee
9877db1626 Fix for positioning in different browsers plus IE6 bug 2010-07-30 12:30:40 -07:00
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
lorilee
ddb6633c73 Updated enum/set editor (encloses strings in single quotes automatically) 2010-07-27 17:40:30 -07:00
lorilee
64b5900d96 Fixing bug for when the table is a view or information_schema 2010-07-27 10:25:12 -07:00
lorilee
960f6ef3ff Updated hidden actions dropdown 2010-07-26 15:46:52 -07:00
Crack
edaf7ce86c translate "More" tab 
cleanup code
 2010-07-26 21:30:57 +02:00
Crack
8d24baad94 run submenu code only when #topmenu is present 
todo update
 2010-07-25 22:58:52 +02: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
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
Adnan
a7e3c0475c Merge Origin: Conflicts in js/functions.js 2010-07-22 16:03:50 +05:00
Michal Čihař
eeae8bec21 Get rid of inline javascript in login form. 2010-07-21 09:21:58 +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
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
lorilee
b8022422f7 Updated enum/set editor (submit button has only one function, escapes special characters, has more instructions for formatting 2010-07-20 12:22:39 -07:00
Michal Čihař
4330ee3fd4 Whitespace cleanup. 2010-07-20 14:15:00 +02:00
Michal Čihař
29ccdfc1ff Focus SQL query area after dom is ready. 2010-07-20 14:14:44 +02:00
lorilee
9badb87f1a Reveal-on-hover table structure actions 2010-07-14 11:55:31 -07:00
lorilee
087dac0df0 Fixes everything after commit 9de870ce87, where I accidentally committed some lines 2010-07-13 18:52:12 -07:00
lorilee
22254ba748 Gets rid of the forward slash that appears in the enum/set editor when there are no values 2010-07-12 18:55:21 -07:00
lorilee
3c1e06a3e6 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-06 11:04:06 -07:00
lorilee
ef6a616d01 Added feature to ENUM/SET editor where users can add more than one new field at a time 2010-07-05 16:21:31 -07:00
Adnan
1ef5f8564e Merge remote branch 'origin/master' into export_branch 2010-07-02 16:23:58 +05:00
Marc Delisle
9de870ce87 selecting a range of rows no longer worked 2010-07-01 07:30:29 -04:00
lorilee
5a67c754d2 Removed inline Javascript, added support for editing multiple columns at once 2010-06-28 22:26:21 -04:00
lorilee
083f81b59d Corrected a tiny typo which ruined everything 2010-06-28 20:52:56 -04:00
lorilee
8b2aa5282a ENUM/SET editor 2010-06-28 20:48:24 -04:00
Adnan
9befa3965e Schema Classes structure 2010-06-24 20:37:39 +05:00
Adnan
0e9f6247e4 Revert "schema classes structure" 
This reverts commit 589eef3280.
 2010-06-24 20:26:14 +05:00