Commit Graph

236 Commits

Author SHA1 Message Date
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
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
ninadsp
7acb4cb99d Finalised CSS rules for the Ajax notification division. It now centers correctly and handles not very large messages pretty well. 2010-08-04 22:58:05 +05:30
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
ninadsp
b99bad8cdd Almost completed appending of newly created database to the database table. Still need to get db statistics 2010-08-03 23:28:31 +05:30
ninadsp
a7f2cbd2ba Converted the PMA_sort_table into a jQuery function as there was a race condition caused due to simultaneous adding of a row and sorting of the table 2010-08-03 21:01:20 +05:30
ninadsp
3ab3b35a76 Created a function to sort a table after a new row has been appended to it. Required for Create Table, Add User and Create Database actions 2010-08-03 20:22:36 +05:30
ninadsp
c897adc3a4 Ajaxified Change Password action on main page 2010-08-03 19:10:37 +05:30
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
ninadsp
e6f083c703 Ajaxified Create Database action. Have to append newly created db to table yet though 2010-07-31 02:25:29 +05:30
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
ninadsp
9578aad8ef Sort the table of tables on db structure page after a new table's row is added. 2010-07-25 01:04:07 +05:30
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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Adnan
a7e3c0475c Merge Origin: Conflicts in js/functions.js 2010-07-22 16:03:50 +05:00
ninadsp
9640a580ff Drop Table and Create Table work as expected now on db_create.php too 2010-07-22 00:12:43 +05:30
ninadsp
6e908dfeb2 Refresh navigation on creation of new table. Bug noticed by Marc Delisle 2010-07-22 00:01:16 +05:30
ninadsp
1bdbb9f274 Handled the race condition caused on the loading notification div due to calls to PMA_ajaxShowMessage() in time less than the timeout. Added a .clearQueue() calls 2010-07-21 23:25:23 +05:30
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
ninadsp
98a57e2219 A newly added table is now appended to the tablesForm on db_structure.php 2010-07-14 01:09:37 +05:30
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
ninadsp
3bcffd86e9 Stupid typo. Fixed 2010-07-13 02:30:42 +05:30
ninadsp
a1e9702434 Fixed issue due to which the notifications div was visible even after clearing the message 2010-07-12 23:49:27 +05:30
ninadsp
e0f80088aa Fixed issue due to which the notifications div was visible even after clearing the message 2010-07-12 23:33:56 +05:30
ninadsp
4eb4d318bb Forgot to set the context for the recently added $(document).ready()
snippets.  Added them
2010-07-11 23:51:02 +05:30
ninadsp
fe9f539ed2 Removed inline coding for Drop Trigger in libraries/tbl_triggers.lib.php 2010-07-11 23:36:24 +05:30
ninadsp
dd58a5bc23 Removed inline calls to confirmLink() for Empty/Drop Table actions in libraries/tbl_links.inc.php 2010-07-11 23:14:41 +05:30