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

3023 Commits

Author SHA1 Message Date
Stefan Reinhardt
1c8c4032dc Latest CSS 2014-04-24 10:58:40 +00:00
Klaus Leithoff
79134d7b12 translations from our translation server 2014-04-23 12:39:12 +00:00
Klaus Leithoff
d1151d876e translations from our translation server 2014-04-23 07:44:08 +00:00
Klaus Leithoff
e65d95fdee restore 46615 with fixed owner issue 2014-04-17 08:55:21 +00:00
Ralf Becker
293d6d0b1b revert r46615 as it breaks creating of new accounts 2014-04-16 14:38:55 +00:00
Klaus Leithoff
80b83b7ec4 add address from email to addressbook, split given email to extract n_family, n_given and org_name if possible; set some defaults like owner and try to set n_fn by the given content 2014-04-15 13:26:40 +00:00
Nathan Gray
3a004a2672 Add link to list of placeholders into app menu 2014-04-14 17:08:43 +00:00
Nathan Gray
8675c75443 All addressbook links now follow view/edit preference too 2014-04-08 17:23:38 +00:00
Nathan Gray
d7c1b5e56f If user chooses to edit contact on double click, show infolog when viewing (instead of nothing) 2014-04-08 14:20:22 +00:00
Nathan Gray
ff8c5c641a Change CRM view preference label to match new functionality 2014-04-07 16:23:23 +00:00
Nathan Gray
e64f6979af Change CRM view preference to also affect default list action (double click), added 'Edit' option 2014-04-07 15:13:03 +00:00
Klaus Leithoff
83716092fb translations from our translation server 2014-04-07 06:50:08 +00:00
Ralf Becker
8cfef6746d added several checks for account editing in addressbook: doublicate account name, passwords match, set email for new accounts according to policy 2014-03-28 16:56:35 +00:00
Nathan Gray
8f6f417a9e Fix typo in translation 2014-03-26 14:09:22 +00:00
Nathan Gray
e62c980a8f Add context menu sub-actions for CRM-View Infolog & Tracker 2014-03-25 16:53:36 +00:00
Nathan Gray
a3e195fef2 Set sortmode=DESC for date columns so newest show up on top for first click on the sortheader 2014-03-24 19:43:15 +00:00
Ralf Becker
c72591f4a2 fixed new contacts had accounts addressbook selected, if user has admin rights 2014-03-24 13:23:03 +00:00
Ralf Becker
93151d84a3 fixed photo was lost after it was no longer transfered to client (to fix utf8 error in json encoding) 2014-03-21 17:12:32 +00:00
Klaus Leithoff
8212c7419b resolve rowid (app::id to id) for construction of vfs url to address addressbook entry 2014-03-21 12:38:47 +00:00
Klaus Leithoff
c0eece6234 use mail instead of felamimail (when available) for mail actions 2014-03-21 11:54:38 +00:00
Nathan Gray
f517b5786f Finish implementing addressbook CRM view tracker list 2014-03-19 20:21:05 +00:00
Ralf Becker
e476a3ed82 new deleting of accounts 2014-03-19 13:20:46 +00:00
Ralf Becker
1a6ecca887 fixed size of edit popup 2014-03-19 08:04:43 +00:00
Nathan Gray
42ee153c30 Set row_modified setting so nextmatch can filter out unchanged rows, and not send them back to the client again 2014-03-18 22:55:48 +00:00
Nathan Gray
44bddc9eb7 Get addressbook organisation list -> Infolog -> View linked Infolog entries context menu option working, with organisation list still working after. 2014-03-18 19:20:29 +00:00
Ralf Becker
a744177316 add/edit accounts via extra tab in addressbook edit dialog 2014-03-18 15:10:57 +00:00
Ralf Becker
6a55295b77 first version of new account editing via accounts tab in addressbook (not yet saving!) 2014-03-17 15:28:20 +00:00
Hadi Nategh
9e05cc7274 Fix pixelegg template styling for AB edit popup 2014-03-17 13:00:43 +00:00
Nathan Gray
cefb47641f Fix & re-enable showing linked infologs of multiple contacts 2014-03-13 19:04:47 +00:00
Ralf Becker
082d1813b2 using "infolog" if no preference set (default only works, after someone called preferences) 2014-03-13 08:15:41 +00:00
Nathan Gray
a4113da328 Set up addressbook CRM view to display infolog or tracker, by preference. 
Tracker list filtering not yet implemented.
 2014-03-12 22:42:06 +00:00
Ralf Becker
d4d7c305bd fixed changed action name to get opening of contact working again 2014-03-12 15:44:06 +00:00
Ralf Becker
ca497be17d fixed CRM view in case page-generation-time is displayed 2014-03-12 15:32:58 +00:00
Nathan Gray
56169beb2e Instead of re-rendering CRM infolog list, just use javascript to update the filter. 
Faster, and avoids destroying the addressbook etemplate2 object by loading the infolog into it.
 2014-03-12 15:21:01 +00:00
Ralf Becker
a17697ffdc finished CRM view stuff, thought there is an eTemplate2 problem preventing arrows from working 2014-03-12 13:29:52 +00:00
Stefan Reinhardt
9a5f20e901 Addressbook edit Dialog - fixed css + less 2014-03-11 16:37:37 +00:00
Stefan Reinhardt
a5e0fe493a Addressbook Dialog - edit.xet 
change column width to 60px
 2014-03-11 15:36:03 +00:00
Nathan Gray
4110056a3e Not needed - Only load infolog list on first time. 
Loading it again (in an ajax submit) will load it into addressbook.view etemplate2 object used as context for request, corrupting it.
 2014-03-11 15:27:37 +00:00
Nathan Gray
a5fcb430ef Only load infolog list on first time. 
Loading it again (in an ajax submit) will load it into addressbook.view etemplate2 object used as context for request, corrupting it.
 2014-03-11 15:26:09 +00:00
Ralf Becker
30bf1aa439 get delete in CRM view working by submitting it back to server 2014-03-10 21:15:23 +00:00
Ralf Becker
bb8608d694 fix javascript error when calling CRM view a second time, thought no idea why this.et2 is not correctly initialised / jQuery.proxy in et2_core_common.js line 248 looses its context 2014-03-10 17:42:58 +00:00
Stefan Reinhardt
7d46f7cf9b pending changes 2014-03-10 16:17:25 +00:00
Ralf Becker
416c5d3b75 always show sidebox in CRM view, as it contains the contact-data 2014-03-10 12:32:19 +00:00
Ralf Becker
ed7a5f82e1 fix image size and alignment for pixelegg template 2014-03-10 09:05:09 +00:00
Ralf Becker
18156faf85 show name&organisation left aligned, if there is no photo, also set width of image in case it is bigger 2014-03-10 08:53:56 +00:00
Ralf Becker
393cf2d78b missing commit of app.js 2014-03-07 09:29:01 +00:00
Ralf Becker
22b96163a4 some basic fixes to get new CRM view usable with pixelegg template 2014-03-07 09:22:35 +00:00
Nathan Gray
7ad4ebfdea Remove nextmatch export button 2014-03-06 22:30:44 +00:00
Ralf Becker
b5c5f3e28a new CRM view, not yet completly finished but usable 2014-03-06 18:39:52 +00:00
Ralf Becker
819fdea809 let browser cache images 2014-03-06 15:10:22 +00:00
Stefan Reinhardt
259967fd96 fixed: positioning nextmatch header fields 2014-03-06 10:43:15 +00:00
Ralf Becker
6da64247a6 fix phone link and prefered phone radio were on same place 2014-03-06 09:48:15 +00:00
Ralf Becker
aaf00dce71 merged separate categories tab into details and some more cleanup 2014-03-05 18:28:19 +00:00
Ralf Becker
f4e1251c20 next step 2014-03-05 18:09:42 +00:00
Ralf Becker
d4237c78e9 first step to new edit addressbook dialog 2014-03-05 15:25:07 +00:00
Ralf Becker
8bb226ba6b explicitly set custom fields as to search, if custom fields are defined, also added a couple more columns for explicitly not to search 2014-03-03 11:49:41 +00:00
Stefan Reinhardt
ef68690030 change in nextmatch: 
input, search, count, favorites : delete box-shadow: make it more flat
positioning box_right
 2014-02-28 17:47:22 +00:00
Ralf Becker
36deafbbc0 missing translation 2014-02-28 10:20:19 +00:00
Ralf Becker
6d84dd976c * Addressbook/Admin: allow members of group(s) specified in Addressbook: Site configuration to edit contact-data of accounts without being an admin 2014-02-28 10:13:26 +00:00
Nathan Gray
bf0f3f6141 Fix Category filter option 'All' gets added each submit 2014-02-27 20:20:15 +00:00
Ralf Becker
05a7effdf0 add deletegroup hook, to automatic delete contacts from a (group-)addressbook when group get deleted 2014-02-26 17:46:07 +00:00
Hadi Nategh
dc656e85fd Remove legacy actions from AB listview 2014-02-26 15:41:38 +00:00
Hadi Nategh
ea35b5ce75 Switch zip-code and city position in AB nm list 2014-02-25 11:25:00 +00:00
Hadi Nategh
91198f95d1 Re arrange country,city,street and zip code position in addressbook nm list 2014-02-25 09:55:46 +00:00
Stefan Reinhardt
c5d664c47d add button positioning 2014-02-24 17:20:09 +00:00
Ralf Becker
da3fd08d29 pixelegg changes from today 2014-02-20 19:42:52 +00:00
Ralf Becker
5090a02892 fixed sql error in carddav caused by sync-collection flag interpreted as filter 2014-02-20 19:38:21 +00:00
Ralf Becker
1d1dbd252c fixed missing sorting in inital sync-collection report with empty sync-token 2014-02-20 19:26:02 +00:00
Ralf Becker
a9b6c6e9b4 * CalDAV/CardDAV: fixed support for limited sync-collection report used eg. by Marten Gajdas Android apps 2014-02-20 17:46:15 +00:00
Ralf Becker
94af139465 * CalDAV/CardDAV: entries with urls containing url-encoded chars, eg. from Google calendar, were not send to clients (missing urldecoding in multiget report) 2014-02-20 15:11:27 +00:00
Ralf Becker
e0e4dfc55a * CardDAV/Addressbook: add "None" to forced preferences of addressbooks to sync in addition to personal one 2014-02-20 13:53:05 +00:00
Ralf Becker
b5a1af92d9 Pixelegg changes from Thursday 2014-02-19 08:21:01 +00:00
Ralf Becker
c00e79af78 partial fix for addressbook CRM view does not propagate prefered telephone number to phone popup, set_value() on et2_radiobox_ro is NOT working 2014-02-13 17:51:02 +00:00
Ralf Becker
4f8270fe41 fix javascript error if [More...] is clicked in CRM view of contact 2014-02-13 17:29:44 +00:00
Ralf Becker
36170bf4e3 an other one of that template is undefined 2014-02-13 14:08:21 +00:00
Ralf Becker
22b4a11c7f fixed delete button in addressbook.edit was shown without rights 2014-02-13 14:07:42 +00:00
Ralf Becker
17d5a567ee fixed javascript error if any name was changed, removed a lot old pre-et2 methods and fixed ide warnings 2014-02-13 13:54:52 +00:00
Ralf Becker
8525d55080 fixed phone popup (opening on [More...]) does not show always shown numbers (work, cell, home, fax) and if they are prefered, also changes made to them get not propagated back 2014-02-13 10:06:18 +00:00
Ralf Becker
f0d7751496 removed caret from group favorites, fixed prefered favorite was not show correct initialy nor updated 2014-02-12 21:51:25 +00:00
Klaus Leithoff
a11c1ba439 translations from our translation server 2014-02-12 13:20:17 +00:00
Ralf Becker
7c02cd3cd4 explicitly loading addressbook css for CRM view and moved loading of infolog javascript to its hook 2014-02-12 11:07:33 +00:00
Ralf Becker
f99ae4af0d pixelegg changes from Tuesday 2014-02-12 08:10:11 +00:00
Klaus Leithoff
1b95f843ec translations from Stefan 2014-02-11 09:21:30 +00:00
Ralf Becker
ccf203596e pixelegg changes from weekend 2014-02-10 09:31:36 +00:00
Nathan Gray
cc628c378a Use egw_framework::message() instead of a label in template, which might stay longer than we want 2014-02-05 23:36:01 +00:00
Ralf Becker
e2ee7e49b5 pixelegg changes from Tuesday 2014-02-05 07:44:01 +00:00
Ralf Becker
ed29d35d8b remove old csv import 2014-02-04 13:54:09 +00:00
Ralf Becker
84d20661c2 fixed problem reported by Pedro Ribeiro 2014-02-04 13:50:23 +00:00
Nathan Gray
f73943ea8d Update actions when changing between contact & org list 2014-02-03 20:13:52 +00:00
Hadi Nategh
64bfb00bd0 Fix AB advanced search Extra tab, not showing the privates cf 2014-02-03 16:19:49 +00:00
Hadi Nategh
ae555175aa Hide history tab for AB Advanced search popup 2014-02-03 13:32:34 +00:00
Ralf Becker
84b6e72f4b pixelegg changes up until now 2014-02-03 10:05:44 +00:00
Hadi Nategh
0d357ee448 Merge AB search template to edit and use edit tremplate for both search and edit popup 2014-01-31 16:04:05 +00:00
Nathan Gray
3a743f8f32 Fix typo (or spelling) in title 2014-01-31 15:37:44 +00:00
Hadi Nategh
c5d36e1834 Add missing template of AB douplicate confirmation dialog 2014-01-31 14:30:55 +00:00
Hadi Nategh
b99dd55c4e Fix wrong message title on addressbook douplicate confirmation dialog 2014-01-31 14:24:47 +00:00
Hadi Nategh
f2b01edbc3 Pass widget to check_value addressbook function as it is expected to get widget instead of this 2014-01-31 12:47:10 +00:00
Ralf Becker
90b00597b9 pixelegg changes from today/Thursday 2014-01-30 18:55:35 +00:00
Ralf Becker
9415ae1a73 pixelegg changes from Wednesday 2014-01-30 08:10:13 +00:00
Hadi Nategh
acd426c8ee Implement addressbook douplicates contact confirm dialog with new et2_dialog and make the conflicts contact popup selectable 2014-01-29 18:36:55 +00:00
Ralf Becker
28c5fff138 move index.right_addplus.xet into index.xet 2014-01-28 15:26:13 +00:00
Ralf Becker
0d8051837c translations from Stefan 2014-01-28 13:40:16 +00:00
Ralf Becker
43f558830c * Adressbook/CardDAV: changed (down-)scaling of images to width of 240px (was 60px) to cater for higher screen resolutions 2014-01-28 11:24:47 +00:00
Ralf Becker
ad57c7ee86 remove addressbook, calendar and infolog classes for xmlrpc, as we droped xmlrpc support 2014-01-28 08:28:20 +00:00
Hadi Nategh
c8cd5c1c44 Remove "edit categories" item from addressbook->categories context menu 2014-01-27 15:16:32 +00:00
Ralf Becker
996f9cd2b7 workaround for value 0 always selects first option in et2_widget_selectbox 2014-01-23 15:49:07 +00:00
Ralf Becker
653f013975 pixelegg changes from wednesday 2014-01-23 08:44:49 +00:00
Hadi Nategh
4604d2b90f Fix addressbook checkvalue for duplication, egw_getegw_json_getFormValues is depricated 2014-01-21 15:29:09 +00:00
Ralf Becker
6de6114e22 remove old API browser class, apps only used content_header method with is available as html::browser_header() with identical signature 2014-01-19 09:30:33 +00:00
Ralf Becker
605ead0c59 not using an iframe, when open calendar of contact 2014-01-17 08:47:16 +00:00
Ralf Becker
db300a7ca7 fix not working calendar view context menu 2014-01-17 08:29:33 +00:00
Ralf Becker
96e0c77fce pixelegg changes from thursday 2014-01-17 08:10:46 +00:00
Nathan Gray
782eb7f14c Fix filemanager context menu item opening in iframe 2014-01-16 17:23:39 +00:00
Nathan Gray
5a1fe439c5 Handle context action view infolog entries in JS, previously opened infolog list into addressbook tab 2014-01-16 15:15:50 +00:00
Ralf Becker
7cc91b0046 new&modified images from pixelegg 2014-01-15 18:04:11 +00:00
Klaus Leithoff
60bb090278 pixelegg changes from wednesday, new/changed images and styles 2014-01-15 13:46:14 +00:00
Klaus Leithoff
7d3eaf728c translations provided by stefan 2014-01-15 13:21:42 +00:00
Hadi Nategh
2eea4e0d29 Fix translation phrase for addressbook mail action menu 2014-01-15 13:01:31 +00:00
Hadi Nategh
a1d3c7f161 Remove "prefered email address" from addressbook preferences. Additionally, add an exclusive user preference for business and private mail action checkboxes 2014-01-15 11:22:37 +00:00
Hadi Nategh
f4d4f9600a Use getActionById instead of addressing the action through its parent, which is high potential to break the code 2014-01-15 09:11:32 +00:00
Hadi Nategh
c95c10a145 Fix wrong tag of private and business email for addEmail function in addressbook 2014-01-15 08:42:59 +00:00
Ralf Becker
629bd6f2ee added pixelegg/less/svg.css stylesheet and id reflecting their name to all svn image 2014-01-14 16:14:51 +00:00
Klaus Leithoff
e5acab5fb9 pixelegg changes from tuesday 2014-01-14 16:04:20 +00:00
Nathan Gray
b5ca559968 Fix context menu Calendar -> Add appointment 2014-01-14 15:43:06 +00:00
Nathan Gray
ac7b5271a9 Fix context menu Infolog -> linked entries opens infolog in iframe (too small) 2014-01-14 15:15:34 +00:00
Ralf Becker
21bb9ef481 pixelegg changes from monday 2014-01-14 08:20:32 +00:00
Hadi Nategh
3fa891380a Remove not used function in addressbook app.js, which has been committed mistakenly 2014-01-13 17:54:44 +00:00
Hadi Nategh
0c2ab2ada5 Fix send mail to business or private mail from addressbook mail context menu 2014-01-13 17:40:36 +00:00
Ralf Becker
c72c937341 pixelegg changes from friday 2014-01-11 18:52:09 +00:00
Ralf Becker
b59524c4f6 pixelegg changes from today 2014-01-08 18:49:29 +00:00
Klaus Leithoff
4d52be1f1c pixelegg changes from yesterday 2014-01-08 07:58:33 +00:00
Ralf Becker
6fd7ed4b2d * CalDAV/CardDAV: only advertice sync-collection report, if we track deleted entries (history-logging enabled, not working otherwise) 2014-01-07 11:10:51 +00:00
Hadi Nategh
bd505b1bf8 Add cc and bcc options to addressbook mail item in context menu 2014-01-06 10:12:51 +00:00
Klaus Leithoff
72b01700e5 Pixelegg changes 2014-01-06 08:47:48 +00:00
Ralf Becker
594750e7a9 Pixelegg changes 2013-12-30 17:34:29 +00:00
Klaus Leithoff
77dc45e0af pixeleggs work of the day (20th.Dez) 2013-12-20 14:32:40 +00:00
Klaus Leithoff
307cac1e03 pixelegg changes from 19.Dez 2013-12-20 09:35:46 +00:00
Nathan Gray
5b4484317d Implement addEmail action handler 2013-12-19 17:24:46 +00:00
Hadi Nategh
70f71c09ff Shift up mail action in addressbook's context menu, just to look a bit nicer 2013-12-19 15:53:26 +00:00
Hadi Nategh
6a56bdd9fa move mail action in addressbook's context menu to app integration category 2013-12-19 14:14:50 +00:00
Hadi Nategh
78d3a5126f Show email action in addressbook's context menu 2013-12-19 10:31:44 +00:00
Ralf Becker
b29317711a pixelegg changes from Wednesday 2013-12-19 03:14:47 +00:00
Ralf Becker
f7843e4507 pixelegg changes from Tuesday 2013-12-18 04:33:59 +00:00
Nathan Gray
5708aaafed Make sure angle brackets are angle brackets, fixes not well formed error in Firefox 2013-12-17 21:17:26 +00:00
Klaus Leithoff
b41be95681 latest pixelegg changes 2013-12-16 09:37:11 +00:00
Ralf Becker
1c7887ca6a Pixelegg changes from Thursday 2013-12-12 20:27:35 +00:00
Ralf Becker
4f7976cdff pixelegg changes from last days 2013-12-12 03:46:53 +00:00
Ralf Becker
391dde093e pixelegg changes from monday 2013-12-10 07:52:15 +00:00
Ralf Becker
921eaf73f1 pixelegg changes from last week 2013-12-08 21:38:36 +00:00
Nathan Gray
bd47e10b10 Switch to framework favorites to be able to store contact view as a favorite 2013-12-06 23:13:33 +00:00
Nathan Gray
1740b8d9be Fix missing category value when using category tree 2013-12-05 20:38:16 +00:00
Hadi Nategh
f222706dcc Replace old confirm() with new confirm dialog, samething like timesheet, no need to have seperate dialog creator in app.js 2013-12-05 11:06:25 +00:00
Nathan Gray
5f403e4ce3 Rather than splitting the available screen, enforce some minimum heights. Prevents overlap on small screens 2013-12-04 20:51:28 +00:00
Klaus Leithoff
68f2605cf4 translations generated/retrieved on translation site: Thank you for your contributions 2013-12-04 10:31:41 +00:00
Hadi Nategh
e1bb2a32d3 Fix missing window_close() in addressbook edit popup-> delete button 2013-12-04 09:58:47 +00:00
Ralf Becker
144da1e76d pixelegg changes from tuesday 2013-12-04 05:23:51 +00:00
Nathan Gray
b3be58d8fc Fix read-only n_fn, so it actually makes it to app code. 2013-12-02 18:14:43 +00:00
Nathan Gray
8f4fd55313 Align custom fields to top 2013-11-29 18:04:21 +00:00
Nathan Gray
c97d99d8e9 Fix addressbook edit tab sizing 2013-11-29 18:01:44 +00:00
Hadi Nategh
8f45c0e639 Replace old dialog delete dialog with new dialog in addressbook edit popup 2013-11-29 14:52:52 +00:00
Ralf Becker
3e471a8fb5 pixelegg changes 2013-11-28 20:21:17 +00:00
Ralf Becker
53eb8e553a pixelegg changes from yesterday 2013-11-28 06:20:18 +00:00
Nathan Gray
26639f56f9 Fix tabs, broken by r44604 2013-11-27 17:15:46 +00:00
Ralf Becker
73b6521cbf pixelegg changes from yesterday 2013-11-27 07:21:32 +00:00
Nathan Gray
ac3bf1726e Try to give space to contact view & infolog list in same tab 2013-11-27 00:13:01 +00:00
Nathan Gray
d7a075200d - Add ajax flag in a few missed places to keep out of iframe 
- Fix loading of old nextmatch_action.js
 2013-11-27 00:12:11 +00:00
Nathan Gray
ae4904076c - Instanciate infolog JS object if available (for contact view) 
- Fix custom country JS
 2013-11-26 23:37:48 +00:00
Ralf Becker
6d65b16223 latest pixelegg changes 2013-11-22 05:28:19 +00:00
Ralf Becker
cd99f101a1 pixelegg changes from yesterday 2013-11-20 08:41:17 +00:00
Nathan Gray
94f223c740 Fix for missing phone number section from Stefan Reinhardt 2013-11-19 19:16:13 +00:00
Ralf Becker
2b7d9af0a2 reverting to previous app.css file and remove app.less files, as they are not used by pixelegg template and create some glitches, might re-introduce .less for regular templates later 2013-11-18 19:57:38 +00:00
Ralf Becker
e71c04e56f todays pixelegg changes 2013-11-18 19:31:54 +00:00
Ralf Becker
87d98928fe setup index set to ajax=true for addressbook 2013-11-18 08:22:44 +00:00
Ralf Becker
f8752688e0 pixelegg changes from today 2013-11-15 17:09:58 +00:00
Ralf Becker
727cdc83b3 newewst pixelegg changed from today 2013-11-14 19:29:55 +00:00
Nathan Gray
ab8f7885c9 Fix export with type filter 2013-11-12 18:12:07 +00:00
Hadi Nategh
8312a69964 Fix addressbook wrong tab ids 2013-11-12 16:40:57 +00:00
Ralf Becker
5f849c4b25 allow to disable navbar in placeholder display, eg. when called from mail 2013-11-12 09:28:24 +00:00
Ralf Becker
583538e824 using now CSS preprocessor less (http://lesscss.org) to create some of our css files, used a lot in new Pixelegg template 2013-11-11 19:10:28 +00:00
Ralf Becker
77a30817d6 images for new Pixelegg template 2013-11-11 18:56:02 +00:00
Ralf Becker
f7c9f87f10 translation for new "copy instead of move" feature in addressbook 2013-11-11 12:04:22 +00:00
Hadi Nategh
1943b35303 Add \"copy\" feature for copying contact(s) to addressbook 2013-11-08 18:51:37 +00:00
Nathan Gray
aea4c35a90 Changes for importexport -> et2 2013-11-07 23:43:17 +00:00
Ralf Becker
6d226a7921 split constructor function and place of instanciation for app.js objects: app[appname] = new app.classes[appname](); 2013-11-04 20:54:23 +00:00
Ralf Becker
32e033df6f * PostgreSQL/Addressbook: fixed SQL error when sorting by a custom field 2013-10-24 14:57:36 +00:00
Nathan Gray
855d134f10 Make sure org name is in org name options, since it can change outside original function 2013-10-21 22:18:41 +00:00
Nathan Gray
71c2a554bd Set org rows' type column to match normal rows' type column, give # column a fixed width 2013-10-09 14:18:48 +00:00
Ralf Becker
52b4fd8654 * CardDAV/Addressbook: fixed all contacts were reported as NOT found and therefore not synchronised 2013-10-08 07:41:11 +00:00
Ralf Becker
a6311fa1a3 creating and using an app-specific egw object 2013-10-07 16:53:13 +00:00
Nathan Gray
b955b1b495 - Set type header to nextmatch-header 
- Fix styling on email addresses to show ellipsis if column is too short
- Add mail to 'Open EMail addresses in external mail program' check
 2013-10-05 10:13:31 +00:00
Ralf Becker
a16a6b81a9 giving icon column a fixed width of 20px 2013-10-05 07:22:18 +00:00
Ralf Becker
6e30816758 fixed not working download via action system: needed submit via POST request instead of Ajax, add new boolean action attribute postSubmit 2013-10-04 12:48:11 +00:00
Ralf Becker
f8a0db06fc completly remove preferences menu from sidebox and tiled preferences index in favoir of app-sensitive entries in top-menu 2013-10-03 09:23:18 +00:00
Ralf Becker
18285429e9 * CalDAV/CardDAV: fixed not working propfind-request to single resource in calendar/addressbook collection 2013-10-01 11:38:34 +00:00
Hadi Nategh
91fa09e4d5 Remove onchange=1 from selectbox in addressbook.index_right_addplus template, which were causing full submit 2013-09-27 12:08:26 +00:00
Hadi Nategh
edadfdc38a Remove onchange="1" from selectbox in addressbook.index template, which were causing full submit 2013-09-26 14:42:18 +00:00
Hadi Nategh
7374416f9c Fix textbox "Name" in addressbook edit popup window, try to not make it readonly. 2013-09-26 13:32:02 +00:00
Ralf Becker
a79192cc63 fixed not found multiget-report urls where not reported (worked for calendar only before sync-report was introduced) 2013-09-25 10:27:41 +00:00
Hadi Nategh
484a2bf6fc Fix disabled favorite menu in SideMenu of Addressbook. 2013-09-24 14:19:59 +00:00
Hadi Nategh
1c42747547 REmove "Whole query" menu item from Tracker, Timesheet and Addressbook, while et2 nm handles selection differently 2013-09-23 08:31:07 +00:00
Hadi Nategh
7481c0a23c Run addressbook by et2 2013-09-20 10:50:48 +00:00
Klaus Leithoff
bc83edc90c commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-09-09 12:04:28 +00:00
Ralf Becker
281dfe0fee fix sql error when deleting a user without distribution lists 2013-09-03 16:05:32 +00:00
Ralf Becker
7a0df1531d fixed distribution lists allways created in personal addressbook, not selected one 2013-09-02 13:24:21 +00:00
Ralf Becker
55b0081103 fixed not working delete-account hook 2013-09-02 11:19:42 +00:00
Ralf Becker
32ebec4feb * Addressbook: deleting an account now also takes care of deleting or changing ownership of distribution lists (beside contacts as before) 2013-08-30 07:05:19 +00:00
Klaus Leithoff
55667f8c45 commit some french lang file stuff; provided by Thomas Chaillot, Spirea 2013-08-27 08:53:55 +00:00
Ralf Becker
db7d12af4b first take on new ACL dialog for admin 2013-08-26 18:25:43 +00:00
Ralf Becker
a05bc204e9 fix cancel button in edit 2013-08-26 07:35:42 +00:00
Ralf Becker
b6480b3fcb switched off permanent error-log 2013-08-22 16:42:22 +00:00
Ralf Becker
7535f4c9f9 * CardDAV/Addressbook/LDAP/ADS: syncing all addressbooks into one now also allows to include accounts not stored like contacts 2013-08-22 16:39:21 +00:00
Ralf Becker
aa4af55f5f * CardDAV/Addressbook/LDAP/ADS: prefix, middle name, suffix was messed up, if iOS addressbook "Display Order" preferences was set to "lastname firstname" 2013-08-22 15:06:03 +00:00
Ralf Becker
5755457b04 * Addressbook/eSync/CardDAV: fixed not working (forced) preference to display only accounts of groupmembers, causing eSync to permanently try and fail reading other accounts 2013-08-19 15:10:18 +00:00
Hadi Nategh
2a791a2f8a fix privat address country does not preselect nation, should be analogous to business 2013-08-16 14:49:08 +00:00
Nathan Gray
cf8714293e Open preferences in preferences tab 2013-08-13 17:37:15 +00:00
Ralf Becker
2526840c2c fixed an other sql error when creating distribution lists 2013-08-06 10:18:12 +00:00
Ralf Becker
ffefc2848e * CardDAV/Addressbook/ActiveDirectory: fixes SQL error when clients tries to propfind groups/distribution lists on accounts-addressbook, also return "403 Forbidden" when he tries to create one, as they are not (yet) supported on accounts, if not stored in SQL 2013-08-06 09:14:20 +00:00
Ralf Becker
eea5de1559 an other case in which we need to filter out in-active accounts 2013-08-02 18:28:44 +00:00
Ralf Becker
afd034aca6 * CardDAV/Addressbook: fixed various issues with groups/distribution lists as supported by Apple and eMclient (groups need to be enabled in CalDAV/CardDAV preferences!) 2013-08-02 16:31:54 +00:00
Ralf Becker
1581547086 * CardDAV/Addressbook: fixed not working sync-collection report eg. by eMclient, if server-time is different from user 2013-08-02 14:41:31 +00:00
Ralf Becker
63869aae9a fixed addressbook cat changes where only stored using "extra tab with cat tree", two other options with multiselect where not working 2013-07-31 08:13:20 +00:00
Nathan Gray
c3b3fb5019 Fix cancel button in edit dialog 2013-07-30 14:24:32 +00:00
Ralf Becker
018eec3dfd fixed "PHP Fatal error: Unsupported operand types", if no private custom fields exist 2013-07-30 12:20:14 +00:00
Ralf Becker
4223019b93 * CardDAV/ActiveDirectory/LDAP: fixed typo causing doublication in account-addressbook of eMclient by always returning all accounts in multiget report 2013-07-27 08:22:26 +00:00
Ralf Becker
bc2133054b fix indention 2013-07-23 13:44:08 +00:00
Klaus Leithoff
88f866aec9 fix addressbook email popup; still todo: rightclick action 2013-07-17 14:53:24 +00:00
Ralf Becker
dae37d17a8 fix JSON error in trunk with readonly fileas-type selector (AD) 2013-07-11 15:34:30 +00:00
Ralf Becker
3060d95322 * Addressbook/Active Directory: got prefix, middle name and suffix working for AD account, file as got disabled (as well as not supported history tab) 2013-07-11 15:33:59 +00:00
Klaus Leithoff
da35098e08 * Addressbook/Home: mend issue regarding the display of multiple birthdays of the same contact in the home area 2013-07-10 07:19:53 +00:00
Ralf Becker
5e153a1a48 fixed CardDAV for accounts in ADS 2013-06-29 11:41:55 +00:00
Ralf Becker
300cdbe0c3 fixed not working re-creation because missing objectclass(es) in account-addressbook 2013-06-29 11:41:02 +00:00
Nathan Gray
8b912c6308 Add type template - admin uses existance of template to turn on types 2013-06-25 15:04:24 +00:00
Ralf Becker
c55d30dd07 fixing etag for lists to 2013-06-23 08:57:21 +00:00
Ralf Becker
df2847f67d * Addressbook/CardDAV: PUT returned empty ETag, proably causing unnecessary reloads of contacts 2013-06-23 08:43:35 +00:00
Ralf Becker
3087b84d28 remove not used dn-attribute, as in ldap 2013-06-20 17:24:59 +00:00
Ralf Becker
5b8e3811ed fixed not working adding of contacts in ldap and modifying contact data of accounts in AD 2013-06-20 17:16:17 +00:00
Ralf Becker
2057a8e180 do NOT add posixAccount objectclass to contacts, it is unnecessary and has required attributes not provided by addressbook 2013-06-20 15:48:15 +00:00
Ralf Becker
025c6a4c22 need to report expired accounts as NOT active and add ability to copy shadowExpire attribute from LDAP to AD (not done by samba-tool classicupgrade!) 2013-06-20 09:54:08 +00:00
Ralf Becker
da0aa5864c switching permanent error_log off 2013-06-20 07:57:54 +00:00
Ralf Becker
618c70a45d docu update 2013-06-20 07:50:12 +00:00
Ralf Becker
fe96404533 * Addressbook/ActiveDirectory: accounts addressbook was empty, if not explicit context was set 2013-06-20 07:46:34 +00:00
Nathan Gray
d189b005df Get edit dialog name popup working in et2 2013-06-19 19:02:41 +00:00
Ralf Becker
02e4c44624 * Addressbook/LDAP: recreation of contact (eg. because of missing objectclass) failed and lead to deleted contact or account 2013-06-18 10:45:00 +00:00
Nathan Gray
922b3c0784 Get edit dialog country selection 'Custom' toggles working again 2013-06-17 22:12:53 +00:00
Klaus Leithoff
079b919bbe russian translations provided by Vladimir Gavrilov (MBC-Group) 2013-06-17 12:30:44 +00:00
Klaus Leithoff
4e13e7b504 italiann translations provided by Ilias Chasapakis (webtrain.it) 2013-06-17 11:08:37 +00:00
Nathan Gray
44e96714af Fix adding distribution list (& maybe some other link issues) by looking for framework's link handler in open_link() 2013-06-12 17:04:42 +00:00
Ralf Becker
341342bc39 fixed not working multiple value "select-account" or "home-accounts" (rows > 1) custom fields 2013-06-12 14:12:58 +00:00
Nathan Gray
c93b1d7080 Fix Add distribution list action opening new tab 2013-06-10 19:47:09 +00:00
Nathan Gray
25c95ce870 Avoid overlap of public & private custom fields by giving privates an ID 2013-06-03 23:10:23 +00:00
Nathan Gray
0a33ad8eae Move select options for type to top level so et2 can find them 2013-06-03 22:43:03 +00:00
Ralf Becker
d328af7cff accounts addressbook incl. working updates for active directory 2013-06-01 17:55:33 +00:00
Ralf Becker
5c63214e82 contact id can be non-numeric, LDAP eg. uses UUID containing dashes and letters 2013-06-01 17:03:32 +00:00
Nathan Gray
5fc63e4fd5 Fix Export as CSV context option to not bring back the popup if you change a nextmatch filter 2013-05-29 20:51:28 +00:00
Ralf Becker
94bf204388 fixed typo causing no accounts to be displayed in accounts addressbook under ldap 2013-05-23 16:52:42 +00:00
Ralf Becker
4037993dc5 * API: full support of active directory as account storage, tested so far with Samba4 2013-05-22 17:22:20 +00:00
Ralf Becker
f8a53514be * Addressbook: allow to add a customfield to link title of addressbook 2013-05-10 08:52:06 +00:00
Nathan Gray
dedfd6f53e Get adding distribution list working with et2. JS still needs to be changed to new object style though 2013-05-06 23:16:10 +00:00
Nathan Gray
0917e21707 Fix case sensitive search on email when linking 2013-05-06 15:20:11 +00:00
Nathan Gray
06ab2ffcdc Implement delete import action 2013-04-29 15:32:09 +00:00
Klaus Leithoff
c51bf772c8 * Addressbook/Export: fix fatal error regarding order by for postgresql on addressbook export 2013-04-25 09:46:46 +00:00
Nathan Gray
936c51b749 Change field name translations so Export -> Import works across languages 2013-04-23 20:08:51 +00:00
Nathan Gray
4b2b4ca336 Fix context menu 'Use all' checkbox -> export had no data 2013-04-23 16:05:13 +00:00
Nathan Gray
14bbfaafe7 Only add delete_list placeholder action if user has permission 2013-04-15 15:14:36 +00:00
Nathan Gray
8b6e1d92da Correct quotes for both et & et2 2013-03-25 17:14:29 +00:00
Nathan Gray
699d215246 Adapt advanced search ajax response to work with et2 2013-03-25 16:57:50 +00:00
Nathan Gray
b42acd3b0b Get adding a distribution list working in et2 2013-03-20 23:11:54 +00:00
Nathan Gray
ca5d97f85c Accept et2 UIDs for popup too 2013-03-20 22:20:58 +00:00
Nathan Gray
b13ccf631c Add {{link}} placeholder to other apps 2013-03-20 14:51:09 +00:00
Ralf Becker
cbf7abc4fb reverted (unnecessary) fix of r41893, causing editing of account addressbook data to show up empty 2013-03-14 11:01:46 +00:00
Nathan Gray
0d06c2b394 Use new function to show favorites even when viewing a contact 2013-03-12 22:58:22 +00:00
Ralf Becker
0d9de3a9bc fixed on [Save] not closing edit window 2013-03-08 07:43:05 +00:00
Nathan Gray
27a20b7864 Automagic favorites in sidebox (et2) 2013-03-06 00:04:08 +00:00
Ralf Becker
8e586c5037 * Addressbook: fixed not working call auf addressbook_ui::(view|edit) with contact_id being a uid 2013-03-01 08:25:29 +00:00
Nathan Gray
c1593b8d84 Enable favorites in addressbook, fix egw_refresh() call 2013-02-27 18:14:59 +00:00
Nathan Gray
50c63d6a9e Fix addressbook CSV export - select options were non-standard 2013-02-27 15:33:35 +00:00
Klaus Leithoff
dfa8e97fb6 * Addressbook: fix problem regarding deleted entries found in org_view, when type filter is set to all 2013-02-21 16:04:15 +00:00
Jörg Lehrke
3bce17e854 Fix vCard field mapping during import (cummunity bug #3208) 2013-02-19 19:53:20 +00:00
Ralf Becker
4f247b26f8 merged translations and other uncommited ones 2013-02-08 19:03:20 +00:00
Nathan Gray
20e53cb21a Remove Add button width restriction, was actually respected by et2 2013-02-07 15:30:11 +00:00
Nathan Gray
42e9efac87 Avoid ID conflict between category select & tree in et2 2013-02-07 10:51:00 +00:00
Nathan Gray
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Nathan Gray
d288fadaec Get 'Whole query' context menu checkbox working with Export -> CSV menu item 2013-02-07 08:45:21 +00:00
Nathan Gray
767db2699e Turn on multiple for list category to show all categories in et2 2013-02-06 12:14:12 +00:00
Nathan Gray
c9764eb2e8 Remove cols attribute from n_fn field - it's a text field 2013-02-05 15:05:43 +00:00
Ralf Becker
cb94372bd5 fixed switching back to addressbook "all" does sometimes fail 2013-02-05 11:47:32 +00:00
Ralf Becker
daac136f47 as et2 adds options as text, we can NOT use html entities, but direct utf-8 chars, which unfortunately php does not support as string literals, using html_entity_decode therefor 2013-02-05 11:24:02 +00:00
Ralf Becker
caa76a3235 unset jpegphoto in get_rows, as it is unused and messes up json encoding (not utf-8) 2013-02-05 08:07:02 +00:00
Ralf Becker
609b512f3c missing xet file 2013-02-04 13:05:02 +00:00
Ralf Becker
36f38bb956 no longer hide account addressbook in new installs 2013-02-01 17:38:08 +00:00
Klaus Leithoff
90d75703ba russian translations provided by Vladimir N. Gavrilov 2013-02-01 10:12:10 +00:00
Ralf Becker
d5dfb4af1f if contact is an account and account-relevant data got updated, handle it like account got updated 2013-01-31 12:45:43 +00:00
Ralf Becker
7ff829cdfd fixed groups without account_status="A" are not found 2013-01-29 11:26:54 +00:00
Ralf Becker
5bb9cd1ad0 fixed addressbook "all" showed only accounts 2013-01-25 23:39:37 +00:00
Ralf Becker
2841317b08 * all apps: exclude expired or deactivated accounts from all lists and selections (beside admin app to be able to activate them again) 2013-01-25 13:21:31 +00:00
Nathan Gray
2b952c0157 Only parse dates if they have a ? wildcard 2013-01-24 16:35:39 +00:00
Ralf Becker
83aebbb176 reverted r41217, as it just generates a different error, need to find way to reproduce original problem to develop a fix 2013-01-24 10:47:49 +00:00
Nathan Gray
3eabe83d8e Fix export birthday filtering 2013-01-23 17:46:58 +00:00
Nathan Gray
36e0b275c3 Avoid warning if there are no explode settings 2013-01-23 17:24:45 +00:00
Klaus Leithoff
b1a2db3394 translations provided by Stefan Becker and others 2013-01-23 09:17:04 +00:00
Nathan Gray
66ef9a3273 Implement export filters for addressbook 2013-01-22 21:17:07 +00:00
Ralf Becker
4f16b71ea5 * CardDAV/Addressbook: do NOT allow to delete accounts via CardDAV, was never intended, but as it is allowed in addressbook, it was possible via CardDAV 2013-01-22 13:19:07 +00:00
Ralf Becker
0f76ff5ab5 * CardDAV: fixed wrong privileges for accounts addressbook, causing clients to report it read-only even for admins 2013-01-22 08:37:58 +00:00
Nathan Gray
1b5dfecc1c Organise preferences 2013-01-21 20:37:59 +00:00
Ralf Becker
be6845b4d0 * All apps: merged missing translations from other apps or branches 2013-01-18 13:48:34 +00:00
Nathan Gray
49a9a35ac8 Understand date with wildcard (19??.02.??) as a date in user's format. Convert to match bday. 2013-01-14 22:04:41 +00:00
Klaus Leithoff
ac2cf67697 if we search for list_id, note that we are joining addressbook_lists on addressbook2list, both containing list_id, so we need to specify tablename on search-column to meet sql requirements 2013-01-11 14:46:33 +00:00
Christian Binder
c8a5fe221a enable more apps to be merged by filemanagers itempicker 2013-01-04 00:21:37 +00:00
Nathan Gray
c120397363 Use revert icon for Undelete action 2012-12-31 22:05:14 +00:00
Nathan Gray
ca3bb185ad Use checkbox list for fields to update / fields to copy, add a button to toggle all 2012-12-17 16:31:56 +00:00
Nathan Gray
f00bee861f Give multiselect boxes full width 2012-12-11 17:50:22 +00:00
Nathan Gray
6f37d9b608 Add view hooks to addressbook-email so they open 2012-11-27 15:48:13 +00:00
Klaus Leithoff
322b7d049e revert commit Revision 40941; as it is/was plain wrong. 2012-11-26 11:45:06 +00:00
Klaus Leithoff
41221a5d72 fix SQL Error when inserting/updating carddav lists 2012-11-26 09:44:36 +00:00
Nathan Gray
76064cb490 Don't scare users, instead of displaying base64 encoded image in preview, just show -ENCODED IMAGE- 2012-11-21 18:08:52 +00:00
Ralf Becker
ec2ce0f943 * Setup: when migrating accounts from SQL to LDAP or back, also migrate addressbook data 2012-11-19 08:23:09 +00:00
Nathan Gray
4fc8903129 Fix bug where user preference for addressbook vCard was not used in some cases 2012-11-15 17:11:31 +00:00
Nathan Gray
94f84ce2b7 Default import vCard charset to user preference 2012-11-14 16:10:51 +00:00
Nathan Gray
4cb4835544 Default vcard export charset to user preference 2012-11-13 23:12:27 +00:00
Nathan Gray
4420b4b115 If opening window is not addressbook, update addressbook window too 2012-11-09 18:38:48 +00:00
Nathan Gray
8d93aac83f Use opener.egw_refresh() instead of redirecting to reload 2012-11-08 21:19:57 +00:00
Nathan Gray
9f4118e947 Use addressbook vCard charset preference for exporting vcards using Import/Export 2012-10-29 18:29:40 +00:00
Nathan Gray
9c2fb9ffda Use a better name for vcal exports (from context menu, etc) if only exporting one record 2012-10-24 16:15:17 +00:00
Ralf Becker
c733797fe0 for new contacts created eg. through eMail app, check email attribute first, before checking for other less significant attributes 2012-10-24 14:22:24 +00:00
Ralf Becker
97781b727d quiten permanent error_log in doublicate check aka addressbook_ui::ajax_check_values() 2012-10-24 10:18:13 +00:00
Ralf Becker
8139be67cb * Addressbook: call doublicate check when creating a new contact from eMail 2012-10-24 10:14:09 +00:00
Ralf Becker
6ade2ce970 * Addressbook: fixed error in extended search 2012-10-24 09:53:24 +00:00
Nathan Gray
2d3c11ab3c Expect human values in default import file, silences mismatch warning 2012-10-23 16:10:56 +00:00
Nathan Gray
eb40104d5b Fix birthday import, rename job title column in default definition 2012-10-23 15:15:54 +00:00
Nathan Gray
753b00a049 Include missing contact type for conversion to human values 2012-10-23 14:46:58 +00:00
Nathan Gray
cdeff90e8c Remove outdated CSV export charset preference - Import/Export app is used now 2012-10-16 19:33:06 +00:00
Nathan Gray
4f59f282a0 If exporting a single record, name the download file accordingly 2012-10-16 18:45:13 +00:00
Nathan Gray
fc8a139f23 Add 'None' category option to context menu for all apps using nextmatch::category_action() 2012-10-15 17:57:58 +00:00
Nathan Gray
2b96aff758 Import / Export cleanup: 
- Start reducing some duplication by making better use of common CSV import ancestor
- Work towards a universal preview, regardless of file type
 2012-10-12 19:50:26 +00:00
Nathan Gray
fa3eb90335 Fix missing export options 2012-10-09 18:01:00 +00:00
Nathan Gray
e50ff25831 Add a kind of data preview to vcard import dry run 2012-10-04 16:22:03 +00:00
Nathan Gray
23772bb9d1 Add ability to set charset in import vcard wizard 2012-10-01 17:59:44 +00:00
Ralf Becker
4e2a7dab80 * CardDAV/Addressbook: fixed not working delete of contacts 2012-10-01 17:23:44 +00:00
Ralf Becker
db4bdb7f74 * CalDAV/Calendar/Resources: calendars of resources can now be accessed or subscribed via CalDAV, to subscribe use CalDAV preferences 2012-09-27 15:46:08 +00:00
Ralf Becker
52675388a3 * CalDAV/CardDAV: sync-collection report for all apps allowing a more efficient sync 2012-09-26 14:30:47 +00:00
Ralf Becker
d0889dd612 * Addressbook: fixed not stored private custom-fields, if extra private tab was used 2012-09-25 09:02:42 +00:00
Nathan Gray
b3d463631a Strip out item groups from Apple Addressbook before processing 2012-09-24 16:05:52 +00:00
Ralf Becker
f224fe5852 sync-collection report for InfoLog, thought reminder app on OS X 10.8.2 does not use it, moved logic for sync-token to baseclass and determine availablity on supported-report-set 2012-09-24 10:26:29 +00:00
Ralf Becker
e69918f583 * CalDAV/CardDAV: return urn:uuid as last record in calendar-user-address-set, as according to iCal4OL developer, some clients might have problems with it, also adding both full uri and just path of principal url, as calendarserver does it 2012-09-24 07:07:57 +00:00
Ralf Becker
a6f541edba * CardDAV: rfc 6578 sync-collection report (more efficient way to sync contacts) 2012-09-23 20:19:35 +00:00
Nathan Gray
b06713480a Add default vcard import/export definitions 2012-09-20 17:05:45 +00:00
Nathan Gray
1610a7523e Report conversion warnings 2012-09-20 16:28:42 +00:00
Nathan Gray
c8eb6c5e24 * Add vcard import/export plugin 2012-09-18 15:09:48 +00:00
Nathan Gray
c1e2403ab7 Fix check on existing addressbook 2012-09-18 15:07:31 +00:00
Nathan Gray
67289c346b If data is already a Horde_iCalendar object, use it instead of creating a new one 2012-09-18 15:06:19 +00:00