Commit Graph

227 Commits

Author SHA1 Message Date
Marc Delisle
0131d16548 Merge commit '010f19912460c8e3b925ff7b19f7e2f37361a339' 2011-07-13 09:04:51 -04:00
Aris Feryanto
010f199124 Remove vertical support for inline edit 2011-07-11 15:15:24 +08:00
Madhura Jayaratne
4ae5cb0799 Merge branch 'QA_3_4' 2011-07-10 18:00:46 +05:30
Madhura Jayaratne
58d25ddcb8 Typo 2011-07-10 17:58:35 +05:30
Madhura Jayaratne
a546479680 bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL 2011-07-10 17:55:56 +05:30
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Thilanka Kaushalya
311804dd72 Removed the modification for the multi row Export in Table Browse 2011-07-03 10:52:16 +05:30
Thilanka Kaushalya
d33590a544 Resolved conflicts 2011-07-01 23:50:58 +05:30
Tyron Madlener
7f9797bc6a Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-27 13:53:55 +02:00
Thilanka Kaushalya
6104ef1ba4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-24 14:57:34 +05:30
Thilanka Kaushalya
045499bd75 Ajaxify the multi row export in table 2011-06-24 14:54:46 +05:30
Tyron Madlener
a08bfa3964 Hides the bookmarkoptions checkboxes when the bookmark label is empty 2011-06-22 20:45:14 +02:00
Marc Delisle
cf3930d29f Complete the code change for form renaming (rowsDeleteForm to resultsForm) 2011-06-20 16:25:11 -04:00
Thilanka Kaushalya
bdea8c332b Added ajax dialog for change in vertical rows 2011-06-19 23:23:10 +05:30
Thilanka Kaushalya
59dfaee0d7 Added the update resultsForm when there in single pageination 2011-06-19 11:30:43 +05:30
Thilanka Kaushalya
0f1a038b2d Fixed the bugs at table multi row change option 2011-06-19 10:42:43 +05:30
Thilanka Kaushalya
8604ba0303 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-18 22:38:44 +05:30
Thilanka Kaushalya
a8f258cb8d Added ajax dialog for table row change 2011-06-18 22:36:54 +05:30
Madhura Jayaratne
4338b70d9f Merge branch 'QA_3_4'
Conflicts:
	js/sql.js
2011-06-16 21:23:12 +05:30
Madhura Jayaratne
9d2269d297 bug #3317293 [edit] Inline edit places HTML line breaks in edit area 2011-06-16 21:05:54 +05:30
Aris Feryanto
d28d7daba1 Fix merge conflict with origin/master 2011-06-15 07:23:06 +07:00
Tyron Madlener
f08b7d52ff 3 more bugfixes 2011-06-13 18:00:33 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Tyron Madlener
f4fa0d9f79 - Dynamic chart with for the server status chart
- Table chart replaced with a Highcharts generated chart that also behaves somewhat more intellegently
2011-06-09 00:53:32 +02:00
Aris Feryanto
082345bdfa Merge remote-tracking branch 'origin/master' into aris 2011-06-08 13:59:38 +07:00
Tyron Madlener
fcb3273c64 -Tabs +Spaces 2011-06-08 01:53:21 +02:00
Tyron Madlener
902fc1d95d - Replaced pChart profiling chart with highchart chart
- Moved PMA_profilingResults() function code inline in sql.php as its used at only one place
2011-06-07 21:32:05 +02:00
Marc Delisle
31bbba5e76 Merge branch 'QA_3_4' 2011-06-07 11:44:31 -04:00
Marc Delisle
2d56821c0f Improved fix for bug #3313210 2011-06-07 11:43:30 -04:00
Marc Delisle
b5e733a2e3 Merge branch 'QA_3_4' 2011-06-07 11:10:18 -04:00
Marc Delisle
82ac1e8028 bug #3313210 [interface] Columns class sometimes changed for nothing 2011-06-07 11:06:38 -04:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Aris Feryanto
04fbe12ac7 Merge branch 'colresize' into aris 2011-06-06 14:58:27 +07:00
Aris Feryanto
1a66a483cf Merge remote-tracking branch 'origin/master' into aris 2011-06-06 14:58:24 +07:00
Aris Feryanto
b0717ff8d5 Inline edit: fix compatibility with custom 'action column' (RowActionLinks) position 2011-06-06 14:54:07 +07:00
Marc Delisle
1e0cff6161 Merge branch 'QA_3_4' 2011-06-05 06:30:23 -04:00
Jo Michael
7996a36575 patch #3311539 Inline Edit does not escape backslash 2011-06-05 06:29:46 -04:00
Marc Delisle
82823d67fe Merge branch 'QA_3_4' 2011-06-05 06:14:33 -04:00
Marc Delisle
86d3b7e58c bug #3307616 [edit] Inline edit updates multiple duplicate rows 2011-06-05 06:13:11 -04:00
Madhura Jayaratne
75091e52fd Merge branch 'QA_3_4'
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
2011-06-04 00:36:51 +05:30
Madhura Jayaratne
612f8f3d67 Partial fix for bug #3291306 - Inline edit does not honor bit fields. Works with mysqli extension. 2011-06-04 00:02:11 +05:30
Aris Feryanto
e1d0b67af6 Fix merge conflict caused by new syntax highlighter 2011-06-03 09:59:35 +07:00
Michal ฤŒihaล™
961f170b51 Whitespace cleanup 2011-06-02 16:09:21 +02:00
Michal ฤŒihaล™
d5f18d4e7f Merge branch 'integration'
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Aris Feryanto
211d76b012 Added new feature: column reordering. Some fixes in column resizing 2011-06-01 17:59:09 +07:00
Aris Feryanto
c4c57b86c3 Column resize: fix compatibility with inline edit 2011-06-01 09:25:36 +07:00
Aris Feryanto
566851d210 Add trigger to remake the resizable column when an ajax request is done 2011-05-31 09:46:25 +07:00
Aris Feryanto
9ae87854ed Add ability to resize column when browsing tables 2011-05-27 14:05:45 +07:00
Madhura Jayaratne
e936257d44 bug #3305883 [interface] Table is dropped regardless of confirmation 2011-05-22 22:01:47 +05:30
Madhura Jayaratne
b091f91f92 bug #3301249 [interface] Iconic table operations does not remove inline edit label 2011-05-17 22:15:58 +05:30
Madhura Jayaratne
8bad4aea1e Bug #3302457 - Inline edit and $cfg['PropertiesIconic'] 2011-05-15 21:15:35 +05:30
Madhura Jayaratne
626477ac8f Bug #3295529 - SQL tab multiple AJAX requests on one click 2011-05-01 11:31:55 +05:30
Marc Delisle
8f16bfbc53 Move common code into a function 2011-04-24 08:56:54 -04:00
Piotr Przybylski
10867bb1fc fix column highlighting for cases where big T is not displayed (eg. in information_schema tables) 2011-04-16 21:23:24 +02:00
Madhura Jayaratne
b64abd63f8 Bug #3286111 Inline edit save hides mysql message 2011-04-14 07:06:45 +05:30
Madhura Jayaratne
cc05f48f3c Bug #3207730 [AJAX] Inline edit and Relational display column 2011-04-11 10:55:58 +05:30
Madhura Jayaratne
63dd25baac Code formatting to improve readability. 2011-04-10 20:33:17 +05:30
Marc Delisle
5d147c25af Bug #3281316 Loading message stays on screen for too long 2011-04-10 09:01:31 -04:00
Madhura Jayaratne
e083d8438a Bug #3281333 AJAX response does not remove old contents 2011-04-09 12:03:56 +05:30
onebighack
f6fb9b4678 Patch #3249406 Error in updating using inline edit 2011-04-07 13:01:57 -04:00
Marc Delisle
401d211d70 - Avoid code duplication
- Use standard $ prefix for jQuery object
2011-04-02 06:22:18 -04:00
Madhura Jayaratne
519e7b39e1 Bug #3243672 Inline Edit - SQL syntax error #1064 - comma-separated field.
And surround table name and field name with quotes.
2011-04-01 00:41:10 +05:30
Tyron Madlener
0762bddfd1 Hide 'Loading' message once request is done, not on 5 sec timeout.
Applied to every loading message that doesn't show a success/error
feedback message.
2011-03-31 14:36:11 +02:00
Marc Delisle
bb3f6affea Obey the ShowSQL directive also for inline edit 2011-03-26 07:57:02 -04:00
Madhura Jayaratne
2038266f88 For Bug #3207730 Inline edit and Relational display column 2011-03-23 18:08:35 +05:30
Marc Delisle
701a668d35 For bug #3220370, generate UPDATE only for modified columns and avoid POSTing if not needed 2011-03-23 07:47:24 -04:00
Marc Delisle
d83e6e2b85 Use jQuery .data() mechanism 2011-03-22 07:30:17 -04:00
Madhura Jayaratne
a5116cd8cf Proper handling of marked and hover classes for inline edit. 2011-03-17 19:59:22 +05:30
Madhura Jayaratne
876fa8fd3d Fixed row marking for vertical mode Edit and Inline Edit 'td's. 2011-03-17 18:50:26 +05:30
Madhura Jayaratne
4e8898121d Clicking on the link, but on 'td', should activate inline edit mode 2011-03-16 22:55:59 +05:30
Madhura Jayaratne
da0fc40022 A better way to handle clashing between row highlighting and inline edit. 2011-03-15 20:57:47 +05:30
Madhura Jayaratne
f599afd843 Proper indentation. 2011-03-12 08:18:11 +05:30
Madhura Jayaratne
ed00eea0a3 Code formatting. Make the code more readable. 2011-03-12 08:09:46 +05:30
Madhura Jayaratne
0068d42f73 Optimize. We can do what is being done in two for-loops in one for-loop and avoid unnecessary temporary variables. 2011-03-12 07:59:29 +05:30
Madhura Jayaratne
2e2474eb68 Identify non inline-editable columns based on class 'inline_edit'. 2011-03-12 07:52:45 +05:30
Madhura Jayaratne
7ef6fbaabc Fix highlighting for save/hide of inline-edit 2011-03-12 06:09:09 +05:30
Madhura Jayaratne
4fdae9a0e0 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-03-10 23:25:35 +05:30
Madhura Jayaratne
a5ef7d4b39 Bug #3187141 - Double query box shown 2011-03-10 23:20:57 +05:30
Piotr Przybylski
a46a49b747 make PMA_changeClassForColumn work about 1/4th faster 2011-03-10 18:48:16 +01:00
Marc Delisle
896a6e0883 Improve formatting 2011-03-07 08:34:56 -05:00
onebighack
db276b0657 Bug #3200579 part 2 - Hiding inline edit problematic for BLOB transformations 2011-03-07 08:29:13 -05:00
onebighack
1b94d12c3e -Bug #3200692 Second click on Inline edit
-Bug #3200579 Hiding Inline edit problematic for text/geometry/blob:
partial fix
2011-03-06 06:09:52 -05:00
Madhura Jayaratne
74a61f61da Surround DB name and field names with quotes to distinguish them from SQL key words. 2011-03-06 02:30:34 +05:30
onebighack
b9a6342a17 Bug #3200458 Hiding Inline edit problematic for foreign keys 2011-03-05 14:38:46 -05:00
Marc Delisle
0242446e46 Localize hide/submit messages
Replace submit with Save (an existing message)
2011-03-05 07:13:43 -05:00
Marc Delisle
555f5fa8c4 Remove author name from variable name
Tidy jQuery code
Proper indentation
2011-03-05 06:57:24 -05:00
onebighack
2630f3e34c Patch #3195202 Inline edit Hide 2011-03-05 06:22:50 -05:00
Madhura Jayaratne
abfb718c89 Inline edit extended to fields of type set. 2011-03-01 20:42:51 +05:30
Marc Delisle
9cf81c63ce Inline edit for rows where an <input type="image"> has been generated for the Edit link 2011-02-27 09:44:31 -05:00
Madhura Jayaratne
aa6fe093d6 Inline edit fine-tuned for enum fields 2011-02-24 08:36:01 +05:30
Marc Delisle
3d8300a70b Use the var keyword and correctly end the statement 2011-02-23 12:44:32 -05:00
Marc Delisle
9948d179ba Inline edit link not generated when PropertiesIconic is false 2011-02-22 07:46:33 -05:00
Madhura Jayaratne
00ae1a135c When multiple raws are being inline edited their controls should not clash with each other. 2011-02-21 02:07:52 +05:30
Madhura Jayaratne
c3501a3839 Better coordination between 'null' checkbox and corresponding select/editor. 2011-02-21 01:15:40 +05:30
Marc Delisle
bcc3ed17a2 Temporary trick to add a spacer, feel free to improve... 2011-02-19 17:47:05 -05:00
Madhura Jayaratne
52820d2d70 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-02-20 01:19:32 +05:30
Madhura Jayaratne
7bed385289 Uncheck 'null checkbox' when the editor area is changed. 2011-02-20 01:05:37 +05:30
Madhura Jayaratne
c5b0afd16e Tab and white space clean up. 2011-02-20 01:03:07 +05:30
Madhura Jayaratne
81974e6d93 CSS styles for null checkbox and for NULL values in table cells. 2011-02-20 00:46:29 +05:30