nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,022 Commits 1 Branch 0 Tags
ecdbb6dcc73aa97fc4df90d92e0ff4b4530f69e9
Commit Graph

504 Commits

Author SHA1 Message Date
Herman van Rink
b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky 
Conflicts:
	Documentation.html - renumbered 6.28 to 6.29
 2010-08-25 16:59:54 +02:00
Michal Čihař
51c9fccd95 Use same format string as in other places. 2010-08-23 13:32:07 +02:00
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
9399f8af8d Improved the appendInlineAnchor() function to edit the text now displayed with each anchor 2010-08-22 13:23:16 +05:30
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
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
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
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
Martynas Mickevicius
b32e5879fd Merge commit 'origin/master' into local 2010-08-16 01:01:30 +03: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
ninadsp
6a3d0a7f58 Added documentation, fixed some minor bugs/typos 2010-08-13 23:34:10 +05:30
Martynas Mickevicius
62b443c069 chenaged comments in the JS files 2010-08-13 19:54:22 +03: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
ninadsp
880e4665c3 Added JSDoc-Toolkit compatible documentation to js/sql.js 2010-08-11 00:28:28 +05:30
ninadsp
eccad201bf Added JSDoc-Toolkit compatible documentation to js/db_structure.js 2010-08-10 19:56:04 +05:30
ninadsp
98d3916e91 Added JSDoc-Toolkit compatible documentation to js/db_search.js 2010-08-10 19:30:43 +05:30
ninadsp
ee6bcb1b16 Added JSDoc-Toolkit compatible documentation to js/db_operations.js 2010-08-10 19:25:56 +05:30
ninadsp
43f4812dbf Added JSDoc-Toolkit compatible documentation to js/server_privileges.js 2010-08-10 19:25:40 +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
ninadsp
2ba0095ab5 We can now edit NULL fields and set fields to NULL in inline editing. 2010-08-09 00:49:11 +05:30
ninadsp
0373ae6713 Removed an alert() call which was around for testing purposes. 2010-08-09 00:06:36 +05:30
ninadsp
a69154b5c9 Removed the appendInlineAnchor call from ajaxSuccess event as it was also fired at a successful inline edit query. Instead, created a custom event appendAnchor on #sqlqueryresults which is triggered when necessary. Also got transformations working for application/octetstream mime type. 2010-08-06 19:23:17 +05:30
Crack
97c939f8df Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-06 15:24:15 +02:00
Martynas Mickevicius
59f220eb13 added check for json encoder, cleaned up error handling a bit 2010-08-06 13:22:04 +03: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
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
ninadsp
3d1a420a6f Moved the code that appends the inline edit anchor into a function and registered it to all Ajax events that complete successfully. The anchor is now appended even after retrieving results over Ajax. 2010-08-04 21:54:35 +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
ab16573b34 Append a new anchor for inline edit to each row if javascript is supported instead of using the edit anchor for inline editing 2010-08-03 23:27:13 +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