Commit Graph

305 Commits

Author SHA1 Message Date
Marc Delisle
db19812acf Merge branch 'QA_4_4' 2015-08-05 09:46:18 -04:00
Dan Ungureanu
bbd581a906 Fixes #11320.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-05 09:43:14 -04:00
Madhura Jayaratne
805b0d7860 Fix #11322 Missing null checkbox when grid editing a null cell
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-27 12:29:26 +05:30
Marc Delisle
7f7e45de6b Merge branch 'QA_4_4' 2015-07-13 06:54:21 -04:00
Jack Smith
e88f290d44 Remove confusing second inline edit window (bug #4826)
When a long truncated text field is being inline edited it pops up a second edit window which could be confusing. Removed it.

Signed-off-by: Jack Smith <devjacksmith@gmail.com>
2015-07-13 06:52:07 -04:00
Madhura Jayaratne
42a4088943 More local variables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 22:52:09 +05:30
Madhura Jayaratne
81bd7f38af More local variables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-02 20:55:42 +05:30
Nisarg Jhaveri
befe89ad4e Make Scrutinizer Happy
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-30 21:58:21 +05:30
Deven Bansod
1ef602ccfd RFE#1359 - Ctrl Navigation in Grid Editor
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-04 12:18:13 +05:30
Madhura Jayaratne
4354049fde Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-22 19:04:49 +05:30
Madhura Jayaratne
6c7ee747b7 #4918 Date field popup dialog position bug
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-22 14:55:25 +05:30
Marc Delisle
bb7a254ce4 rfe #1146 Show original size of truncated columns
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-30 09:42:24 -04:00
Madhura Jayaratne
d1b77a2949 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-15 09:00:32 +05:30
Madhura Jayaratne
91da1a8f38 Fix issues related to number of decimal places in time
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-15 08:55:44 +05:30
Marc Delisle
77542d0b5a Merge branch 'QA_4_4' 2015-04-02 09:00:14 -04:00
Dan Ungureanu
502b91d861 BUG #4827. TEXT formatting does not work after inline editing.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-04-02 08:58:05 -04:00
Madhura Jayaratne
d8784a3889 Another bad line break
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 18:59:32 +05:30
Madhura Jayaratne
6b1d977e33 Fix bad line break
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 18:58:18 +05:30
Atul Pratap Singh
3fe1604b7f Merge commit 'c085d0d' 2015-03-13 23:24:28 +05:30
Atul Pratap Singh
4e8ac3c796 Merge branch 'QA_4_3' into QA_4_4 2015-03-13 22:45:23 +05:30
Atul Pratap Singh
17d9d82c41 Remove unnecessary checkbox repositioning
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:

	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-03-13 22:44:37 +05:30
Atul Pratap Singh
c085d0d56a datepicker: correct position on clicking on icon and prevent closing on outside click
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-03-13 22:22:36 +05:30
Atul Pratap Singh
5b1eb0752f Remove unnecessary checkbox repositioning
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-03-13 17:52:34 +05:30
Atul Pratap Singh
45fbe0bc2a Fix bug#4797 Inline edit of DATETIME fields, can't change month nor time
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-03-12 23:52:18 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Atul Pratap Singh
cea9aa9688 Revert c9c280e992 and b39933c37b
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2015-03-06 18:20:35 +05:30
Marc Delisle
c3410b3e21 Merge branch 'QA_4_3' into QA_4_4 2015-03-05 15:16:55 -05:00
Daniyal Shahid
b39933c37b Fix for #4788
Signed-off-by: Daniyal Shahid daniyal36@gmail.com

Added a top margin to the datepicker after a certain window height so that null checkbox is visible
2015-03-06 00:34:37 +05:00
Madhura Jayaratne
7a95986644 Show milliseconds as well
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-20 17:17:39 +05:30
Madhura Jayaratne
2970056de6 Display actual datetime and pad the value with zeros when using calendar
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-20 16:20:05 +05:30
Madhura Jayaratne
85aa480be7 Remove transformation related code from makegrid.js and functions.js
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-20 12:53:54 +05:30
Madhura Jayaratne
e9c9bcc72a Fix persisting column visibility to permanent storage
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-16 19:04:11 +05:30
Madhura Jayaratne
5ae7e60a76 Define variable first
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-13 13:28:18 +05:30
Madhura Jayaratne
7a9d9f4f14 rfe #1241 Browse Field -> Search. Also includes cleaning up of code related to the previous implementation at ade942bb09
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-10 16:08:19 +05:30
Marc Delisle
3039087487 jQuery.browser() has been removed in 1.9
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-04 08:52:09 -05:00
Marc Delisle
0744c5961f Merge branch 'QA_4_3' 2015-02-04 08:37:31 -05:00
Marc Delisle
f14766def9 Merge commit '0768e38' 2015-02-04 08:36:58 -05:00
Marc Delisle
3de60b4542 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-04 08:34:48 -05:00
Madhura Jayaratne
77d66242e4 Transformation for JSON
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-02 17:51:23 +05:30
Aayush
0768e38508 bugs#3935 Table Header issue in Safari 5.0.5
Signed-off-by: Aayush Anand aayushism12@gmail.com
2015-02-02 11:54:22 +05:30
Marc Delisle
a1b908a9b7 Merge commit 'd33df18' 2015-01-19 12:40:19 -05:00
Ashutosh Dhundhara
c9c280e992 bug#4712: Wrongly positioned date-picker while Grid-Editing.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2015-01-19 12:21:54 +05:30
Marc Delisle
89de2f6227 Merge commit 'cf4d945' 2015-01-04 15:34:24 -05:00
Hugues Peccatte
cf4d94527c Fix #4416 New lines are removed when grid editing
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-01-03 22:40:54 +01:00
Madhura Jayaratne
903c481242 Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 10:31:12 +05:30
Madhura Jayaratne
d03c3adff4 More instances of .live() and .die() replaced with .on() and .off()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 18:07:58 +05:30
Madhura Jayaratne
a362667e3c Use class attribute instead of id for sqlqueryresults
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 10:44:36 +05:30
Madhura Jayaratne
698813db3d Cleanup makegrid.js and do scoped selections
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 15:32:46 +05:30
Madhura Jayaratne
f5a943e8a1 Use class attribute to identify correct sql query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 13:43:30 +05:30
Madhura Jayaratne
fc61161883 Pass save_cells_at_once using class attribute
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 12:45:13 +05:30