holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,184 Commits 27 Branches 330 Tags 157 MiB
0d5e16e69d
Commit Graph

4799 Commits

Author SHA1 Message Date
Hadi Nategh
186a6b968f Revert description widget changes from commit 52279 2015-03-26 12:42:16 +00:00
Hadi Nategh
caffcee09d Fix eml attached files not getting opened in popup 2015-03-26 10:15:36 +00:00
Hadi Nategh
59a47e405a Fix URL for expose media in description widget 2015-03-26 08:48:23 +00:00
Nathan Gray
310bbe6f10 Fix select options with ${row} were not always found 2015-03-25 21:54:41 +00:00
Nathan Gray
9c28235334 Fix select options with ${row} were not always found 2015-03-25 21:45:57 +00:00
Nathan Gray
ad070b221c Fix file information action 2015-03-25 21:19:59 +00:00
Hadi Nategh
1067a771c9 Use text-overflow-ellipsis for very long infolog titles in listview to avoid collision with info_id 2015-03-25 17:57:03 +00:00
Ralf Becker
5887bc4313 * Mail, Filemanager: use now same handling, pdf, text or html are opened now in popup, fixes viewing of attachments using mobile theme 2015-03-25 17:48:24 +00:00
Hadi Nategh
6704f41dcc Do not show thumbnail indicator for image widget expose view 2015-03-24 18:17:16 +00:00
Hadi Nategh
320816b4cb Do not show thumbnail indicator for image widget expose view 2015-03-24 18:16:10 +00:00
Hadi Nategh
fe9f480212 Prepare description widget for mime handling 
-Add mime_data attribute representing hash for data stored on service-side with egw_link::(get|set)_data()
-Do not show thumbnail indicator for expose view 
-Bind click handler when it is neccessary to handle a link
 2015-03-24 18:08:57 +00:00
Nathan Gray
d3c7e21144 After we find a match, no need to keep looking. 2015-03-24 15:23:28 +00:00
Nathan Gray
99657a094b After we find a match, no need to keep looking. 2015-03-24 15:18:19 +00:00
Hadi Nategh
89a9ea4bb1 Some more WIP of attachment mime handling 2015-03-24 11:40:06 +00:00
Ralf Becker
6f2a7ca40c fix sub-template of modified etemplate (WebDAV Url) wont work, as cache-buster / timestamp got added without download prefix, causing WebDAV to not find sub-template, because it treats everything but "?download" as part of URL 2015-03-24 10:52:43 +00:00
Ralf Becker
14cd9dfb34 fix sub-template of modified etemplate (WebDAV Url) wont work, as cache-buster / timestamp got added without download prefix, causing WebDAV to not find sub-template, because it treats everything but "?download" as part of URL 2015-03-24 10:52:14 +00:00
Hadi Nategh
70510ca506 Use text-overflow-ellipsis for very long infolog titles in listview to avoid collision with info_id 2015-03-23 17:00:22 +00:00
Hadi Nategh
9257177870 Give 100% width to toolbar's actionlist 2015-03-23 16:17:16 +00:00
Hadi Nategh
7c6bd961a7 Give 100% width to toolbar's actionlist 2015-03-23 16:16:33 +00:00
Hadi Nategh
cf76bf2df5 Make query callback parameters more useful (& documented) by passing the link widget instead of response 2015-03-23 13:27:25 +00:00
Ralf Becker
6f804b58e8 * All apps: nummeric custom-fields (float or new integer) sort nummeric in lists 2015-03-23 08:41:51 +00:00
Ralf Becker
8431629ed2 * All apps: nummeric custom-fields (float or new integer) sort nummeric in lists 2015-03-23 08:38:30 +00:00
Ralf Becker
cb463d1492 fix not working hbox for selectbox, they were not on one line 2015-03-20 20:31:15 +00:00
Ralf Becker
e7bdc85530 fix not working hbox for selectbox, they were not on one line 2015-03-20 20:30:33 +00:00
Ralf Becker
f275cbe52f empty-label was not translated if set via (legacy-)options 2015-03-20 19:26:14 +00:00
Ralf Becker
dff07e68a5 empty-label was not translated if set via (legacy-)options 2015-03-20 19:25:51 +00:00
Ralf Becker
8c8e61630d allow to submit partial content by passing a container(-widget) to etemplate2.submit() 
- not send content is not validated and therefore not passed to server-side callback (currently only implemented for text-, select- and checkbox)
- new method et2_grid.getRow(_widget) to return a fake row container to pass it etemplate2.submit() --> implemented a real row-container for et2_grid
- new output_mode=4 for etemplate_new::exec() to force a json response, like form was submitted from client-side
--> allows to use full server-side validation for ajax like calls submitting only partial content
 2015-03-20 15:39:35 +00:00
Ralf Becker
d4c0992f45 do NOT send select-options for each autorepeated row for id like "set[$row_cont[id]][value]" and fix merging of app preset options with type-specific ones to not overwrite the later 2015-03-20 15:38:40 +00:00
Ralf Becker
7fa86b19ca do NOT send select-options for each autorepeated row for id like "set[$row_cont[id]][value]" and fix merging of app preset options with type-specific ones to not overwrite the later 2015-03-20 15:38:20 +00:00
Ralf Becker
63a7af621d allow to submit partial content by passing a container(-widget) to etemplate2.submit() 
- not send content is not validated and therefore not passed to server-side callback (currently only implemented for text-, select- and checkbox)
- new method et2_grid.getRow(_widget) to return a fake row container to pass it etemplate2.submit() --> implemented a real row-container for et2_grid
- new output_mode=4 for etemplate_new::exec() to force a json response, like form was submitted from client-side
--> allows to use full server-side validation for ajax like calls submitting only partial content
 2015-03-20 02:12:33 +00:00
Ralf Becker
caa1f2247d onkeypress handler for textbox and number widget 2015-03-19 21:21:29 +00:00
Ralf Becker
21aa3eb325 onkeypress handler for textbox and number widget 2015-03-19 21:21:03 +00:00
Ralf Becker
aa930e75d6 fix javascript error stalling eT2 rendering, if option label is null eg. because it could not be json encoded because of non-utf8 chars in it 2015-03-19 10:54:49 +00:00
Ralf Becker
66ecee59a5 fix javascript error stalling eT2 rendering, if option label is null eg. because it could not be json encoded because of non-utf8 chars in it 2015-03-19 10:54:29 +00:00
Ralf Becker
35f6de7f2a fix warning 2015-03-19 10:52:34 +00:00
Ralf Becker
12c308cd71 backport of several eT2 fixes from work on ranking / result-service app: 
r52153: implement part attribute with values "header" and "footer" to put rows in thead or tfoot instead of tbody of table
r52163: stop etemplate_widget_template::instance from returning a stdClass object for a not found template after content-expanding, leading to a fatal error in etemplate_widget line 338
r52175: there should be no validation for disabled widgets
r52176: $cont is NOT root but current name-space in old eTemplate, leaving now identical $_cont for now
r52194: fixed eT2 data returned from client for case where name-space contains more then one component eg. "nm[rows]"
r52195: fixed not run validation on server-side for templates included via template tag
r52196: implement formatting of numbers in read-only widget
 2015-03-18 22:16:15 +00:00
Ralf Becker
fac9f796a8 implement formatting of numbers in read-only widget 2015-03-18 22:04:47 +00:00
Ralf Becker
d40f41950b fixed not run validation on server-side for templates included via template tag 2015-03-18 21:31:16 +00:00
Ralf Becker
7269552342 fixed eT2 data returned from client for case where name-space contains more then one component eg. "nm[rows]" 2015-03-18 21:30:22 +00:00
Nathan Gray
0db176f0b2 No need to strip out mime again, it's already removed by egw_link 2015-03-18 17:28:49 +00:00
Hadi Nategh
1108e0b30d Focus on the first input field only if the field is empty for mobile theme 2015-03-18 16:56:39 +00:00
Hadi Nategh
feae7b3638 Focus on the first input field only if the field is empty for mobile theme 2015-03-18 16:55:53 +00:00
Ralf Becker
cc851bb6e8 $cont is NOT root but current name-space in old eTemplate, leaving now identical $_cont for now 2015-03-17 23:15:17 +00:00
Ralf Becker
41671d733a there should be no validation for disabled widgets 2015-03-17 22:00:54 +00:00
Nathan Gray
b68d7f7274 Include lettersearch when forcing preferences 2015-03-17 18:24:50 +00:00
Hadi Nategh
26057f6848 Fix file upload from file_selection dialog not working in IE and Safari 2015-03-17 17:27:00 +00:00
Ralf Becker
387d5053dd stop etemplate_widget_template::instance from returning a stdClass object for a not found template after content-expanding, leading to a fatal error in etemplate_widget line 338 2015-03-17 14:07:20 +00:00
Ralf Becker
3d05a43417 implement part attribute with values "header" and "footer" to put rows in thead or tfoot instead of tbody of table 2015-03-17 09:44:14 +00:00
Nathan Gray
984bbf4d44 Include lettersearch when forcing preferences 2015-03-16 22:28:18 +00:00
Hadi Nategh
7f330b1e89 Change category icon in all apps 2015-03-12 17:01:11 +00:00
Nathan Gray
5a4ed19e73 Make query callback parameters more useful (& documented) by passing the link widget instead of response 2015-03-12 16:22:45 +00:00
Hadi Nategh
1f177aace4 Change category icon in all apps 2015-03-12 12:39:49 +00:00
Ralf Becker
d9f45ae414 add missing "rawstring" type to et2_validTypes 2015-03-11 15:06:21 +00:00
Ralf Becker
25b3493767 add missing "rawstring" type to et2_validTypes 2015-03-11 15:06:06 +00:00
Ralf Becker
2e094c6f76 new attribute type "rawstring" not doing html-entity decoding used just for "value" attribute 2015-03-11 12:13:32 +00:00
Ralf Becker
f3869d366e new attribute type "rawstring" not doing html-entity decoding used just for "value" attribute 2015-03-11 12:12:52 +00:00
Nathan Gray
b1dbe2ab38 Apply duration settings to gantt columns 2015-03-10 21:11:36 +00:00
Nathan Gray
5ffdc7b2bb Apply duration settings to gantt columns 2015-03-10 21:05:57 +00:00
Ralf Becker
4c82f2cee2 fixed account-selection-type "primary_group" to only show membership-groups by default 2015-03-10 16:06:22 +00:00
Hadi Nategh
8ec7d08589 Do not log toolbar widget content in error log 2015-03-10 15:56:09 +00:00
Hadi Nategh
1c8b6a5976 Do not log toolbar widget content in error log 2015-03-10 15:55:29 +00:00
Ralf Becker
60f1ca4033 fixed account-selection-type "primary_group" to only show membership-groups by default 2015-03-10 15:40:27 +00:00
Hadi Nategh
564f958fbb Make sure there is a property before triger to delete it, because IE complains about an undefiend object 2015-03-10 10:28:56 +00:00
Hadi Nategh
0e4cb1bdb6 Make sure there is a property before triger to delete it, because IE complains about an undefiend object 2015-03-10 10:27:33 +00:00
Nathan Gray
74135e104a Fix missing column filters on first load 2015-03-09 15:33:10 +00:00
Nathan Gray
26aa7b3438 Fix missing column filters on first load 2015-03-09 15:31:30 +00:00
Hadi Nategh
c3b75cdbf4 Give a type button to toolbar's button to not be able to do auto submission, because of our form tag 2015-03-05 14:55:28 +00:00
Hadi Nategh
3346821c5d Give a type button to toolbar's button to not be able to do auto submission, because of our form tag 2015-03-05 14:54:47 +00:00
Klaus Leithoff
80255f9611 pending translations from our translation server 2015-03-05 14:09:51 +00:00
Klaus Leithoff
a27d5963c5 pending translations from our translation server 2015-03-05 09:04:21 +00:00
Nathan Gray
83afae3960 Fix some bugs causing missing translations in home 2015-03-04 16:48:37 +00:00
Nathan Gray
a957ac9ea2 Fix some bugs causing missing translations in home 2015-03-04 16:46:12 +00:00
Nathan Gray
d703403f52 Round progress to nearest 10%, as all the apps do 2015-03-04 00:21:25 +00:00
Nathan Gray
fa792cd6ae Round progress to nearest 10%, as all the apps do 2015-03-04 00:19:41 +00:00
Hadi Nategh
e60d85d4f8 Fix categories multi-checkboxes flick on mouseover 2015-03-03 15:29:47 +00:00
Hadi Nategh
95c8bcb2c4 Fix categories multi-checkboxes flick on mouseover 2015-03-03 15:28:54 +00:00
Hadi Nategh
cc71dba657 Fix the splitter percentage size to 2 trialing decimals 2015-03-03 13:50:46 +00:00
Hadi Nategh
854e8b123d Fix the splitter percentage size to 2 trialing decimals 2015-03-03 13:50:11 +00:00
Hadi Nategh
ea610d7338 Make sure the prefSize gets set in splitter 2015-03-03 11:45:01 +00:00
Hadi Nategh
0ffad430f0 Make sure the prefSize gets set in splitter 2015-03-03 11:43:48 +00:00
Nathan Gray
97acfb8081 For saving links use similar file download code as filemanager uses, fixes unwanted navigation 2015-03-02 17:22:06 +00:00
Hadi Nategh
c481d5dd62 Save splitter preferd size base on percentage instead of pixel, because user may switch between different screen with different resolution 2015-03-02 15:17:01 +00:00
Nathan Gray
35fc079c7f * Additional columns for Gantt chart 2015-02-27 17:31:44 +00:00
Nathan Gray
b4671c6460 For saving links use similar file download code as filemanager uses, fixes unwanted navigation 2015-02-27 17:20:30 +00:00
Nathan Gray
60e13cd679 Documentation update to be a little more clear about 'none' option 2015-02-26 16:16:00 +00:00
Hadi Nategh
479f917c09 Build expose gallery only for filemanager nm, other nms may have expose view but not neccessary would be a gallery (eg. resources) 2015-02-26 12:54:59 +00:00
Hadi Nategh
caf5a69a8f Give enough delay to toolbar's drag action in order to avoid confusion between dragging and clicking 2015-02-26 09:22:11 +00:00
Hadi Nategh
6c87b988f5 Give enough delay to toolbar's drag action in order to avoid confusion between dragging and clicking 2015-02-26 09:21:24 +00:00
Nathan Gray
9ccb5f7a14 Change the document thumbnails to mark with mimetype icon 2015-02-25 18:07:21 +00:00
Hadi Nategh
32596fb0e0 Implement widget historylog resize handler and fix historylog template in all apps 2015-02-25 16:30:49 +00:00
Hadi Nategh
55ca892f70 Fix image widget calling expose view with wrong value 2015-02-25 13:08:50 +00:00
Hadi Nategh
7d7430c0a6 Save splitter preferd size base on percentage instead of pixel, because user may switch between different screen with different resolution 2015-02-25 11:18:26 +00:00
Hadi Nategh
9c23cb33f4 Fix image widget calling expose view with wrong value 2015-02-25 11:12:47 +00:00
Nathan Gray
87b53d10b8 Store column selection in implicit preference 2015-02-24 20:07:04 +00:00
Hadi Nategh
73dfdc4cf4 Build expose gallery only for filemanager nm, other nms may have expose view but not neccessary would be a gallery (eg. resources) 2015-02-24 17:45:57 +00:00
Hadi Nategh
76091a2e07 Remove toolbar prefs correction code 2015-02-24 16:58:37 +00:00
Hadi Nategh
7e692945cf Avoid collision between datepicker calendar dialog and date input field, try to use left or right free spaces 2015-02-24 16:56:49 +00:00
Hadi Nategh
b3689526dd Avoid collision between datepicker calendar dialog and date input field, try to use left or right free spaces 2015-02-24 15:51:30 +00:00
Nathan Gray
68c08697c7 Some gantt changes: 
- For project elements, status should be as in element edit (completion %)
- Wrap columns in a div with class based on field, for column specific styling
- Give resources column some hover CSS to display all contents
 2015-02-23 22:16:25 +00:00
Nathan Gray
29d0f737d5 Printing improvements 2015-02-23 18:07:29 +00:00
Hadi Nategh
d8ec75d063 Make sure sortable gets send the request to server with correct menuaction, as jsonq always queued the request from home and that may causes wrong redirection. e.g. sortable grid inside an iframe of an application (mail.sieve) 2015-02-23 11:27:22 +00:00
Hadi Nategh
de79b1eaa3 Remove toolbar prefs correction code 2015-02-23 08:23:42 +00:00
Ralf Becker
0ff1738255 * Safari: fix security warning caused by auto-complete when submitting from https to about:blank 2015-02-20 19:05:17 +00:00
Ralf Becker
370e503dab * Safari: fix security warning caused by auto-complete when submitting from https to about:blank 2015-02-20 19:04:58 +00:00
Nathan Gray
904bc8b19f Better row limiting by using CSS instead of grid's average height 2015-02-19 17:16:39 +00:00
Hadi Nategh
8752f10877 Fix in mobile theme not able to dismiss the context menu: 
- touch and open entries and swip (left/right) over any rows on the next match list will dismiss the context menu
 2015-02-19 12:00:22 +00:00
Hadi Nategh
212e98ccdb Fix in mobile theme not able to dismiss the context menu: 
- touch and open entries and swip (left/right) over any rows on the next match list will dismiss the context menu
 2015-02-19 11:45:05 +00:00
Nathan Gray
b1b1269e0e Entry type / transformer changes 
- better support for entry-types in nextmatch-customfilter
- if transformer changes widget type, run new widget's beforeSendToClient
 2015-02-18 23:04:59 +00:00
Nathan Gray
12b8dc1ed4 Add label attribute 2015-02-18 23:02:35 +00:00
Nathan Gray
5318ebdb21 - Fix JS error when selecting no columns 
- Fix not including selector width caused undesired column resizing
 2015-02-18 17:20:50 +00:00
Nathan Gray
529d154514 * Add ability to select columns to be displayed in gantt chart 2015-02-18 17:03:21 +00:00
Ralf Becker
0fbe4b7ae7 Fix some nextmatch custom field bugs: 
- no custom fields in nm rows when there were none explicitly selected
- Custom field column shown even if none were defined
 2015-02-17 22:04:24 +00:00
Nathan Gray
ae0c757ea2 Fix some nextmatch custom field bugs: 
- no custom fields in nm rows when there were none explicitly selected
- Custom field column shown even if none were defined
 2015-02-17 18:02:10 +00:00
Nathan Gray
e906d4f67a Fix link to no longer pre-selecting last used app 2015-02-17 16:29:05 +00:00
Nathan Gray
286cca54e1 Fix link to no longer pre-selecting last used app 2015-02-17 16:27:29 +00:00
Ralf Becker
e957750106 fixed not shown custom-fields in infolog 2015-02-17 14:36:01 +00:00
Ralf Becker
39115a0985 fixed not shown custom-fields in infolog 2015-02-17 14:35:40 +00:00
Hadi Nategh
5fe98953a1 Fix splitter widget dock to the fullSize if there is no size preference yet 2015-02-17 12:52:49 +00:00
Hadi Nategh
3ead887bf7 Fix splitter widget dock to the fullSize if there is no size preference yet 2015-02-17 12:50:55 +00:00
Ralf Becker
199285ba01 add encoding, eTempalte2 DTD and svn propset svn:keywords Id to all eTemplates 2015-02-17 10:00:12 +00:00
Ralf Becker
d432642f1a add encoding, eTempalte2 DTD and svn propset svn:keywords Id to all eTemplates 2015-02-17 09:55:05 +00:00
Hadi Nategh
dbe3e43c9a Missing commit from commit #51809 2015-02-17 09:12:19 +00:00
Hadi Nategh
bd7080dce6 Missing commit from commit #51809 2015-02-17 09:11:38 +00:00
Ralf Becker
cd0d8adad5 pending translations from our translation server 2015-02-17 09:03:29 +00:00
Ralf Becker
18fafed2a4 pending translations from our translation server 2015-02-17 08:52:58 +00:00
Ralf Becker
5c82ac5465 * ProjectManager/PostgreSQL: fix SQL error in project-list caused by new resources column 
fix columns containing commas as part of function calls getting split incorrect in fix_group_by_columns
 2015-02-16 10:24:29 +00:00
Ralf Becker
e87c0dfb1a * ProjectManager/PostgreSQL: fix SQL error in project-list caused by new resources column 
fix columns containing commas as part of function calls getting split incorrect in fix_group_by_columns
 2015-02-16 10:22:23 +00:00
Ralf Becker
3ec789adfd added more docu and some constants with sane names 2015-02-13 09:40:50 +00:00
Ralf Becker
17f83d89c7 add modification time of files to thumbnail url to allow longer caching, also set_time_limit(0) for pdf thumbnails, as they might take > 90s 2015-02-13 08:27:08 +00:00
Nathan Gray
e1e870c174 Add initial support for PDF thumbnails 2015-02-12 18:24:47 +00:00
Hadi Nategh
dbdc14e376 Special handling when printing for splitter 2015-02-12 12:44:22 +00:00
Ralf Becker
5a13ccbbfc remove old form button stuff, as it get triggered again now that et2_container is a form 2015-02-12 12:22:15 +00:00
Ralf Becker
64b4ca3b5a Change media logic to also support mime=false 2015-02-12 08:36:42 +00:00
Ralf Becker
aff689e054 * All apps: improved printing: CRM view and given number or rows 
r51716: Extend printing support to work with multiple etemplates on the printed tab
r51717: Better handling of printing of various row quantities:
- print < loaded row count
- print > loaded row count
- print all rows
 2015-02-12 08:06:50 +00:00
Nathan Gray
8926574a35 Change media logic to also support mime=false 2015-02-11 21:08:53 +00:00
Nathan Gray
92c26d156d Better handling of printing of various row quantities: 
- print < loaded row count
- print > loaded row count
- print all rows
 2015-02-11 20:00:22 +00:00
Nathan Gray
82f36e6de4 Extend printing support to work with multiple etemplates on the printed tab 2015-02-11 18:05:14 +00:00
Hadi Nategh
2edc2d831b Implement Document Type Definition (DTD) generator 
- DTD generator is integrated to eTemplate2 Reference (widget browser)
 2015-02-11 15:17:10 +00:00
Hadi Nategh
423e2abf77 Fix mousewheel handler on indicators in expose view causes problem, and not working in FF 2015-02-11 12:05:28 +00:00
Hadi Nategh
905bbc9c16 Fix mousewheel handler on indicators in expose view causes problem, and not working in FF 2015-02-11 11:21:40 +00:00
Ralf Becker
ece6094dc6 cache based on vfs-url of image not its path which could be a sharing url 2015-02-11 11:18:29 +00:00
Ralf Becker
8f4c4237ed cache based on vfs-url of image not its path which could be a sharing url 2015-02-11 11:06:01 +00:00
Hadi Nategh
6283b46764 Pass an array as drop target. Fixes drag & drop files only worked on input nodes 2015-02-11 10:35:32 +00:00
Hadi Nategh
4373545152 Fully clear existing ActionObject before re-using it. Fixes context menu missing after close & re-open home tab. 2015-02-11 10:35:05 +00:00
Nathan Gray
fa014edca0 Special handling when printing for splitter 2015-02-10 23:03:35 +00:00
Nathan Gray
6917a60843 Gantt backports from trunk: 
- updating from Gantt now enabled
 2015-02-10 20:03:18 +00:00
Nathan Gray
0411ff02ec Pass an array as drop target. Fixes drag & drop files only worked on input nodes 2015-02-10 19:49:31 +00:00
Nathan Gray
459b15ac93 Fully clear existing ActionObject before re-using it. Fixes context menu missing after close & re-open home tab. 2015-02-10 19:34:46 +00:00
Hadi Nategh
44f7830f14 Make sure all labels are pre-wrapped 
-Fix labels in nm do not show white-spaces
- Fix not displaying white-spaces of tracker description
 2015-02-10 14:46:25 +00:00
Hadi Nategh
3fffe6f2ac Make sure all labels are pre-wrapped 
-Fix labels in nm do not show white-spaces
 2015-02-10 14:21:01 +00:00
Hadi Nategh
fc503e285e Make the autocomplete iframe helper invisible 2015-02-10 13:17:02 +00:00
Hadi Nategh
cdb1f042a2 Make the autocomplete iframe helper invisible 2015-02-10 13:15:48 +00:00
Ralf Becker
a964f2e8f2 - Allow app attribute to be specified in the template file, not just at run-time 
- Use app attribute to fix infolog customfields in addressbook CRM view
 2015-02-10 09:38:15 +00:00
Ralf Becker
46277505c5 Nextmatch print styling 
- Hide nextmatch header
- Change styling of selectboxes in row header
r51650: Dont print AppboxHeader
 2015-02-10 08:09:06 +00:00
Ralf Becker
27395c6adc backport r51645: Fixes for nextmatch changing row template 
- Remove & free children from previous template (fixes hundreds of hidden children)
- Init activeFilters.col_filter filters from settings, then use activeFilters instead of options.settings (fixes filters changed)
 2015-02-10 08:04:42 +00:00
Nathan Gray
dd30ac28f4 - Allow app attribute to be specified in the template file, not just at run-time 
- Use app attribute to fix infolog customfields in addressbook CRM view
 2015-02-10 00:13:31 +00:00
Nathan Gray
fce10a2337 Nextmatch print styling 
- Hide nextmatch header
- Change styling of selectboxes in row header
 2015-02-09 23:33:03 +00:00
Nathan Gray
eefbb1a21d Fixes for nextmatch changing row template 
- Remove & free children from previous template (fixes hundreds of hidden children)
- Init activeFilters.col_filter filters from settings, then use activeFilters instead of options.settings (fixes filters changed)
 2015-02-09 20:43:26 +00:00
Hadi Nategh
d0f37ac53c Fix resize method for templates with height bigger than screen.availHeight 2015-02-09 11:49:33 +00:00
Hadi Nategh
34d5ffea62 Fix resize method for templates with height bigger than screen.availHeight 2015-02-09 11:28:20 +00:00
Ralf Becker
28d6023d77 log again not found template as error instead of poping up an alert 2015-02-06 17:24:28 +00:00
Ralf Becker
730615ce4e log again not found template as error instead of poping up an alert 2015-02-06 17:23:58 +00:00
Ralf Becker
6625ffdde4 * All apps: printing of lists improved a lot, asks now how many lines to print 
r51437: Work in progress of printing nextmatches, still needs some prettying up & edge case testing
r51453: Bug fixes on nextmatch printing
 - fix loaded rows check
 - fix hidden etemplate check
r51454: Printing CSS improvements
r51588: Attempt to get nextmatch printing always on the page (landscape)
r51589: Attempt to get nextmatch printing always on the page (landscape) - put things back if they cancel at nextmatch dialog
r51612: disable footer for print
 2015-02-06 13:36:25 +00:00
Hadi Nategh
4249dca91d * All apps: Activate cross-browser autocomplete 2015-02-06 13:23:40 +00:00
Hadi Nategh
66c6e5203e Fix toolbar broken style after jquery update 2015-02-06 12:10:01 +00:00
Hadi Nategh
e0f24f91a7 * Filemanager/Expose view: Fix following issues: 
-Fix miss calculation of accurate position of active slide on thumbnail indicator
-Fix slide navigation with keyboard always pops up thumbnail indicator, no respect to fullscreen mode
-Fix jumping out of the fullscreen slide show by toggling on spacebar pause/play key
-Make the thumbnail indicator scrolling faster
 2015-02-06 11:59:26 +00:00
Hadi Nategh
303b10377f Do not exit of fullscreen mode on slideshow pause for toggleFullscreenOnSlideshow 2015-02-06 11:35:49 +00:00
Hadi Nategh
0836c6a520 Chanage toggleFullscreenOnSlideShow default behavior, and disable close on slide click 2015-02-06 11:14:24 +00:00
Ralf Becker
1743f9c980 allways create thumbnail, as returning default (now 128px big) thumbnail is more wired 2015-02-06 10:46:38 +00:00
Ralf Becker
78a5f0fe05 allways create thumbnail, as returning default (now 128px big) thumbnail is more wired 2015-02-06 10:46:22 +00:00
Hadi Nategh
3bfee6c6dd Remove expose view loading and make indicator scrolling animation faster 2015-02-06 10:02:38 +00:00
Hadi Nategh
03e1a14274 Make sure expose view indicators always displays on as we need to calculate the active slide position 
-Fix miss calculation of accurate postion of active slide on thumbnail indicator
-Fix slide navigation with keyboard always popups controls, no respect to fullscreen mode
 2015-02-06 09:37:47 +00:00
Ralf Becker
7b99be3783 Fix expose view shows loading icon even if the slide are loaded 2015-02-06 08:35:20 +00:00
Nathan Gray
bc3ffae167 Attempt to get nextmatch printing always on the page (landscape) - put things back if they cancel at nextmatch dialog 2015-02-05 21:57:20 +00:00
Nathan Gray
2cf897b05a Attempt to get nextmatch printing always on the page (landscape) 2015-02-05 21:52:29 +00:00
Hadi Nategh
166a041e55 Fix expose view shows loading icon even if the slide are loaded 2015-02-05 15:14:23 +00:00
Hadi Nategh
e42c5e3b02 Fix toolbar broken style after jquery update 2015-02-05 11:52:27 +00:00
Nathan Gray
b7d5391238 Fix account selection widget when preference is 'popup' 2015-02-04 23:18:45 +00:00
Hadi Nategh
ec5ef7c1c8 Add button type to et2_buttons in order to stop default browser submit behavior 
-Fix addressbook and tracker nm search opens new popup
 2015-02-04 17:31:23 +00:00
Hadi Nategh
2554c30da7 Fix security error about autocomplete form happens only in FF 2015-02-04 09:40:52 +00:00
Ralf Becker
b80f34a36a remove old form button stuff, as it get triggered again now that et2_container is a form 2015-02-04 08:38:41 +00:00
Hadi Nategh
13684d4903 Activate cross-browser autocomplete 
- Replace et2_contianer from DIV to FORM
- Add autocomplete fixer to submit action
- Add autocomplete fixer to nextmatch search box
 2015-02-03 17:42:32 +00:00
Hadi Nategh
0e525fd13a Do not add conrtrols class if it's on slideshow mode 2015-02-03 12:19:29 +00:00
Hadi Nategh
c9b98028ef Do not add conrtrols class if it's on slideshow mode 2015-02-03 12:18:43 +00:00
Hadi Nategh
84560a0496 Implement resize function for htmlarea widget in order to cordinate htmlNode's height to window size 2015-02-03 11:22:06 +00:00
Hadi Nategh
cce240fa5b Implement resize function for htmlarea widget in order to cordinate htmlNode's height to window size 2015-02-03 11:11:02 +00:00
Nathan Gray
41cfbda909 - Change gantt widget to be an input widget to support change events, so we can have custom change handling 
- Fix task progress
 2015-02-02 23:36:16 +00:00
Nathan Gray
1fd14256f7 Make sure url has a value before matching, prevents errors with some dialogs 2015-02-02 23:32:03 +00:00
Nathan Gray
e6e01758cc Make sure url is set, prevents errors with some dialogs 2015-02-02 23:28:27 +00:00
Ralf Becker
1177acd3d3 fix clicking on favorite in filemanager does not work when showing shared files (or any other view then current index-url), thought setting of favorite still fails 
r51522: Update favorite GET fallback to use new style of favorite
 2015-02-02 17:28:54 +00:00
Nathan Gray
3ec43f0421 Update favorite GET fallback to use new style of favorite 2015-02-02 17:19:20 +00:00
Ralf Becker
95a85c6cf5 fix clicking on favorite in filemanager does not work when showing shared files (or any other view then current index-url), thought setting of favorite still fails 2015-01-30 16:59:31 +00:00
Hadi Nategh
bb8920aa3c Revert the autocomplete feature 2015-01-30 16:00:07 +00:00
Hadi Nategh
af355330d0 Revert the autocomplete feature 2015-01-30 15:59:27 +00:00
Hadi Nategh
e9ebd97e78 * Filemanager/Expose view: enhancements 
-Fullscreen feature
-Loading on thumbnail scrolling
-Fix thumbnail not being loaded for the first time
 2015-01-30 15:50:57 +00:00
Hadi Nategh
4cd8d64130 Expose view enhancement: Load next media to gallery by scrolling on thumbnails 2015-01-30 12:00:54 +00:00
Hadi Nategh
8a2bf6a616 Fix some issues in expose view: 
-Make indicator available for the first time load to be abale to calculate the correct active thumbnail position
-Make sure the indicators always are arranged in one line
 2015-01-30 10:56:15 +00:00
Hadi Nategh
b193dc0733 Fix expose view loading for the first time always shows loading icon 2015-01-30 09:30:06 +00:00
Nathan Gray
21af57059d Some updates to pagination 
- Revert part of previous commit, it made things seem slower.
 2015-01-29 18:07:41 +00:00
Nathan Gray
2eb687775e Some updates to pagination 
- Fix initial load for mixed directories, was leaving holes in the list for first load
 - Fix unwanted reload for first slide when not paginating caused unfiltered list to be used
 2015-01-29 17:48:01 +00:00
Hadi Nategh
3b16ba88fe Fix video media content for Expose view 2015-01-29 17:24:08 +00:00
Ralf Becker
51f6ee7f62 mime icons for .css and .js, thanks to Pixelegg guys 2015-01-29 17:07:36 +00:00
Ralf Becker
7a81c7bfa4 mime icons for .css and .js, thanks to Pixelegg guys 2015-01-29 17:07:13 +00:00
Hadi Nategh
90dd0f8a97 * All Apps: Fix autocomplete form only for Chrome 2015-01-29 16:48:01 +00:00
Hadi Nategh
6e25cc598a Disable autoComplete fixer for all browser but Chrome 2015-01-29 16:33:36 +00:00
Hadi Nategh
20c482cc87 Set thumbnailWithImgTag to true to get thumbnail indicators as img tag in order to be able to set right image size ratio 2015-01-28 17:45:10 +00:00
Hadi Nategh
e673858e40 Fix regex for audio mime type 2015-01-28 11:21:20 +00:00
Hadi Nategh
81d1c32be2 Activate fullscreen mode for expose view 2015-01-28 10:59:05 +00:00
Ralf Becker
3d1836aa49 need to split off domain first, as it could contain app-name part of template eg. stylite.report.xet and https://my.stylite.de/egw/... 2015-01-28 10:17:44 +00:00
Ralf Becker
69ae4efb47 need to split off domain first, as it could contain app-name part of template eg. stylite.report.xet and https://my.stylite.de/egw/... 2015-01-28 10:14:52 +00:00
Nathan Gray
2be34b4b53 Bug fixes on nextmatch printing 
- fix loaded rows check
 - fix hidden etemplate check
 2015-01-27 20:48:06 +00:00
Nathan Gray
16a64c879d Pass edit mode (resize, move, progress) so we can update better 2015-01-27 18:53:50 +00:00
Ralf Becker
f0c4c3dadd Don't send settings on reload either. Avoids security errors with Ralf's iframe notes. 2015-01-27 17:02:37 +00:00
Ralf Becker
25384864bc fix 2nd loading of etemplates in IE, which was broken since r51385, because IE can not use in main window cached object, if it was loaded from a now closed popup/iframe 
We use now jQuery.ajax() instead of native XMLHTTPRequest object from jQuery object of main-window
 2015-01-27 16:53:32 +00:00
Ralf Becker
f834ba893b fix 2nd loading of etemplates in IE, which was broken since r51385, because IE can not use in main window cached object, if it was loaded from a now closed popup/iframe 
We use now jQuery.ajax() instead of native XMLHTTPRequest object from jQuery object of main-window
 2015-01-27 16:53:11 +00:00
Nathan Gray
cee521d4cd Work in progress of printing nextmatches, still needs some prettying up & edge case testing 2015-01-27 16:26:59 +00:00
Nathan Gray
789d02a7e0 Don't send settings on reload either. Avoids security errors with Ralf's iframe notes. 2015-01-27 15:57:07 +00:00
Ralf Becker
c5cbbf240a fix autocomplete for Firefox by doing a real submit to an https url, as faked submit to "about:blank" causes a security warning in FF 2015-01-27 15:14:56 +00:00
Hadi Nategh
0e4d04cb6c Fix autocomplete fixer wrapper messes up nextmatch height size 2015-01-27 11:17:11 +00:00
Hadi Nategh
59e922221c Enhance autocomplete fixer and fixes some bugs 2015-01-27 10:52:42 +00:00
Nathan Gray
456ea984c6 Clean up debug 2015-01-26 17:35:54 +00:00
Nathan Gray
a644255c78 Clean up debug 2015-01-26 17:34:47 +00:00
Nathan Gray
6b01a18960 Clean up debug 2015-01-26 17:30:10 +00:00
Hadi Nategh
ebab506aa9 * All Applications: Get browser autocomplete form working 2015-01-26 16:13:08 +00:00
Hadi Nategh
f01cfd4a41 Fix etemplate2 clear instance broken by commit 51394 2015-01-26 14:33:09 +00:00
Hadi Nategh
c3a8f0d7c0 Fix etemplate2 clear instance broken by commit 51394 2015-01-26 14:32:39 +00:00
Hadi Nategh
0361739045 Remove specific handling on link\'s caption to open expose view, although still we keep the handler on icon 2015-01-26 12:18:34 +00:00
Hadi Nategh
be1d839686 Remove specific handling on link's caption to open expose view, although still we keep the handler on icon 2015-01-26 11:39:35 +00:00
Ralf Becker
70b603ac77 moving VFS API classes into a namespaced PSR4 autoloadable structure: 
- PSR4 autoloader exists beside our old autloader to support old as well as new structure until everything is ported over
- moved ported API stuff from phpgwapi to new api directory (idea is phpgwapi become a compatibility layer for old code, while we only port selected stuff to new api directory)
- namespaces use prefix "EGroupware", then (first letter capitalised) app-name or "Api", sub-system names like "Vfs" or for apps "Ui", "Bo, "So" and at least class name starting with a capital letter and without understores eg. "StreamWrapper" plus just ".php"
- examples:
  + egw_vfs in phpgwapi/inc/class.egw_vfs.inc.php --> EGroupware\Api\Vfs in api/src/Vfs.php
  + sqlfs_stream_wrapper in phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php --> EGroupware\Api\Vfs\Sqlfs\StreamWrapper in api/src/Vfs/Sqlfs/StreamWrapper.php
  + sqlfs_utils in phpgwapi/inc/class.sqlfs_utils.inc.php --> EGroupware\Api\Vfs\Sqlfs\Utils in api/src/Vfs/Sqlfs/Utils.php
- api directory is no a new svn module but exists (like home) as sub-directory under base egroupware module
 2015-01-26 09:15:07 +00:00
Ralf Becker
48fa4c1857 share loaded eTemplates with iframes and popups, this way they dont need to load templates in same EGroupware session again (unless main window get reloaded), also adding now a cache-buster by default, if server dont supply one 2015-01-23 19:33:29 +00:00
Ralf Becker
d100187584 new script widget to allow to include javascript in (customizied) templates, also adding an id to style widget 2015-01-23 19:32:51 +00:00
Ralf Becker
4578d849f5 new script widget to allow to include javascript in (customizied) templates, also adding an id to style widget 2015-01-23 19:32:32 +00:00
Hadi Nategh
355ef81252 Support audio mime tyep for expose view, in order to play audio file 2015-01-23 15:53:21 +00:00
Hadi Nategh
ad6f33d78b Support audio mime tyep for expose view, in order to play audio file 2015-01-23 15:52:00 +00:00
Hadi Nategh
9c812c1799 Fix the grid widget resize handler for grid_wrapper 2015-01-23 15:14:26 +00:00
Hadi Nategh
8e951c3346 Fix expose view always shows the first picture of the list without respect to the selected one 2015-01-23 15:13:38 +00:00
Ralf Becker
cf61d38137 share loaded eTemplates with iframes and popups, this way they dont need to load templates in same EGroupware session again (unless main window get reloaded), also adding now a cache-buster by default, if server dont supply one 2015-01-23 14:32:47 +00:00
Hadi Nategh
d56b92af8b Fix the grid widget resize handler for grid_wrapper 2015-01-23 14:29:46 +00:00
Ralf Becker
a7c4688e01 fixed 404 Not found caused by appending &thheight=... to mime-icon url 2015-01-23 12:40:09 +00:00
Ralf Becker
8185324061 fixed 404 Not found caused by appending &thheight=... to mime-icon url 2015-01-23 12:39:37 +00:00
Hadi Nategh
75097c9cc2 Fix expose view always shows the first picture of the list without respect to the selected one 2015-01-23 09:25:18 +00:00
Ralf Becker
4886634500 fix not working startup of gallery, as mediaContent has to be an array without gaps from non-media content 2015-01-22 09:04:58 +00:00
Ralf Becker
fcda7613f1 fix not working startup of gallery, as mediaContent has to be an array without gaps from non-media content 2015-01-22 09:01:58 +00:00
Ralf Becker
6baaaa20eb Got expose gallery to paginate/fetch images backwards and forwards 2015-01-22 07:17:53 +00:00
Nathan Gray
f27d39aeeb Got expose gallery to paginate/fetch images backwards and forwards 2015-01-21 23:41:26 +00:00
Ralf Becker
14a7dd38f3 style tile-view to show images on whole tile with file-name and comment on hover only 2015-01-21 18:59:12 +00:00
Hadi Nategh
b9da0b6d4c Set thumbnail size on expose to 128 height, and style them 2015-01-21 17:54:35 +00:00
Nathan Gray
a622113b0b Pass event in instead of using window.event, fixes exposé initialization to selected image in firefox 2015-01-21 16:17:19 +00:00
Ralf Becker
2e27d90d45 thumbnailer now accepts 4 parameters in following priority: thheight, thwidth, thminsize and old thsize: 
- thheight ensures a fixed height
- thwidth ensures a fixed width
- minsize ensures a minimum size
- thsize ensures a maximum size
 2015-01-21 15:46:01 +00:00
Hadi Nategh
847bc2ef15 Introduce thumb_mime_size to vfs-mime widget in order to specify thumb size for specific mime types 2015-01-21 15:03:59 +00:00
Ralf Becker
0f8d251fc4 pending French translations from our translation server 2015-01-21 14:12:43 +00:00
Hadi Nategh
9bd80cdfc4 Fix url for expose view thumbnails 2015-01-21 11:15:59 +00:00
Hadi Nategh
33cf3205fa Fix some issues in Expose view: 
-Fix an error complaing of nm existance(eg.link widget)
-Some styling to thumbnail indicator
-Add hideControlsOnSlideshow to the blueimp gallery plugin to be able to hide the controls
 2015-01-21 11:10:17 +00:00
Nathan Gray
6ffca62c3c Exposé [mostly] working with filemanager list (pagination goes forward, not back) 2015-01-20 23:58:38 +00:00
Ralf Becker
03b6b7a871 show hand cursor (et2_clickable class), if expose is available 2015-01-20 22:25:11 +00:00
Hadi Nategh
95007f20d6 Fix base_urls for expose view in vfs and image widget 2015-01-20 18:47:08 +00:00
Hadi Nategh
262c92558e Fix error apply is not available from the this._super in expose view 2015-01-20 18:32:51 +00:00
Ralf Becker
2fbc91c5d9 fixed not saved comment on an existing file/attachment 2015-01-20 17:36:09 +00:00
Hadi Nategh
511028f987 Some fixes of expose view for widget vfs-mime 
- Introduce expose_view attribute for the widget
- Fix attach to DOM
- Fix get Media method
 2015-01-20 15:07:09 +00:00
Hadi Nategh
40cc063500 Create links with et2_vfs-mime widget for links which have mime type 
- Links with accepted media type will be opened in expose view
 2015-01-20 14:59:28 +00:00
Hadi Nategh
4eb63d65ec Do not bind the expose view click handler if the media type is not supported 2015-01-20 13:14:23 +00:00
Hadi Nategh
fc5d0cab49 Introduce expose view to image widget 
- The expose view only be shown if the image widget have href value
 2015-01-20 11:56:51 +00:00
Ralf Becker
d3d0edaea3 let framework import magicsuggest and blueimp-gallery inline 2015-01-20 10:33:22 +00:00
Nathan Gray
5d93df0fbd Clear slides after closing the gallery. Fixes showing the first image next time expose is opened. 2015-01-19 20:20:02 +00:00
Nathan Gray
ff2f486c3f Fix vfsMime & expose to use this.node instead of image 2015-01-19 19:42:03 +00:00
Hadi Nategh
cb439ffc55 Expose view work in progress 2015-01-19 18:59:35 +00:00
Hadi Nategh
811f24f9b7 Add expose plugin widget 2015-01-19 17:21:11 +00:00
Hadi Nategh
a4b8dabef5 Implement the lightbox view (expose) for mime widget 2015-01-19 17:18:01 +00:00
Nathan Gray
d633ce970a Don't try to transform missing templates, it doesn't end well. 2015-01-16 18:10:30 +00:00
Hadi Nategh
f8e9911743 Serach js files for new phrases for translation 2015-01-15 14:56:23 +00:00
Hadi Nategh
4fa44e6482 Reorder and add missing phrases in lang files 2015-01-15 14:53:34 +00:00
Hadi Nategh
1db3cc96ef Refresh nm rows which got linked after egw_link_drop action 2015-01-15 13:06:38 +00:00
Nathan Gray
06abca167d If a widget is transformed into a template, try to load and process that template too. 2015-01-14 20:10:34 +00:00
Nathan Gray
2b1a897718 Surpress labels on entry-templates 2015-01-14 17:22:29 +00:00
Hadi Nategh
f9e28d24e8 Make a delay before favorites sorting action starts in order to prevent accidental sorting action 2015-01-14 17:00:47 +00:00
Hadi Nategh
d5231d35bc Fix onFinishOne attribute and its handler 2015-01-14 09:05:34 +00:00
Nathan Gray
2404ebda6e Ignore some new attributes, preserve settings when value is not an object 2015-01-13 22:00:12 +00:00
Nathan Gray
abb02c7b40 Add ability to store view in favorites, so tiles can be put on home. 
Still some bugs in resizing with this in the home portlet.
 2015-01-13 21:56:54 +00:00
Hadi Nategh
04730c83fe Fix toolbar toggle buttons with Function are not getting executed 2015-01-13 15:51:30 +00:00
Hadi Nategh
01319d2704 Bind hover handler in file upload widget on input element as input always is on top and transparent 2015-01-13 13:25:12 +00:00
Hadi Nategh
1ad841f9d8 Set the action default for dropdown actions 2015-01-13 12:16:04 +00:00
Ralf Becker
325a471131 moving vfsMime icon size to etemplate, only overwriting it for thumbnail more specific in filemanager for Pixelegg template as they limit all images in NM widget 2015-01-13 10:45:10 +00:00
Ralf Becker
6bd93b25fb fixed phrase 2015-01-12 16:02:13 +00:00
Ralf Becker
86eba3f137 for nextmatch filters we need to encode global nextmatch definition too 2015-01-12 14:10:40 +00:00
Ralf Becker
f15a37f368 always run fix_encoded_options to cope with customfields of type select got resorted by Firefox 2015-01-12 12:53:50 +00:00
Ralf Becker
157230ba57 pending translations from our translation server 2015-01-12 11:54:05 +00:00
Ralf Becker
989adb3fc3 some missing 128x128 icons from LGPL Crystal Clear icon theme from Everaldo Coelho downloaded from http://commons.wikimedia.org/wiki/Crystal_Clear 2015-01-11 17:34:55 +00:00
Ralf Becker
54e3db4c7b some missing 128x128 icons from LGPL Crystal Clear icon theme from Everaldo Coelho downloaded from http://commons.wikimedia.org/wiki/Crystal_Clear 2015-01-11 17:10:58 +00:00
Ralf Becker
f44d73830e some missing 128x128 icons from LGPL Crystal Clear icon theme from Everaldo Coelho downloaded from http://commons.wikimedia.org/wiki/Crystal_Clear 2015-01-11 13:24:29 +00:00
Ralf Becker
5b2baa7f44 128x128 GPLv2 mime icons from https://github.com/eagerterrier/MimeTypes-Link-Icons 2015-01-11 13:04:06 +00:00
Ralf Becker
baf79766a6 if exif extension is available, use it to fetch thumbnails from jpeg or tiff files 2015-01-10 13:15:17 +00:00
Ralf Becker
85bcd0200d modernized login- and start-message editing a bit 2015-01-09 18:58:23 +00:00
Hadi Nategh
8ee3b4ccb1 Remove commented code from previous commit 2015-01-09 16:21:32 +00:00
Hadi Nategh
607677d9e7 Fix getting wrong initial excess_height 2015-01-09 16:19:52 +00:00
Hadi Nategh
882532d891 Give more room for input field in duration widget 2015-01-09 15:01:36 +00:00
Hadi Nategh
e1b9b43f6c Fix toolbar dropdown actions set label 2015-01-09 14:45:39 +00:00
Hadi Nategh
eec3ebbc5d Correct stored toolbar's preferences with the wrong id 2015-01-08 14:02:21 +00:00
Nathan Gray
0eaa3e0896 Fix file drop stopped working after changing template 2015-01-07 22:35:21 +00:00
Hadi Nategh
7009ba1de0 Fix mail compose issues: 
-Set default toolbar actions
-Set toolbar actions view range to 6
-Fix compose window not being resized correctly in FF 
-Fix displaying toolbar's selectbox
-Fix styling of toggle button
 2015-01-07 17:08:21 +00:00
Hadi Nategh
56d8947ccc Make sure the toJSON is not null before using string replace 2015-01-07 12:32:28 +00:00