extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,653 Commits 32 Branches 355 Tags 194 MiB
5d90b8f16d
Commit Graph

1783 Commits

Author SHA1 Message Date
Hadi Nategh
7481c0a23c Run addressbook by et2 2013-09-20 10:50:48 +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
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
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
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
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
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
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
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
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
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
36f38bb956 no longer hide account addressbook in new installs 2013-02-01 17:38:08 +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
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
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
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
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
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
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
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
Nathan Gray
b85e5d0889 Some destination addressbook checking - must exist as an addressbook, not just an account or group 2012-09-17 15:47:47 +00:00
Nathan Gray
170d120dd2 LDAP search to match sql search: If row limit is < 0, don't slice, return all records 2012-09-13 17:59:10 +00:00
Ralf Becker
c50a83a9a4 * Addressbook: doublicate check while adding/editing contacts, based on email or match of 2 out of name, first name, organisation 2012-09-06 12:26:11 +00:00
Ralf Becker
f7fa8ea37e * Addressbook/InfoLog/Filemanager/Tracker: added or fixed formatting of certain custom field types using a single shared method 2012-08-09 12:41:47 +00:00
Ralf Becker
0c5ca986c6 quieten warning in delete-category hook, if cat is not used 2012-08-09 08:25:53 +00:00
Ralf Becker
082372881d * CardDAV: disable category and class (public/private) for iOS, because they are not displayed and get messed up 2012-07-31 16:18:26 +00:00
Ralf Becker
1141eb1ee0 * Addressbook/CardDAV: fixed lost cell-phone numbers, caused by SyncML update 2012-07-31 14:58:13 +00:00
Nathan Gray
70bc8469a1 et2 compatability 2012-07-24 23:49:12 +00:00
Ralf Becker
a8d1376205 * Addressbook: fixed not working resize or conversation of non-jpeg images in newer php versions 2012-07-17 13:17:19 +00:00
Ralf Becker
ab1fdb0617 * Addressbook: fixed error when adding a new organisation member for organisation(department)s containing a comma 2012-07-17 12:15:10 +00:00
Ralf Becker
223c2b7b7d fixed PHP Strict Standards: Only variables should be assigned by reference 2012-07-14 07:44:13 +00:00
Christian Binder
f81fd11435 tag applications which have implemented document merge 2012-07-04 17:00:03 +00:00
Ralf Becker
b025809df1 * CalDAV/CardDAV expand-property report for principals used in iCal on OS X 10.7 2012-06-27 20:08:56 +00:00
Jörg Lehrke
358252b4a1 * Fix Funambol vCard issues (community bug #1999) 2012-06-17 12:28:16 +00:00
Ralf Becker
f48b6c244f do NOT instanciate tracking class by default: it is only used for (seldome) updates and stalls updates in setup sometimes (1.6 update) 2012-06-17 10:03:28 +00:00
Klaus Leithoff
4d70099c15 * Addressbook: fix for postgres error on advanced search in addressbook (Helpdesk 3421) 2012-06-01 12:51:22 +00:00
Nathan Gray
de8bc4771c Fix bug that ignored 'stop' in import condition, default definition 2012-05-29 14:37:19 +00:00
Klaus Leithoff
57be9157d5 * addressbook/importexport: if there are no export csv definitions for a given user, do not show the csv export option in context menu 2012-05-29 13:39:44 +00:00
Jörg Lehrke
9d11043ef3 * Fix country name issue during SyncML slowsync (community bug #3146) 2012-05-23 09:19:58 +00:00
Ralf Becker
6ff1db3534 * Preferences all apps: add validation for vfs files and directories to give user immediate feedback about wrong or non vfs pathes 2012-05-22 13:51:30 +00:00
Ralf Becker
f280a38ed6 changed translation of "org_name" field to "Organisation" from "Company", as it is translated in edit template 2012-05-15 16:53:19 +00:00
Ralf Becker
3d70c12a6a correctly disable change_org, if no organisation set 2012-05-15 16:52:25 +00:00
Ralf Becker
feb64d5b16 * Addressbook: fixed not working changing of organisation members, also place this feature more prominent beside buttons 2012-05-15 15:52:11 +00:00
Ralf Becker
d0a2ffc8fe * EMail: fixed not working search in Addressbook, if LDAP backend was used (my.stylite.de bug #3337) 2012-05-15 10:21:01 +00:00
Nathan Gray
7810068ed0 Fix SQL error when exporting sorted by contact_id 2012-05-14 18:00:19 +00:00
Nathan Gray
065fd1a772 Point account links to addressbook view 2012-05-03 15:23:30 +00:00
Ralf Becker
9a8dcc6eb4 * Addressbook/LDAP|SQL->LDAP: fixed error during creation of new contacts, SQL->LDAP now also displays LDAP errors 2012-04-29 15:41:38 +00:00
Nathan Gray
e895274d69 If exporting all, and filter is missing, use current owner 2012-04-23 17:52:36 +00:00
Nathan Gray
e5fd49940f Return export object 2012-04-18 18:00:21 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Ralf Becker
bd825787b2 do NOT blanc fileas_type, as it is not always set in vCard, but should be set in EGroupware 2012-04-04 17:48:49 +00:00
Ralf Becker
4a0d52e834 * CardDAV: fixed not working deleting of existing fields and cell phone numbers for Apple clients 2012-04-04 17:39:35 +00:00
Ralf Becker
cb8940256c do NOT store state in prefs, if csv_export is set 2012-03-29 12:59:22 +00:00
Ralf Becker
ee8fd5b10e found a lot more calls to get_rows missing to set csv_export flag and fixed code in nextmatch dealing with situation if num_rows=-1 got stored in prefs anyway 2012-03-29 12:06:10 +00:00
Ralf Becker
a1ffcd08e4 * Admin/Addressbook: fixed wrong timezone in created and modified times for contacts and accounts 
- fixed typo / wrong direction of conversation when storing contacts
- fixed accounts_sql, which uses addressbook_bo::search() to convert created and modified timestamps to servertime as
- (documented that) accounts class (SQL and LDAP) operate completly in server-time
 2012-03-14 15:22:51 +00:00
Ralf Becker
e03b8471e9 * Admin/Addressbook: do NOT mark accounts as deleted, as accounts do NOT know that state, always deleted them and allow to cleanup already marked as deleted accounts in addressbook 2012-03-07 12:05:02 +00:00
Ralf Becker
f676a23821 fixes for PHP 5.4 warnings and strict warnings, thought disabled E_STRICT for now, because of various strict warnings in working code, which could not be easy fixed in all areas (see comment in phpgwapi/inc/functions.inc.php) 2012-03-04 13:33:10 +00:00
Ralf Becker
4711bc2ac1 fixed ldap backend not working for multiple owners 2012-02-29 13:36:24 +00:00
Ralf Becker
7bc098d7c3 * CardDAV/GroupDAV/Addressbook: works now with LDAP backend (account only or all contacts), fixed not working update of accounts (SQL and LDAP), changed ctag generation to work with LDAP too 2012-02-29 09:58:15 +00:00
Nathan Gray
d67191841b Change addressbook Export CSV context menu option to use importexport 2012-02-27 16:06:10 +00:00
Ralf Becker
2bc821f428 use groupdav->log() for all permanent error-messages, to log the into request-log too, if both If-Match and If-Schdule-Tag-Match given use If-Match for organiser/owner and If-Schedule-Tag-Match for attendees/participants 2012-02-21 20:04:45 +00:00
Ralf Becker
7badca95da * CardDAV/Addressbook: storing Apple AB type company (X-ABShowAs:COMPANY) as EGroupware fileAs company 2012-02-21 08:57:55 +00:00
Ralf Becker
b0d47bd7d5 fixed missing owner 2012-02-20 11:25:41 +00:00
Ralf Becker
873db447bc fixed not working PUT of groups/lists 2012-02-18 10:22:59 +00:00
Ralf Becker
eb440fe4d3 * Addressbook: disable custom field tabs, if contact is stored in LDAP, which does not support CFs 2012-02-17 15:00:51 +00:00
Ralf Becker
d33929a332 * Addressbook/CardDAV: fixed sync all in one addressbook changed AB to personal, use default addressbook for new contacts if synced, otherwise use always synced personal AB 2012-02-15 13:04:27 +00:00
Ralf Becker
2939d7bbf3 propagate data from settings hook to handlers, to fix failed installs because setup was not detected 2012-02-14 17:38:45 +00:00
Ralf Becker
7d2572dca5 added user-agent detection for Snow Leopard (OS X 10.6) addressbook, to stop it from messing up categories and photo, Lion (10.7) addressbook works find 2012-02-14 15:14:41 +00:00
Ralf Becker
1f76e0c191 fixed several small issues around CardDAV and history logging in addressbook (dont log not set custom fields as there are not stored and therefore not changed) 2012-02-10 21:29:50 +00:00
Ralf Becker
f8d2a88e41 * Addressbook: use vCard version 3 when exporting via context menu 2012-02-10 20:32:45 +00:00
Ralf Becker
7a6959ca3f many bugfixes around distribution-lists/groups and some code restructuring 2012-02-09 20:09:49 +00:00
Ralf Becker
7db225b181 * eSync/Addressbook: HTC Desire needs at least one telefon number, otherwise sync of contact fails without error, we now return at least an empty work phone 2012-02-09 13:28:47 +00:00
Ralf Becker
edb42dbfd2 * eSync/Addressbook: for all-in-one addressbook only use add-default, if it is contained in addressbooks selected, otherwise use personal addressbook 2012-02-08 15:12:37 +00:00
Ralf Becker
213a53900d missing change in addressbook for r37912 2012-02-07 17:10:21 +00:00
Ralf Becker
d7fca17d6e resurrect preference to sync all ABs into one (allways implied for OS X) and new pref to "Distributionlists as groups", plus explenation of the prefs 2012-02-04 21:47:28 +00:00
Ralf Becker
d89f48d9c1 implement RFC 5995 add member to collection via POST, but not yet set DAV:add-member due to problems with OS X clients 2012-02-04 20:24:01 +00:00
Ralf Becker
c5ca42a4b1 move app-specific settings to app-handler 2012-02-04 01:24:34 +00:00
Ralf Becker
d21be8d871 move logic of which addressbook/calendars are shared into app-handler 2012-02-04 01:03:56 +00:00
Nathan Gray
8018a0f243 Make sure letter filter doesn't persist 2012-02-01 20:34:32 +00:00
Ralf Becker
902d569026 * Addressbook/CardDAV: fixed Apple iOS and OS X addressbook messed up phone numbers (Mobile is now mobile for both and iPhone is matched to EGroupware private cell) 
also removed copy of supportedFields and using again default ones from addressbook_vcal, with Apple specific fixes in _get_handler()
 2012-02-01 19:52:19 +00:00
Ralf Becker
625a125e83 fixed not working update of members 2012-02-01 00:59:25 +00:00
Ralf Becker
f5cb740795 limit groupVCard to contacts of same addressbook, as OS X and iOS only allows that and PUTs would remove contacts from other ABs, also fixed not working multiget report of lists/groups 2012-02-01 00:31:24 +00:00
Ralf Becker
6f1c2eacac extend ctag to lists 2012-01-31 20:06:27 +00:00
Ralf Becker
5c020ac87d fixed many issues with distribution lists as vCard groups, also adding/removing contacts from a list in web-GUI is working again 2012-01-31 19:47:52 +00:00
Ralf Becker
ac5da046e4 fixed typo 2012-01-31 17:13:25 +00:00
Ralf Becker
41eaebde79 first try to export distribution lists via CardDAV as vCard with "X-CALENDARSERVER-KIND:group", we might need a user-agent whitelist, as not all clients will understand that 2012-01-31 09:57:59 +00:00
Ralf Becker
1f93855172 fill displayname for contacts and task to easier identify it in autoindex 2012-01-31 00:37:01 +00:00
Ralf Becker
4450c87ff1 fixed images allways get resized, because mb_substring returned 3 bytes, using cut_bytes now 2012-01-30 19:48:24 +00:00
Ralf Becker
3db7b2f5c2 setting CardDAV:max-image-size on addressbook collections, so iOS scales it down before sending 2012-01-30 19:47:34 +00:00
Ralf Becker
01ce3bd88d * CalDAV/CardDAV: /addressbook-accounts/ and PROPPATCH for addressbooks/calendars for every namespace but CalDAV, CardDAV or Calendarserver (displayname or *-describtion are ok) 2012-01-30 05:11:05 +00:00
Ralf Becker
7f14a2a196 * CardDAV: fixed sometimes not working creation of new contacts from the device, if accounts are stored in LDAP 
not sure why I used $this->bo->account_repository != "ldap", it makes no sense, as we specify the column explicitly, no idea if CardDAV works for an addressbook in LDAP, but now it works for accounts in LDAP too
 2012-01-20 06:44:40 +00:00
Nathan Gray
3a84f16317 Enumerate recurring events when merging last / next date for contact 2012-01-19 18:17:28 +00:00
Nathan Gray
871701d774 Fix links/[app] merge tag - copy/paste error 2012-01-13 19:49:19 +00:00
Ralf Becker
d972804aff * Addressbook: preference to open EMail addresses in external mail program, even if user has access to EMail app 2012-01-13 05:22:18 +00:00
Ralf Becker
b7babf5079 open calendar of contacts in listview with date-filter "all" and for jdots in calendar tab (not addressbook) 2012-01-07 23:35:17 +00:00
Nathan Gray
02861daf88 Add mergeprint tag for links to a specified application: links/appname 2012-01-06 18:35:34 +00:00
Klaus Leithoff
4cda10552e addressbook/esync: make sure private is set (with 0 or 1); as an contact_private set to NULL within the database is invisible to the users 2012-01-05 11:50:46 +00:00
Ralf Becker
f71782a8e0 * Addressbook: show calendar of contact(s) via context menu 2012-01-05 04:10:54 +00:00
Klaus Leithoff
d50d0f3d0a * addressbook: distributionlists, allow to add any seen contact to an available (and editable) distributionlist 2011-12-28 10:55:24 +00:00
Klaus Leithoff
4a65e417c5 fix bug regarding changed owner id for private/own addressbook, as private addressbook holds a special id in activesync, resulting in failed sync of private addressbook entrys 2011-12-20 14:29:10 +00:00
Klaus Leithoff
84386ade01 control the availabilityof the stylite app, before trying to offer the mail VCard feature, because stylite.links:// is used/needed here 2011-12-16 11:23:55 +00:00
Nathan Gray
f6a443a917 Add warnings to import plugin 2011-12-15 16:24:47 +00:00
Nathan Gray
27b45f92be Even if not successful, attempts count as row processed 2011-12-13 16:07:49 +00:00
Nathan Gray
867b0f5343 Set currentapp to addressbook so existing categories are properly detected 2011-12-09 17:49:05 +00:00
Nathan Gray
d0f9f93d4a Revert #37423 - mis-understood change 2011-12-05 19:32:12 +00:00
Nathan Gray
6ecf36d27b Change 'title' to 'Job title', 'role' to 'Occupation'. Apparently these changed. Fixes automatic field mapping in import 2011-12-05 17:48:39 +00:00
Ralf Becker
86577fa44e * Addressbook: ablity to mail (multiple) vCard via context menu 2011-11-29 12:07:11 +00:00
Ralf Becker
7c9dd8086f changed "No defintion" to "Old fixed definition" 2011-11-21 10:01:08 +00:00
Ralf Becker
8a1bb0a89e fix for bug #3071: r37248 - new function makes problems in listview/unable to hide field 2011-11-20 09:14:16 +00:00
Nathan Gray
1afba81ce8 Add 'No definition' option for default export definition preference. Allows use of legacy nextmatch CSV export with Import/Export app still available 2011-11-18 16:01:57 +00:00
Ralf Becker
bab120d11b * Addressbook: filter by country or sort by post code of home address 2011-11-11 16:56:08 +00:00
Ralf Becker
d9a824efa2 skip "unknown xml" warning in addressbook-multiget report 2011-11-10 06:57:54 +00:00
Klaus Leithoff
5c12f98c94 * addressbook: current contact type is now used on creating new addressbook entrys (except a explizit type is requested via GET) 2011-11-09 09:06:27 +00:00
Ralf Becker
4ec8f909a1 quietened permanent error_log 2011-10-28 16:15:00 +00:00
Nathan Gray
4ab5f97ed0 Add {{links}}, {{attachments}}, {{links_attachments}} placeholders 2011-10-26 16:45:38 +00:00
Nathan Gray
0b5db7ace2 Process birthday when importing 2011-10-25 18:49:14 +00:00
Philip Herbert
0b924e9e6e esync: fix for not updated calender, contact, task on device if only description or note was changed in EGroupware. Also fixing issue that values in these fields could not be deleted on several devices. 2011-10-23 18:16:41 +00:00
Ralf Becker
ceaec3d3c1 added calendar-timezone property, changed groupdav_handler::extra_properties signature (removed static and added $user parameter), removed calendar-user-address-set property belonging only to principal 2011-10-20 13:35:01 +00:00
Ralf Becker
5458e76caa * eSync/Addressbook: for all-in-one addressbook, add addressbook name as category; keep from AS not supported fields unchanged (eg. custom fields) 2011-10-19 15:51:18 +00:00
Ralf Becker
b2fa12eb3e remove unusual and unnecessary "EGw-...-wGE" prefix/postfix from etag and ctag 2011-10-08 11:34:55 +00:00
Klaus Leithoff
87ac5880db addressbook/export: fix for headerline gets repeated multiple times, when export is set to no for addressbook, but user is exemted from limitations 2011-10-05 12:09:00 +00:00
Klaus Leithoff
279b934746 * addressbook/export: fix problem of failed export for non admins, when no export-limit is set 2011-10-05 10:32:24 +00:00
Ralf Becker
f1029c07c9 added EGroupware PRODID and DURATION for VTODO 2011-10-05 09:24:08 +00:00
Ralf Becker
e05ce4d614 enclosing etag in quotes, as most servers do 2011-10-05 08:15:24 +00:00
Ralf Becker
3f564ac5aa enhanced addressbook-query report filter to parse filter given by Mac OS Addressbook directory gateway query 2011-10-05 06:50:26 +00:00
Ralf Becker
23584253fd not returning deleted entries for read, as they might have identical UID for caldav_name as a non-deleted entry and would therefore block access to these 2011-10-04 14:18:35 +00:00
Ralf Becker
0de2f3c527 fixed profind depth 0 directly on a resource contains name-part twice 2011-10-04 12:16:03 +00:00
Ralf Becker
288a88239b we should not return an etag here, as we never store the PUT ical byte-by-byte 2011-10-03 15:48:24 +00:00
Ralf Becker
0003a93c11 * CardDAV/GroupDAV/Addressbook: do NOT check for api version, as it caused accounts created during setup to have no carddav_name and therefore fail in CardDAV/GroupDAV (shown as "/addressbook/" in collection list!) 2011-09-28 09:48:47 +00:00
Ralf Becker
b44e108cea * CardDAV/GroupDAV/Addressbook: do NOT check for api version, as it caused accounts created during setup to have no carddav_name and therefore fail in CardDAV/GroupDAV (shown as "/addressbook/" in collection list!) 2011-09-28 09:47:47 +00:00
Ralf Becker
1f39e5c562 - added WebDAV ACL props supported-privilege-set and current-user-privilege-set 
+ currently only standard WebDAV privileges: read, read-current-user-privilege-set, write-content, bind and unbind used
  + they get only queried for collections, thought we dont report any write* on collections, as we dont allow to create calendars or change properties
- new groupdav::add_resource() method used to add all resources (incl. collections) to propfind or report requests
- improved autoindex to show nicely indented hierarchical properties
 2011-09-21 20:08:21 +00:00
Klaus Leithoff
2b6409d998 * addressbook/csv-import: fix/enable update of account - userdata when accounts are stored with ldap. If the condition is on account_id, we supplement the condition with owner=0 (this is needed to correctly determine the storage engine (ldap/sql) for accounts); we strongly recomment NOT to try to use this for adding accounts: use admin import definitions for that task 2011-09-19 10:15:32 +00:00
Ralf Becker
03ed1d3ddb - refactored code to use a single add_collection method in groupdav class 
--> app groupdav classes now get calling groupdav object as parameter
Had a quick test with iOS & OS X addressbook, calendar and with Lightning
 2011-09-18 10:56:56 +00:00
Klaus Leithoff
2d494997ab rework of bo_merge::getExportLimit, apply to etemplate, importexport, addressbook, calendar 2011-09-16 13:03:46 +00:00
Klaus Leithoff
f616b34f58 API: introduce register_single_app_hook to be able to add or update one hook for an required app. register added/updated hooks with ->location; calendar and addressbook are using this to insert export_limit hook if not available. use app hook to fetch app specific export limit with import_export side_menu additions too 2011-09-15 16:53:20 +00:00
Klaus Leithoff
fc3fc728a4 register_hooks, without hook array, does not reregister all app hooks, so use register_all_hooks instead 2011-09-15 15:03:25 +00:00
Klaus Leithoff
d9905d3fb4 calendar/addressbook/API: introduce hook to fetch the export_limit to be applied for an app; introduce method to test if a specific hook exists for an application; fetch the export_limit via hook where appropriate 2011-09-15 14:46:56 +00:00
Ralf Becker
117179ad0f * Addressbook/LDAP: fixed country handling for mozillaOrgPerson schema, which has two distinct attributes for 2-letter code and arbitrary name 2011-09-13 10:36:03 +00:00
Klaus Leithoff
a2730516fe silence some error log statements 2011-09-13 10:16:29 +00:00
Klaus Leithoff
d52c72207c * calendar/importexport/addressbook: calendar introduce new config option to set app specific export_limit; calendar csv export: use enumerate for exporting events as csv; bo_merge: introduce new helper functions to get and check export-limit; addressbook: use new helper functions 2011-09-13 09:05:33 +00:00
Ralf Becker
c2750ba12b ensure accounts and group addressbooks are never private! 2011-09-09 06:36:16 +00:00
Ralf Becker
4088300b57 docu fixes 2011-08-31 12:24:50 +00:00
Klaus Leithoff
1d8034e17b code cleanup: as bo_merge::is_export_limit_excepted checks for ->is Admin<- already 2011-08-30 15:13:58 +00:00
Klaus Leithoff
1cc3692bfd adapting missed export_limit_excepted processing to static bo_merge::is_export_limit_excepted 2011-08-30 14:02:00 +00:00
Ralf Becker
d6b70f4578 using bo_merge::is_exportlimit_excepted() which takes care of not longer serialized egw_info/server values 2011-08-29 12:20:16 +00:00
Klaus Leithoff
c86a85636a silence some export-limits warnings 2011-08-29 11:33:10 +00:00
Ralf Becker
10325b93c8 one server-config missed in r36329: arrays in $GLOBALS[egw_info][server] are now automatically serialized and unserialized 2011-08-27 16:11:10 +00:00
Ralf Becker
389486793d - config is now cached on instance level 
- arrays in $GLOBALS[egw_info][server] are now automatically serialized and unserialized
- new static method to check if user is export-limit excepted
--> saves to query it on each request (for non-phpgwapi, which was already cached in the session)
 2011-08-26 13:50:20 +00:00
Nathan Gray
0264b70a0b Silence warning when export exception is not set 2011-08-22 14:20:44 +00:00
Nathan Gray
a572007f1c Missed one implementation of limit exception user/group 2011-08-19 14:27:49 +00:00
Nathan Gray
16bafa78b8 Implement export restriction exception for given users/groups in apps 2011-08-17 15:38:56 +00:00
Ralf Becker
858279ad84 * eSync/Addressbook: new preference to force sorting on device, eg. for use with Windows Mobile, which use "own sorting" set in addressbook otherwise 2011-08-10 14:24:30 +00:00
Ralf Becker
70e2684dd5 fixed catchable fatal error ($old hast to be array or null) and avoid reading old contact twice 2011-08-10 13:03:51 +00:00
Nathan Gray
e15b7304bc Unset empty private, it causes issues trying to find them 2011-08-09 19:14:03 +00:00
Ralf Becker
91545df1e6 * eSync/Addressbook: added mapping of private cellphone to home2phone, other phone to business2phonenumber and changed role to title in mapping of jobtitle (role is no longer mapped, because no outlook equivalent, egw prefix is mapped to ol title!) 2011-08-09 10:07:22 +00:00
Nathan Gray
e6b2c43e26 Fix addressbook missing from CSV goes to accounts 2011-08-08 14:44:53 +00:00
Nathan Gray
d6bf31a1b1 Add ability to specify that imported contacts go to importer's personal addressbook 2011-07-28 23:26:08 +00:00
Klaus Leithoff
fe9e16d845 fix by Ralf for bug, that prevented the update of accounts, if your accountselection method is groupmembers 2011-07-18 09:46:32 +00:00
Nathan Gray
21cc152386 Get action button & select all button working for email popup 2011-07-12 14:36:59 +00:00
Nathan Gray
31d1e20bdc Fix typo: definitition -> definition 2011-07-04 20:00:26 +00:00
Nathan Gray
eec3bd3d5b Clean up translations - move common merge stuff into preferences 2011-07-04 18:12:12 +00:00
Ralf Becker
b093cd8720 missing $contact_app parameter, stalling grants 2011-06-27 15:30:56 +00:00
Ralf Becker
73486cc047 file_access_user implementation for addressbook 2011-06-26 13:55:25 +00:00
Nathan Gray
039e351d8b 'Disable' Export & merge spreadsheet in sidebox for addressbook view 2011-06-22 18:14:52 +00:00
Nathan Gray
275a1d3f27 Change category list links 2011-06-21 21:14:51 +00:00
Ralf Becker
40dd19fd3e * CardDAV/GroupDAV: handle deleted contacts, as not existing (404 Not Found) 2011-06-19 09:01:15 +00:00
Ralf Becker
92ddeca1fb - fail with error message, if user trys to export more entries then allowed (previously entries were silently cut down to allowed number, even 0!) 
- fixed path of document-actions if more then one directory with subdirectories were given
 2011-06-16 11:36:15 +00:00
Philip Herbert
3d1cbd3f40 removed accidently commited test-change 2011-06-14 16:07:44 +00:00
Philip Herbert
1a51ac86f7 merged latest changes from Andreas B. with the following changes: 
- adapted searchquery so that parameters are equal for gal, mailbox and documentlibrary searches
 - Fix SAMSUNG Android 2.3.3 client compose_Saveinsentitems breaking
 - Corrected searchquery for GAL so that it includes the search range for backends that filter range already during query 
 - Take correct exporter to find changecount for optionfolder 
 - Fix for handling Sync requests where same item gets read and removed.
 2011-06-14 15:33:11 +00:00
Ralf Becker
1774e5674f support for multiple space or comma separated download dirs 2011-06-14 10:48:15 +00:00
Ralf Becker
220af27f60 Create template directory and set default document_dir preference of addressbook, calendar, infolog, tracker, timesheet and projectmanager 2011-06-11 11:57:51 +00:00
Nathan Gray
22426b6bd6 If ordering contacts by a numeric field (last modified), apply letter filter to org name instead of ordered field 2011-06-06 16:41:17 +00:00
Nathan Gray
596f252eb7 Patch from Bjorn Padding to silence JS error when addressbook is in LDAP 2011-06-02 20:01:25 +00:00
Ralf Becker
a6784aefbc calling the global action-object-manager 2011-06-02 16:57:33 +00:00
Nathan Gray
4f3dc53cb6 Make addressbook_merge respect addressbook's extra export limit 2011-05-20 17:50:51 +00:00
Nathan Gray
0eeb67f90a Respect addressbook's extra export limit 2011-05-20 17:18:49 +00:00
Klaus Leithoff
957b43afd4 add forgoten return to save_history 2011-05-17 08:02:29 +00:00
Nathan Gray
450b380de1 Use static convert from importexport to handle human values, custom fields 2011-05-12 18:01:34 +00:00
Ralf Becker
a3805293b2 name Z-Push based ActiveSync protocoll support in EGroupware "eSync" 2011-05-07 16:52:48 +00:00
Ralf Becker
848cde1489 upper check-all button also needs to call egw_objectManager.toggleAllSelected() 2011-05-06 13:28:07 +00:00
Nathan Gray
8b4728ad4a Allow documents in dirs other than user's preference dir by passing full path 2011-05-05 21:41:00 +00:00
Ralf Becker
1e8de99ed7 Move initialisation for egw_actions stuff into static method of nextmatch_widget, it get called now from: 
- etemplate::show_grid() 
- addressbook_ui::view() to load JS stuff before header get generated
 2011-05-02 13:34:59 +00:00
Ralf Becker
8247d55fc1 fixed missing space when adding multiple classes, causing context menu not recognising readonly, if also not deletable 2011-04-28 09:12:30 +00:00
Ralf Becker
594fe78d09 enable via a class and no more need to set enabled='javascript:nm...' for enableClass or disableClass 2011-04-27 16:59:12 +00:00
Ralf Becker
633b3da6b4 disable filemanager link for mulitple selected contacts 2011-04-27 10:14:32 +00:00
Ralf Becker
fb5ea143be - returning checked state of all checkboxes, not only select_all, in $content[nm][checkboxes] 
- $content[nm][select_all] is now only reference to $content[nm][checkboxes][select_all]
- checkboxes need no default onExecute, therefore removed nm_select_all method
- improved documentation for action stuff in nextmatch widget
- added egwAction.getActionsByAttr(_attr, _val) method returning all actions with a given attribute and value
 2011-04-27 07:49:46 +00:00
Ralf Becker
7d02a952f6 - move all static javascript code to app.js file 
- fixed "add appointment" to work in org-views by submitting to server to resolve org with contact id's and custom js action prefixing each id with a "c"
- improved "add infolog" to only submit for org-views to server and otherwise save that roundtrip by using a custom ja action
 2011-04-26 16:22:10 +00:00
Ralf Becker
98a2731116 - fixed not working add or remove category method from context menu 
- disabling actions not available, because of missing rights
- trying to disable "remove from distribution list" and "delete distribution list", when no list is selected
  --> not yet working
 2011-04-25 14:13:40 +00:00
Ralf Becker
e474b0f0d4 - insert in document action: 
+ one submenu with default document (if set) on top
  + if more then 9 documents, show them in submenus by mime type
- added copy address as second point to add submenu, beside new
- icons for move to addressbook
- fixed icons for org views
--> addressbook context menu should now be fully functional - let me know if not ;-)
 2011-04-25 11:30:37 +00:00
Ralf Becker
dca785709f fixing the fix ... (db-name is in key, not value) 2011-04-21 15:05:10 +00:00
Ralf Becker
53400c27f0 * PostgreSQL/Addressbook: fixed SQL error when listing account, groups or querying birthdays 2011-04-21 14:31:10 +00:00
Ralf Becker
8d22f87057 fixed not working edit of contacts 2011-04-19 15:11:51 +00:00
Ralf Becker
9859a038af - fixed not readonly custom fields, give all tabs equal height and adjusted height of phone numbers 
- removed custom field specific history log code, as it's handled now by historylog-widget and bo_tracking
 2011-04-19 15:03:58 +00:00
Ralf Becker
cabcd99149 fixed not working insert in document 2011-04-18 11:56:52 +00:00
Ralf Becker
342799a86a - further work on addressbook context menu, still not fully functional! 
- moved a few more common phrases into API
 2011-04-17 21:25:01 +00:00
Ralf Becker
fe5202c7a2 context menu for addressbook, please note: not everything is fully functional yet 2011-04-17 14:10:05 +00:00