Commit Graph

157 Commits

Author SHA1 Message Date
Marc Delisle
8cf1e880f5 bug #3058102 AJAX and adding a column 2010-09-25 13:57:33 -04:00
Marc Delisle
79c5181d2a bug #3060972 Password generation not available with AJAX 2010-09-25 08:50:39 -04:00
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Michal Čihař
0e3015ce1b Automatic escaping in js enum editor. 2010-09-07 10:43:39 +02:00
ninadsp
00250a9f59 Modified the Change Password action to get the action on Server Privileges page also working 2010-09-02 06:22:38 -04:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
Marc Delisle
56381c086f adapted patch #3050492 to new code 2010-08-28 08:57:27 -04:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
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
ninadsp
5a27df6ad8 Missing brackets during the merge. Added them 2010-08-22 12:59:53 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
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
ninadsp
6a3d0a7f58 Added documentation, fixed some minor bugs/typos 2010-08-13 23:34:10 +05:30
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
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