gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,505 Commits 12 Branches 481 Tags 2.4 GiB
e4fe5daaa1
Commit Graph

1780 Commits

Author SHA1 Message Date
Marc Delisle
4266f39876 Remove title bar in Create table dialog, as suggested by Tyron Madlener. 2011-10-28 08:55:03 -04:00
Rouslan Placella
1fd7a96135 Merge branch 'enum' 
Conflicts:
	enum_editor.php
 2011-10-26 16:29:10 +01:00
Rouslan Placella
f6d2da769b Integrated the ENUM/SET editor with the Routines editor 2011-10-26 16:26:15 +01:00
Rouslan Placella
93686fd47a Improved ENUM/SET editor 2011-10-26 16:01:24 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Rouslan Placella
8e638c7ea6 Fixed IE regression: The link to ENUM/SET editor was not showing up 2011-10-24 23:07:55 +01:00
Michal Čihař
848f057c49 Whitespace cleanup 2011-10-24 14:10:18 +02:00
Michal Čihař
252481af4a Factor out js code for printing 2011-10-24 14:10:08 +02:00
Rouslan Placella
0683bd485b Merge branch 'QA_3_4' 2011-10-21 15:40:58 +01:00
Rouslan Placella
0112ff6ba5 Fixed bug #3426840 - ENUM/SET editor can't handle commas in values 2011-10-21 15:38:59 +01:00
Rouslan Placella
20a57d1fea Merge branch 'QA_3_4' 
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
 2011-10-21 11:38:38 +01:00
Rouslan Placella
d4cce87b26 Fixed bug #3425230 - enum data split at space char (more space to edit) 2011-10-21 11:34:42 +01:00
Marc Delisle
4336ffca2b As suggested by Tyron Madlener: 
Display the input field for the default value only after "As defined:"
is selected, and also focus it automatically once it's selected so the user
can type immediately
 2011-10-16 09:10:48 -04:00
Rouslan Placella
137a70e671 Checkstyle fixes 2011-10-13 19:25:07 +01:00
Marc Delisle
c692607e2e This is a jQuery object 2011-10-13 13:13:53 -04:00
Piotr Przybylski
b0cbd4c59a get_image.js - fix for IE 2011-10-11 22:13:31 +02:00
Piotr Przybylski
2a49e9fdab bugfix for Create table dialog (IE6-8, possibly fixes JS error in FF on demo server) 2011-10-11 22:12:05 +02:00
Rouslan Placella
37edc1dece Fix IE JS error in PMA_getImage() 2011-10-11 10:34:40 +01:00
Piotr Przybylski
9d0c410b36 New create table dialog: fix resize event 2011-10-11 02:08:09 +02:00
Piotr Przybylski
4a5cb00df5 Fix jQuery UI version number 
It's 1.8.16, not 1.8.6
 2011-10-11 02:00:45 +02:00
Piotr Przybylski
d424a797d5 Make Create table dialog take up entire viewport 
The only scrollbars that now appear should be the ones around dialog's content
 2011-10-10 22:37:27 +02:00
Piotr Przybylski
ac365e0262 Upgrade jQuery UI to 1.8.6 2011-10-10 22:35:36 +02:00
Marc Delisle
c0120649fb - Refer to window.document 
- No need for variables here

Thanks to Piotr for the tips
 2011-10-09 15:41:42 -04:00
Rouslan Placella
f2d1aa6832 Need to call PMA_createTableDialog() in the context of frame_content, 
in order for the qtip tooltips to work
 2011-10-09 15:27:55 -04:00
Marc Delisle
8945a2a614 Convert footnotes to tooltips in Create table dialog 
- works when called from main panel
- from navi panel, this commit fixed a js error but the tooltips do
  not appear yet
 2011-10-09 07:42:10 -04:00
Marc Delisle
554c1df307 Increase the size of the Create table dialog, based on the frame size 2011-10-09 06:45:32 -04:00
Madhura Jayaratne
ad5c7f5d0a bug #3418849 [interface] Inline edit shows dropdowns even after closing 2011-10-05 08:55:19 +05:30
Rouslan Placella
5d5f4ac908 JS syntax error 2011-09-27 16:11:02 +01:00
Rouslan Placella
ec54aacbd1 Fix some closure-compiler errors 2011-09-26 22:02:37 +01:00
Rouslan Placella
19e69ed770 Changed the way the attributes are fetched from the object returned by PMA_getImage() in JS 
Stops the 'closure-compiler' from erroring out
 2011-09-26 21:10:11 +01:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Rouslan Placella
1431d02c8f Made PMA aware of the presence of sprites + added a script for generating sprites from icons 2011-09-26 20:46:28 +01:00
Madhura Jayaratne
cecf7f9fea typo 2011-09-25 22:21:57 +05:30
Marc Delisle
1c48e6a817 Merge branch 'QA_3_4' 2011-09-25 07:45:59 -04:00
Marc Delisle
1eeddcd082 bug #3413743 [interface] Display options link missing after search 2011-09-25 07:45:23 -04:00
Marc Delisle
16c5e7bab0 Designer: broken image paths when used at the Javascript level 2011-09-25 06:59:34 -04:00
Marc Delisle
4c56367ecd Incorrect messages were shown 2011-09-23 08:43:10 -04:00
Marc Delisle
3fc3194bce - Bug #3383572 Cannot execute saved query 
- Remove bookmark from the list after deletion (Ajax)
 2011-09-23 08:14:42 -04:00
Marc Delisle
ff56cbf5d9 Fix bug 3411523 (SQL query tab broken) which was introduced when 
applying the fix for bug #3383572 (Cannot execute saved query), which
works for the 3.4 branch.
 2011-09-22 10:48:29 -04:00
Madhura Jayaratne
2de2e87af7 Adding missing semicolons 2011-09-21 10:05:32 +05:30
Madhura Jayaratne
ddd80be1cb Typo 2011-09-21 10:00:47 +05:30
Marc Delisle
369c9c550a Ajax and bookmark delete 2011-09-20 12:45:19 -04:00
Marc Delisle
516891a6b8 View only bookmark did not work with CodeMirror 2011-09-20 08:47:18 -04:00
Piotr Przybylski
d32bcb16c6 Better looking settings tabs in pmahomme 2011-09-20 13:02:30 +02:00
Madhura Jayaratne
3bec04a9b8 Always use curly braces with IF statements. Remove spaces 2011-09-18 22:27:32 +05:30
Madhura Jayaratne
88682495fa Wrap some lone lines 2011-09-18 22:22:23 +05:30
Madhura Jayaratne
719e5591dd Remove redundant if check 2011-09-18 22:13:35 +05:30
Madhura Jayaratne
59e7c2e09d These are Objects 2011-09-18 21:55:07 +05:30
Madhura Jayaratne
6bfcef485c If data label is not set, do not show tooltips 2011-09-18 20:53:53 +05:30
Marc Delisle
5e83631469 Fix merge conflicts 2011-09-18 08:26:47 -04:00
Marc Delisle
6ac29b4791 bug #3383572 [interface] Cannot execute saved query 
When the Go button related to the "Run SQL query" section is pressed,
avoid transmitting the value of id_bookmark from the "Bookmarked SQL
query" section; otherwise import.php would think that it needs to
do a bookmark action instead of executing the query.
 2011-09-18 08:11:15 -04:00
Madhura Jayaratne
5cd8af78c3 Simplify the logic a bit 2011-09-18 15:43:18 +05:30
Madhura Jayaratne
ef43e2fce8 Proper handling of set type columns in zoom editor 2011-09-18 14:47:26 +05:30
Madhura Jayaratne
d2276d5dda Avoid b'null' and b'' for bit fields. No space before comma and single space after comma in SQL query 2011-09-18 12:10:46 +05:30
Madhura Jayaratne
20ca1e471c bug #3410999 - Zoom search, problems with data editor 2011-09-18 11:54:59 +05:30
Madhura Jayaratne
4581e53735 bug #3410984 - Zoom search, checkboxes and fields not being reset 2011-09-17 21:57:10 +05:30
Rouslan Placella
d01bb41213 Merge remote-tracking branch 'origin/master' 2011-09-17 15:28:17 +01:00
Rouslan Placella
3f5662ff11 Merge branch 'ajax_message' 2011-09-17 15:21:53 +01:00
Rouslan Placella
82be0e6633 Ajax message "Processing request" also should not disappear and should not be dismissable 2011-09-17 15:18:55 +01:00
Madhura Jayaratne
1371398618 Remove trailing white spaces 2011-09-17 19:36:59 +05:30
Madhura Jayaratne
472350cf97 Spaces to make the code more readable 2011-09-17 19:28:35 +05:30
Madhura Jayaratne
edeba16cd7 Proper indentation 2011-09-17 19:06:18 +05:30
Madhura Jayaratne
5643a33596 Adding missing semicolons 2011-09-17 18:48:45 +05:30
Madhura Jayaratne
5c03bd90e1 Fixing indentation 2011-09-17 18:46:09 +05:30
Madhura Jayaratne
b8815ca766 Always use curly braces with 'if' and 'else' 2011-09-17 18:30:46 +05:30
Madhura Jayaratne
3936aab880 More indentation problems fixed 2011-09-17 18:24:36 +05:30
Madhura Jayaratne
a61891560f Proper indentation 2011-09-17 18:09:55 +05:30
Madhura Jayaratne
fbcc3eb3a2 Added missing semicolons 2011-09-17 18:04:40 +05:30
Madhura Jayaratne
47b5a2b2f4 bug #3410077 - User overview erroneously loaded into Ajax dialog 2011-09-15 23:03:54 +05:30
Aris Feryanto
c1878a1abd Trigger makegrid in table search result 2011-09-15 15:49:36 +07:00
Madhura Jayaratne
3d3a5283dc Merge branch 'QA_3_4' 2011-09-14 22:50:54 +05:30
Madhura Jayaratne
d3bd40b56d bug #3400690 [privileges] DB-specific privileges won't submit 
Db/table specific privileges has not been ajaxified. So skip it for now.
 2011-09-14 22:43:48 +05:30
Rouslan Placella
ad4fa3547b Fixed comment 2011-09-14 16:09:15 +01:00
Rouslan Placella
af4e15b6ff Merge branch 'master' into ajax_message 2011-09-14 15:58:04 +01:00
Rouslan Placella
abc1d3c345 Fixed broken validation and reindexing of some fields in the Routines editor 2011-09-14 15:42:40 +01:00
Rouslan Placella
6dbab1fb38 Prevent error notifications from disappearing in Routines, Triggers and Events implemetatations 2011-09-14 15:28:30 +01:00
Rouslan Placella
d39db8e3b6 Improved dismissable Ajax notifications, so that error messages don't disappear 2011-09-14 15:27:11 +01:00
Rouslan Placella
537c319abb Merge branch 'master' into ajax_message 2011-09-14 13:00:03 +01:00
Madhura Jayaratne
9d83d2fc35 Load jquery.sprintf.js on demand 2011-09-14 10:06:54 +05:30
Madhura Jayaratne
29a8f3f32c Load scripts from cache when they are available 2011-09-14 07:56:50 +05:30
Madhura Jayaratne
c1c81ed80a Load OpenLayers.js in a synchronous manner. 2011-09-13 21:52:52 +05:30
Madhura Jayaratne
1f6bd00b15 Revert changes to loadJavascript() method 2011-09-13 19:03:43 +05:30
Madhura Jayaratne
e3bcd9f7cf JS files for gis_data_editor loaded dynamically 2011-09-13 08:31:10 +05:30
Madhura Jayaratne
c3bb40cbce OpenStreetMaps.js merged into OpenLayers.js 2011-09-13 08:28:16 +05:30
Rouslan Placella
51eb8069db Fixed display of codemirror in routines, triggers and events editors 2011-09-11 19:33:00 +01:00
Rouslan Placella
d47fdde6c0 Merge branch 'master' into ajax_message 2011-09-10 21:11:53 +01:00
Madhura Jayaratne
5fd403f326 Adding missing semicolons 2011-09-10 19:31:30 +05:30
Madhura Jayaratne
eabe018a9e bug #3403282 [AJAX] Grid editor does not work for ENUM fields 2011-09-10 19:27:04 +05:30
Marc Delisle
85fc658f31 Missing function after merging 2011-09-08 15:54:36 -04:00
Marc Delisle
b0ef11932a Merge branch 'QA_3_4' 2011-09-08 15:44:07 -04:00
Marc Delisle
bda213c58a Escape HTML in js-generated confirmation messages 2011-09-08 15:38:40 -04:00
Herman van Rink
2f28ce9c80 [security] Fixed XSS in Inline Edit on save action 2011-09-02 13:00:33 -04:00
Piotr Przybylski
77e5cc3e8a Changed slider to use fixed-size 'blind' animation instead of 'slide' 2011-09-02 17:02:21 +02:00
Piotr Przybylski
a2093e66e2 bugfix: makegrid broke styling of rows with conditions in table search 2011-09-01 14:43:20 +02:00
Piotr Przybylski
e81b6c1cfd Fix broken inline edit 
As a bonus, data is submitted by POST so query length limit doesn't apply
 2011-08-27 22:12:54 +02:00
Michal Čihař
1b8018e436 Use format string for point number, otherwise the translation is wrong in some languages 2011-08-25 08:36:05 +02:00
Piotr Przybylski
a31b30ba57 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-23 21:56:33 +02:00
Rouslan Placella
dd566ec76c Make ajax notifications dismissable 2011-08-23 20:09:53 +01:00
Piotr Przybylski
42341de5e8 Fix datepicker initialization 2011-08-23 17:43:37 +02:00
Aris Feryanto
2b4acfa534 Merge remote-tracking branch 'origin/master' into aris 2011-08-23 02:26:57 +08:00
Aris Feryanto
f82ad2318c Grid edit: fix bug - show NULL checkbox for normal grid-editable text 2011-08-23 02:10:58 +08:00
Piotr Przybylski
d2255fb9ae Merge remote-tracking branch 'origin/master' into drizzle 2011-08-22 15:19:50 +02:00
Michal Čihař
80a29d3d14 Apply changes to timepicker only if it is loaded 2011-08-22 13:44:01 +02:00
Michal Čihař
13349553b1 Localization for new timepicker 2011-08-22 13:41:27 +02:00
Marc Delisle
e34fd02ab4 Merge commit 'c19dae384a9dc53113ef153b338329f183c1bf11' 2011-08-22 06:07:30 -04:00
Piotr Przybylski
1c2dbf0cbb Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/advisory_rules.txt
 2011-08-22 11:18:26 +02:00
Aris Feryanto
c19dae384a Grid edit: fix bug - browse foreign value not work 2011-08-22 10:30:15 +08:00
Madhura Jayaratne
a62aa22ad5 Replace tab characters with spaces 2011-08-21 00:51:36 +05:30
Marc Delisle
c0651983be Merge commit 'cae2c2a52b54c0dbdf952283cfd29baf2d9d03cf' 2011-08-20 07:33:07 -04:00
Thilanka Kaushalya
681df0a9f9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-20 15:58:37 +05:30
Thilanka Kaushalya
85f62705e4 Rewrote the functions in querywindow.js using jquery 2011-08-20 15:55:02 +05:30
Ammar Yasir
cae2c2a52b Modified the 'How to use?' message for info about mousewheel zoom and panning feature 2011-08-20 11:02:47 +05:30
Ammar Yasir
7c25bb1b73 Merge remote branch 'phpmyadmin/master' 2011-08-20 10:09:21 +05:30
Piotr Przybylski
41c18f6113 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/Table.class.php
	libraries/Tracker.class.php
 2011-08-20 00:48:40 +02:00
Marc Delisle
8b607b4a43 Merge commit '52648bbcf61fc1b1d0495f7d911e84a96c6d1913' 2011-08-19 14:53:36 -04:00
Piotr Przybylski
0ca4a5f02e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_search.php
	libraries/Table.class.php
	libraries/schema/Pdf_Relation_Schema.class.php
	libraries/schema/User_Schema.class.php
	libraries/tbl_select.lib.php
	server_status.php
	tbl_change.php
 2011-08-19 15:56:26 +02:00
Michal Čihař
86dad70386 Fix some display issues 2011-08-19 13:45:02 +02:00
Michal Čihař
1fa197752b Fixed displaying of table menu 2011-08-19 13:35:13 +02:00
Michal Čihař
fd13e7ad67 Use display = none instead of visibility to avoid off screen invisible elements 2011-08-19 13:25:08 +02:00
Michal Čihař
12237ed84f Remove no longer used Help funciton 2011-08-19 13:11:34 +02:00
Michal Čihař
88104eac66 Fix js to match changes 2011-08-19 13:11:34 +02:00
Aris Feryanto
e73110f21f Grid edit: remove unused function 2011-08-19 15:30:26 +08:00
Aris Feryanto
61a9a2f3a8 Grid edit: handle escaping HTML entities + remove 'edit area' when editing normal text 2011-08-19 14:29:46 +08:00
Ammar Yasir
01d5a76ca9 Added "Reset Zoom" link that reverts the plot to original display. 2011-08-19 09:13:01 +05:30
Ammar Yasir
7a821c8a36 Improved the panning feature 2011-08-19 09:03:55 +05:30
Ammar Yasir
328c5d5b27 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_zoom_plot.js
 2011-08-19 08:14:44 +05:30
Tyron Madlener
cfa5ec283f - Easy editing of byte values using kb,mb,gb 
- Keyboard shortcuts: Enter to save, Escape to cancel
 2011-08-18 22:05:22 +03:00
Tyron Madlener
1ca6ea0af2 Better wording 2011-08-18 19:21:04 +03:00
Tyron Madlener
ba21b5f3a2 Commit 84cc7837f5 broke the datetime picker for the monitor loading log dialog 2011-08-18 19:11:00 +03:00
Aris Feryanto
de176a3da7 Fix wrong relative position introduced in commit 2fdfc4fc1e 2011-08-19 00:02:54 +08:00
Tyron Madlener
67f396a7b6 Fix: Correct sorting for status variable values 2011-08-18 17:46:40 +03:00
Tyron Madlener
dd36db9ca9 Fix: Incorrect word filter regex for status variables 2011-08-18 17:31:27 +03:00
Tyron Madlener
a6638a3c08 Merge remote-tracking branch 'origin/master' 2011-08-18 17:22:17 +03:00
Tyron Madlener
ea96d94526 Merge remote-tracking branch 'origin/master' 2011-08-18 16:50:45 +03:00
Piotr Przybylski
676b0cc925 Refactor initTableSorter and use it only when needed 2011-08-18 15:34:57 +02:00
Piotr Przybylski
ceee608237 Tablesorter: don't apply widget twice during initialization 2011-08-18 15:21:17 +02:00
Piotr Przybylski
e08ce9450b Faster zebra widget for tablesorter, reduces processing time of status variables table from ~200ms to ~100ms 2011-08-18 14:59:15 +02:00
Piotr Przybylski
9f476c85a8 Server status: faster perceived page loading 
Tab initialization is moved to the moment when tab is selected. All other tabs are initialized after tabs are displayed
 2011-08-18 14:19:51 +02:00
Piotr Przybylski
84cc7837f5 Use PMA_addDatepicker only when $.datetimepicker is defined, prevents JS error on server status page where timepicker.js is loaded on demand 2011-08-18 13:39:06 +02:00
Tyron Madlener
917aa3e182 SQL Pretty printer: Uppercase for keywords 2011-08-18 13:37:01 +03:00
Tyron Madlener
de98961029 SQL pretty printer feature using the codemirror tokenizer. Replaced this with old pretty-printer regexp collection in query analyzer dialog. 2011-08-18 13:16:03 +03:00
Piotr Przybylski
627e4133c3 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	themes/original/css/theme_right.css.php
 2011-08-17 22:47:20 +02:00
Piotr Przybylski
2fdfc4fc1e "position: relative" on tables was required for grid, add it dynamically in PMA_makegrid 2011-08-17 18:25:56 +02:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
 2011-08-17 16:39:43 +02:00
Madhura Jayaratne
d501fc1fe6 Merge branch 'OpenGIS' 2011-08-17 18:02:25 +05:30
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Aris Feryanto
4ce54e1734 Fix merge conflict with clear_selection branch 2011-08-17 14:20:23 +08:00
Aris Feryanto
5e60aa8380 Fix merge conflict with origin/master 2011-08-17 13:41:38 +08:00
Aris Feryanto
3193c113c8 Grid edit: fix NULL-related things when editing datetime field 2011-08-17 13:38:39 +08:00
Aris Feryanto
88f3796f1e Grid edit: add datetimepicker support for date, datetime, and timestamp field 2011-08-17 13:12:31 +08:00