extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-08 19:12:29 +02:00
Code Issues Packages Projects Releases Wiki Activity
29,846 Commits 30 Branches 354 Tags 214 MiB
b5d106a55e
Commit Graph

1384 Commits

Author SHA1 Message Date
Hadi Nategh
97d240fcab W.I.P. of new approach for mail winmail.dat attachment handling 
- Restructure save attachments to vfs, and try to read the winmail.dat only once and store them all, as fetching content of winmail.dat is very expensive operation
- Fix failure of save all embedded attachments into filemanager
 2015-12-02 11:10:26 +00:00
Hadi Nategh
6124a7fc21 W.I.P. of new approach for mail winmail.dat attachment handling 
- Try to use mail client cache and store resolved winmail.dat attachments, it will avoid resolve it again
 2015-11-30 14:55:39 +00:00
Hadi Nategh
bace5cc1fc * Mail: Fix mail print version has very small font size 2015-11-30 11:13:45 +00:00
Hadi Nategh
6172992b9c Mobile theme W.I.P.: 
- Fix mail list style
 2015-11-30 11:11:38 +00:00
Hadi Nategh
0b0937f316 W.I.P. of new approach for mail winmail.dat attachment handling 
- Fix iframe in preview overlays attachment area
 2015-11-30 08:54:02 +00:00
Hadi Nategh
e1f4574b9a W.I.P. of new approach for mail winmail.data attachment handling 
- Fix mail list is loading super slow if there are mails with winmail.data attachments
- Performance improvement for reading mails in preview pane with winmail.data
 2015-11-27 16:17:59 +00:00
Hadi Nategh
ac16d1fb95 Mobile theme W.I.P.: 
- Introduce mobile template-set
- Change loading mail index mobile template according to mobile template-set
 2015-11-25 15:17:59 +00:00
Hadi Nategh
1bbf423c1e Do not use tidy extension by default 
- Fix reply to some emails do no open compose dialog
 2015-11-24 15:35:43 +00:00
Klaus Leithoff
ecbb564dfe avoid using tidy as it seems to trigger segmentation faults quite regular with modern style html-mails. 2015-11-20 15:16:37 +00:00
Klaus Leithoff
dafbe6f9b5 fix for not working as intended deny access on group feature 2015-11-17 12:14:23 +00:00
Hadi Nategh
e5ee34c006 Mobile theme W.I.P.: 
- Set right-header for mail index only for mobile theme
 2015-11-17 09:07:01 +00:00
Hadi Nategh
7c944b5aeb Mobile theme W.I.P.: 
- Sidebar acts based on device size
- Remove portrait top header (sidebar toggle menu will be positioned next to nm header)
- Remove collapsed sidebar application navigator, only for devices
 2015-11-16 15:45:04 +00:00
Ralf Becker
030d43d960 * Mail: allow to disable use of RFC3676 flowed lines in plain text mails, as some clients have trouble to detect correct charset 2015-11-11 15:00:11 +00:00
Ralf Becker
3d85ca9db6 no need to fetch mail again 2015-11-11 12:26:14 +00:00
Ralf Becker
6969120d8b z-push requires text-parts to be in utf-8, not eg. iso-8859-1 2015-11-11 12:25:43 +00:00
Ralf Becker
aa7666baac remove old zpush (1) support and refactored backend (autoloadable name, moved interfaced to separate file 2015-11-05 13:23:00 +00:00
Klaus Leithoff
0a70638205 respect the mimeType request/specification for PRESET and application method fetch 2015-11-05 12:03:03 +00:00
Klaus Leithoff
bb466cd20d * Mail: fix for cascading forward problem (problem when forwarding mails with forwarded messages attached in inline mode) 2015-11-03 13:06:47 +00:00
Ralf Becker
cf332755e9 textAreaWidget.ckeditor is null not undefined 2015-10-28 09:04:38 +00:00
Ralf Becker
b8f2902e80 fix double load of UI in compose after adding attachments caused by errors in mail app.js compose_resize handler 2015-10-27 11:44:54 +00:00
Klaus Leithoff
714c75ef6d reintroduce tidy in calls from egw-mail-app when only getCleanHTML is called, as it is correcting html structure issues for us 2015-10-27 09:16:37 +00:00
Nathan Gray
1f2c9e641a Handle multiple attachments with the same name when linking attachments from an email into an entry for another application 2015-10-26 19:57:07 +00:00
Nathan Gray
5aaadfd00d Handle multiple attachments with the same name when downloading attachments from an email into vfs 2015-10-26 19:25:01 +00:00
Klaus Leithoff
704dd397d4 fix accidently removed body 2015-10-23 10:44:12 +00:00
Klaus Leithoff
294b3c2ea8 disable the use of tidy when using zpush/activesync 2015-10-23 10:02:18 +00:00
Ralf Becker
6886b0a3b1 meeting requests and responses were send twice in spite of esync preferences 2015-10-22 17:24:14 +00:00
Ralf Becker
2f33904af0 moving blocking of device on connection failure / exception from mail code to EGroupware pluging, to cate for failures everywhere in plugins, not just connect method of mail plugin, which does not fail because Horde defers IMAP login until it realy needs to connect 2015-10-20 17:03:36 +00:00
Ralf Becker
28577e8fb4 moving blocking of device on connection failure / exception from mail code to EGroupware pluging, to cate for failures everywhere in plugins, not just connect method of mail plugin, which does not fail because Horde defers IMAP login until it realy needs to connect 2015-10-20 16:26:55 +00:00
Nathan Gray
bb880a6c67 Handle multiple attachments with the same name when downloading attachments from an email as a zip 2015-10-19 23:45:38 +00:00
Hadi Nategh
938c991124 WIP Egroupware tutorial: 
- Create tutorial sidebox hooks automatically
- Fix some styling for popup
- Display intro video show confirmation dialog based on session (login/logout)
 2015-10-19 15:00:42 +00:00
Hadi Nategh
9dd37010d4 Trigger explicit resize of splitter left panel when undock, because it would not be resized with correct size if it happens after sidebar get resized 2015-10-15 13:02:26 +00:00
Ralf Becker
7fb9d4d15f fixes around calendar sync and meeting-requests, also fixed all IDE warnings in calendar_zpush 2015-10-14 16:42:04 +00:00
Ralf Becker
375cf22ba6 fix flags to only contain AS supported flags analog to Zimbra code and seek stream of attachments to beginning, as z-push requires that 2015-10-13 21:12:02 +00:00
Ralf Becker
ea0f039a37 fix PHP Fatal error, replace utf8_truncate --> Utils::Utf8_truncate 2015-10-13 16:15:32 +00:00
Klaus Leithoff
258846103a supplement flagsstring to mod, to represent flag changes 2015-10-13 15:06:04 +00:00
Ralf Becker
52dd6bd3d7 documented and reimplemented failure handling of connect method 2015-10-13 14:47:18 +00:00
Ralf Becker
33e15ea3f4 fix PHP Fatal error this->mail->getErrorMessage() and using Request::GetDeviceID() 2015-10-13 12:45:18 +00:00
Klaus Leithoff
ab4b0e1e17 only do the sorting when we do a topLevel Query or a retrieval of ALL. ; give extracare on the retrieval of folders in shared and others on subscription, and when folders subscribed in such namespaces are deeply nested within without rights of list on the branches leading to the leaf 2015-10-06 15:09:10 +00:00
Hadi Nategh
fe9dcbcc12 Get folders status asynchronously as it is an expensive operation to be called in initial load 2015-10-06 10:51:35 +00:00
Hadi Nategh
5c812f8c9a Remove extra ajax-loader icon from mail tree 2015-10-06 08:45:44 +00:00
Hadi Nategh
7c5ab68b46 Do not stop completely the transition on mail as it conflicts with blueimp gallery plugin (expose) 2015-10-05 09:38:57 +00:00
Hadi Nategh
9d7a566966 No transition delay for mail, fixes the splitter right panel overflows the left panel 2015-10-01 08:27:44 +00:00
Hadi Nategh
3bc2e1077c WIP EGroupware tutorial: 
- Implement a hook for application specific video tutorials
- Allow iframe widget to cooperate with fullscreen video play mode
 2015-09-25 15:18:35 +00:00
Klaus Leithoff
397d5a6d36 fix problem with possible json_encode problem (removing all initial data from mailbody) on reply/forward 2015-09-24 10:06:22 +00:00
Hadi Nategh
773fbf7eea Fix mail compose resize does not work always 2015-09-23 10:51:27 +00:00
Nathan Gray
0f6c23a5e0 If business email cannot be parsed, continue to home email. 
Fixes bug where contacts with only personal email address were not shown in taglist-email
 2015-09-21 20:03:33 +00:00
Hadi Nategh
220d5b8ed4 Fix mail actions update for nm context menu, preview and display toolbar 2015-09-21 14:04:48 +00:00
Hadi Nategh
a4c7d64a4c Add another action into mail toolbar 2015-09-18 13:39:53 +00:00
Hadi Nategh
3f5107c4cb Add some more styling for calendar action in mail 2015-09-18 13:14:46 +00:00
Hadi Nategh
b333a0c0ad Add some styling for calendar action in mail 2015-09-18 12:09:59 +00:00
Klaus Leithoff
d591b6f3ae introduce config to be able to trigger a closer look on folders located in shared and others namespace, as some servers do not return them by default on root-level-queries; Default is set to NO 2015-09-18 08:46:55 +00:00
Hadi Nategh
1ed0befddf Add some new actions into mail preview and display toolbars 2015-09-16 16:00:35 +00:00
Hadi Nategh
d3cd05165d Fix mail TO field is not getting focused, and initial resize does not work 2015-09-16 14:07:56 +00:00
Hadi Nategh
4479cf64c5 Mailvelope backup/restore integration WIP: 
- Add mailvelope installation dialog for mail and infolog
 2015-09-15 16:42:52 +00:00
Ralf Becker
4757b67af0 using new z-push 2 / hashed device directory for folder hashes, falling back to old directory/file for reading it 2015-09-15 07:45:58 +00:00
Klaus Leithoff
a93187ec74 fix problem with empty/faulty attachments when saving to infolog on sending when starting from a drafted message 2015-09-11 13:45:45 +00:00
Ralf Becker
a67b3c24df sending whole mail for bodypreference 4, not parsing and reconstruction it first, which has problems around inline images in html mails 2015-09-10 16:00:16 +00:00
Ralf Becker
ded1a651d9 fix handling of inline attachments, still open is that inline attachments are one byte short when send to device and therefore dont display! 2015-09-07 12:59:19 +00:00
Hadi Nategh
472636c32c Fix mail filter rules list does not get displayed 2015-09-07 08:25:53 +00:00
Ralf Becker
ac8f68cd29 * Mail: fix PHP Fatal error under 5.3 when displaying mails containing inline-images 2015-09-05 12:25:41 +00:00
Ralf Becker
8b6ba73c79 using calendar_zpush not calendar_activesync 2015-09-04 15:27:41 +00:00
Hadi Nategh
c7b5094d16 Mail preview pane preference: 
- Add some translation
- Move the preference into configuration settings
 2015-09-02 12:57:23 +00:00
Hadi Nategh
a44e9a6f9e * Mail/preferences: Add Preview Pane option into mail preferences in order to be able to show/hide mail preview pane (split panel) 2015-09-02 09:31:47 +00:00
Hadi Nategh
d721de7ee9 Mailvelope backup/restore integration WIP: 
- Add PGP Encryption menu into sidebox of mail and infolog
- Create Backup/Restore operation dialog
 2015-08-31 16:40:33 +00:00
Hadi Nategh
944d00c1cb Fix mail tree not showing not subscribed folders if the show all folders is switched on in preferences 2015-08-25 09:36:43 +00:00
Klaus Leithoff
427ba66dfe allow 10, instead of 4 folders for menuaction copy 2015-08-25 08:11:27 +00:00
Ralf Becker
3748005f8b fix not opened tree with new tree-code, if you have only one account and fix state-handling to also store ActiveProfileID pref for a single account 2015-08-21 08:01:42 +00:00
Ralf Becker
00ccd37a24 enable since Mailvelope 1.0 available signing and sigature verification of encrypted messages 2015-08-20 07:02:06 +00:00
Hadi Nategh
2cfc6586b3 Mail folder management dialog: 
- Add more translation
 2015-08-14 10:07:02 +00:00
Hadi Nategh
3b4864df7c Mail folder management dialog: 
- Add some translation
- Add hints for multiple selection action
- Some styling
 2015-08-13 17:34:12 +00:00
Hadi Nategh
6a1f5393e4 Mail folder management dialog: 
- Add delete confirmation dialog in order to warn user
 2015-08-13 11:54:50 +00:00
Hadi Nategh
fb6d06e322 Mail folder management dialog: 
- Fix folder refresh on both index and folderMgmt trees
 2015-08-13 10:29:51 +00:00
Hadi Nategh
40e0a2b705 Mail tree phase2: 
- Fix mail tree gets stalled after adding new account
 2015-08-13 08:55:11 +00:00
Hadi Nategh
c7cc902e1a WIP mail folder management dialog: 
- Use long task dialog
- Fix multiple selection and highlighting
- Update index tree after delete operation
 2015-08-11 16:28:59 +00:00
Hadi Nategh
94f7059e17 Mail tree phase 2 WIP: Add highlighting on index tree 2015-08-11 10:03:42 +00:00
Hadi Nategh
e7e7bc68e6 WIP mail folder management: 
- Use highlighting on tree to ease node selection
- Some styling for node selection
 2015-08-11 10:02:04 +00:00
Klaus Leithoff
11b2918d47 fix problem on mailsearch. ToDo: Respect range, when given 2015-08-11 08:46:19 +00:00
Hadi Nategh
85286a70da WIP of mail folder management dialog (multiple folders delete action) 2015-08-10 15:45:22 +00:00
Hadi Nategh
a9a246c727 Mail tree phase 2 WIP: Fix checkedSubscribed checkboxes 2015-08-10 14:54:38 +00:00
Hadi Nategh
e91a88e80d WIP image upload via drag into ckeditor 4.5: 
-Add extraPlugins into ckeditor config
-Activate imageUpload for mail compose htmlarea
 2015-08-07 15:51:15 +00:00
Hadi Nategh
1cf308411f Mail tree phase 2 W.I.P: Do not open initially other folders but INBOX 2015-08-07 07:47:28 +00:00
Hadi Nategh
824fcf77f1 Fix couple of IDE warnings 2015-08-06 09:36:55 +00:00
Hadi Nategh
5e789237ed Fix custom rights option messes selected mail acl rights 2015-08-06 09:27:10 +00:00
Hadi Nategh
5fabb70f38 Make the font size a bit bigger for the previous commit 2015-08-05 13:09:50 +00:00
Hadi Nategh
18638d9db6 Fix font sizes in print mail body 2015-08-05 12:44:13 +00:00
Hadi Nategh
b12ac79060 Mail tree phase2 W.I.P.: Open tree when changing profile 2015-08-05 10:48:34 +00:00
Hadi Nategh
1d264a8b64 Mail tree phase2 W.I.P.: Set the initial counters for opened folders 2015-08-05 10:22:29 +00:00
Hadi Nategh
bee933496d Mail tree phase2 W.I.P.: 
Make sure node id is string because client-side tree expected to be. Fixes context menu not working after refresh tree
 2015-08-05 08:37:22 +00:00
Hadi Nategh
372d82b063 Mail tree phase2 W.I.P.: Fix sieve rules and vacation context menus are not enabled on mail index tree 2015-08-05 07:43:09 +00:00
Hadi Nategh
6e440bd0ba Mail tree phase2 W.I.P.: 
-Fix displaying wrong icon for user defined folders
-Fix sorting autofolders
 2015-08-04 15:50:28 +00:00
Hadi Nategh
0bde40fac5 Mail tree phase2 W.I.P.: 
-Fix translation not working for the first load
-Get all children of active accounts in one go
 2015-08-04 08:21:23 +00:00
Hadi Nategh
8096304c6a Mail tree phase 2 W.I.P: 
-Remove depricated getFolderTree method and replace it with getTree from mail_tree class
-Fix sorting folders in new folder arrays method
-Fix subscription refresh
 2015-08-03 14:33:18 +00:00
Hadi Nategh
d044e75c9c Mail tree phase 2 W.I.P.: 
Add functionality to autoload index tree 
Some optimization
 2015-07-31 14:21:31 +00:00
Hadi Nategh
033ab7f65d Mail tree phase2 W.I.P.: missing commit from 53261 2015-07-29 14:31:59 +00:00
Hadi Nategh
af491c92b3 Mail tree phase2 W.I.P.: Fix lack of documentation 2015-07-29 13:34:56 +00:00
Hadi Nategh
5011e8153e Disable getFolderstatus in getTreeFolder method as it causes performance issue and some wierd error 
- Note: after re-implementing mail tree, getFolderStatus needs to be re-implemented and being used again via new approach
 2015-07-29 12:38:10 +00:00
Hadi Nategh
41127ab765 Fix call to not existed static function 2015-07-29 10:26:47 +00:00
Hadi Nategh
c36449cd6e Mail tree W.I.P.: some code cleanup 2015-07-28 13:50:12 +00:00
Hadi Nategh
5ffb4f13ba Template file missing from previous commit 2015-07-28 10:00:09 +00:00
Hadi Nategh
04145bf597 Mail tree W.I.P.: 
-Show ajax-loader on clicked node while autoloading processing
 2015-07-28 09:58:32 +00:00
Hadi Nategh
74952cd739 Avoid getting scrollbar on form area and let the tree handles it 2015-07-28 08:05:48 +00:00
Hadi Nategh
0c7e104027 More work in progress of mail tree: 
-Initiate first level of mailboxes in subscription dialog, and let autoloading do the rest of expensive operation
-Save last state of tree in subscription dialog
-Uses new approach for comparing subscribed and unsubscribed folders
 2015-07-27 17:46:45 +00:00
Hadi Nategh
01391055dc W.I.P mail tree: fix wrong profileID 2015-07-23 13:45:57 +00:00
Hadi Nategh
47239b3d23 More W.I.P of mail tree 2015-07-23 13:26:43 +00:00
Hadi Nategh
95123cd89c W.I.P mail tree 
-Fix wrong children items from the autoloading
 2015-07-22 16:02:44 +00:00
Hadi Nategh
28057d583a W.I.P. mail tree 
-Add Checked option to mail tree structure
 2015-07-22 12:43:10 +00:00
Klaus Leithoff
d9723648fd adapt SendMail, and getSearchResultsMailbox 2015-07-21 15:23:18 +00:00
Hadi Nategh
27634fd18d Some more W.I.P. of mail tree 2015-07-21 13:24:25 +00:00
Hadi Nategh
51134e581e Mail tree re-structuring W.I.P. 2015-07-20 16:41:50 +00:00
Ralf Becker
696dd8d6a7 also strip personal part from vacation notice addresses, cleaning up code and IDE warnings 2015-07-20 13:00:48 +00:00
Ralf Becker
84052c1600 missing translations 2015-07-20 08:46:19 +00:00
Klaus Leithoff
8f63d7e737 adapt GAL and Mailbox search to meet zpush2 expectations on result 2015-07-17 08:41:26 +00:00
Ralf Becker
9ef2cbd98a * Mail/Kalendar: remove iCal from alarms and correctly display canceled events in mail 2015-07-16 09:34:55 +00:00
Klaus Leithoff
3ada72ef2f upon save, reduce possible rfc-addresses to email-address only for forwards on rules and vacationnotices 2015-07-07 13:26:58 +00:00
Klaus Leithoff
69a36ad4e1 fix warning in mail_compose::ajax_searchAddress 2015-07-07 11:44:02 +00:00
Ralf Becker
a639f2a8fb fixed not show attachments by using mimesupport and not bodypreference, also removed wrong Change FOUND! message 2015-07-02 15:42:22 +00:00
Klaus Leithoff
f1c7fc9656 quiten debug log chitterchatter for SendMail and GetMessage; ignore ZPush Option SaveInSent, as it appears to be set to null always; Use EGroupware settings instead 2015-07-02 13:29:11 +00:00
Klaus Leithoff
299f66cce0 quiten debug log chitterchatter for SendMail and GetMessage; ignore ZPush Option SaveInSent, as it appears to be set to null always; Use EGroupware settings instead 2015-07-02 12:09:19 +00:00
Klaus Leithoff
cec90fe064 * Mail/ActiveSync: fix priority issue on retrieval of messages 2015-06-30 15:24:06 +00:00
Klaus Leithoff
ee02151c3a attempt to get Sendmail working in zpush implementation 2015-06-23 15:36:12 +00:00
Ralf Becker
666bdd82df * Mail: fix sieve rules for moving mails into folder containing non-ascii chars (Dovecot requires sieve rules in utf8, while Cyrus needs utf7-imap) 2015-06-22 18:49:20 +00:00
Hadi Nategh
cc979c563e * Mail/copmose: Fix mail compose d-n-d for emails and distribution lists 2015-06-16 12:19:57 +00:00
Klaus Leithoff
657e387526 changes to better handle attachments 2015-06-16 11:57:25 +00:00
Ralf Becker
78293e8939 fix wrong class name 2015-06-16 08:24:05 +00:00
Ralf Becker
583ce92b99 work in progress zpush2: to enable see comment in index.php 2015-06-16 06:37:16 +00:00
Hadi Nategh
6258f77a18 Do not add attahcment if it is an inline image attachment 2015-06-12 14:52:22 +00:00
Hadi Nategh
2de90a74e4 Add missing translation for "save as calendar" action 2015-06-12 08:53:08 +00:00
Hadi Nategh
5ba5b0fb45 Do not add inline attachment images again on draft 2015-06-11 17:43:17 +00:00
Ralf Becker
d2eee09ff2 fix for imap_rfc822_write_address from imap extension 2015-06-09 08:54:23 +00:00
Ralf Becker
f4decee1b9 * Mail: correctly quote name / personal part containing German umlauts or special chars when searching for email addresses in compose 2015-06-08 14:26:25 +00:00
Hadi Nategh
a7043964bb Fix translation and appIcon issue in mail integration 2015-06-03 13:24:51 +00:00
Hadi Nategh
f64e44ffad Fix mail display print with IE load issue 2015-06-03 10:48:43 +00:00
Hadi Nategh
8f7a05544e Add mail integration calendar action into preview toolbar 2015-06-03 08:44:44 +00:00
Hadi Nategh
3908b46079 Fix mailvelope display print with multipage content 2015-06-02 15:26:51 +00:00
Hadi Nategh
27e7c49e30 Style mailvelope display print frame 2015-06-02 12:24:29 +00:00
Hadi Nategh
9a572dbf7d Prepare mailvelope iframe to be printed, and hide other original frames 2015-06-02 11:01:45 +00:00
Nathan Gray
c365c386e9 Make sure get_rows is always set, fixes error when setting forced/default columns 2015-06-01 19:18:15 +00:00
Hadi Nategh
ddfaa8202d Fix mail inline images does not work when compose from draft 2015-06-01 09:27:09 +00:00
Ralf Becker
2699dddc4e fix selector for Mailvelope iframe under Firefox 2015-05-29 11:04:09 +00:00
Klaus Leithoff
6ac985bb88 allow for visualization and sorting by the internal-/arrival- date of messages (list only) 2015-05-29 10:53:01 +00:00
Ralf Becker
ddbe8ccec3 encryption of InfoLog entries (EPL only) 2015-05-28 14:40:33 +00:00
Hadi Nategh
5e911b879d Bind the load event only once (.one), seems the jQuery(.on)+IE calls load event on an iframe twice 2015-05-28 09:28:34 +00:00
Ralf Becker
ad07c416bf adding an own recipients onChange callback, as set_dragging_dndCompose is also called on hover 2015-05-26 16:33:35 +00:00
Ralf Becker
f0da3a71f9 fix error when switching encryption on for text mail, fix double signature when switching encryption off (by not doing a server round-trip) 2015-05-26 16:19:28 +00:00
Ralf Becker
d384f2407a fix replies to encrypted mails dont open with encryption switched on 2015-05-26 15:25:54 +00:00
Ralf Becker
a838f76da2 translation for mail encryption 2015-05-25 10:08:47 +00:00
Hadi Nategh
51fd95b69c Do not allow to drag an invalid email address in compose 2015-05-22 15:24:50 +00:00
Stefan Reinhardt
6e4432c6a4 pixelegg - Mail 
changes 2x Icon for Iconbar

to_infolog.png
to_calendar.png
 2015-05-21 16:27:33 +00:00
Ralf Becker
c41156c47c check if we have PGP keys for all recipients, before switching to encrypted mail, when adding further recipients and before trying to send 2015-05-20 15:24:08 +00:00
Hadi Nategh
394f7394ff Introduce a checkbox method for toolbar widget in order to be able to get/set checkbox actions 
- Function pattern: widget.checkbox(action_id,[value])
- Fix encrypt toolbar action set/get according to new method
 2015-05-20 15:18:00 +00:00