nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,013 Commits 1 Branch 0 Tags
03d3062a65e70d31ed82a3dfef8c426c36b4fe3e
Commit Graph

265 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
Michal Čihař
c5a3288396 Merge remote branch 'lori/gsoc' 2010-08-19 11:11:51 +02:00
Adnan
381ba1be0f Merge remote branch 'origin/master' into export_branch 2010-08-18 17:03:35 +05:00
Adnan
ae877a1de6 UserInterface show/hide Schema Generation Options Available 2010-08-18 12:27:02 +05:00
Michal Čihař
d928804684 Fix string escaping. 2010-08-17 16:38:05 +02:00
lorilee
10ce6930d2 Don't hardcode the formats 2010-08-16 17:23:11 -07: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
de1ce650eb Added a prompt in the left frame fast filter that prompts the user on what to do, goes away when the field is focused on 2010-08-14 11:46:32 -07:00
lorilee
89c9de9f09 If structure is not being exported, the comment options for structure should not be enabled 2010-08-11 13:39:35 -07:00
lorilee
b87010e89b Fixed data/structure options toggling problem when Back link is used 2010-08-11 12:28:31 -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
d1ae3e348b Replacing old tooltip with new jQuery plugin 2010-08-05 18:11:48 -07: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
lorilee
422e509078 Replacing old tooltip with new jQuery plugin 2010-08-05 17:31:02 -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
Crack
ac3e9e323b keep selected tab after save 
change pmadb to phpMyAdmin configuration storage in warning string
 2010-07-27 22:12:53 +02: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
9d62971e11 clean up config JavaScript 2010-07-26 22:34:13 +02: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
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
Crack
c8b6acdf59 remove debug 
use proper function to cancel event
 2010-07-22 17:02:17 +02:00
Adnan
a7e3c0475c Merge Origin: Conflicts in js/functions.js 2010-07-22 16:03:50 +05:00
Crack
7399ce3e61 a few changes on preferences manage page 
fix JS date generation on preferences export to localStorage
 2010-07-22 12:37:51 +02:00
Crack
7b0135ed6a fix port number validation 
correct naming mistake (authentication != authorization)
setup script: move server authentication settings to new tab
 2010-07-21 16:11:02 +02: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