1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-12 23:09:15 +01:00
Commit Graph

275 Commits

Author SHA1 Message Date
Thomas Tanghus
2f23a59fad Contacts: Various fixes and cleanups. 2012-11-22 00:31:08 +01:00
Thomas Tanghus
3a25cc050e Contacts: Use Sabre\VObject 2012-11-22 00:14:03 +01:00
Thomas Tanghus
098aded213 Contacts: Another namespace err 2012-11-16 04:35:14 +01:00
Thomas Tanghus
5c38880f78 Contacts: Also index GEO. 2012-11-16 04:34:42 +01:00
Thomas Tanghus
addd12c967 Contacts: Fix property indexing. 2012-11-15 06:07:44 +01:00
Thomas Tanghus
495b94685a Fiz namespace errors. 2012-11-15 00:27:09 +01:00
Thomas Tanghus
b83796e251 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Conflicts:
	contacts/ajax/categories/categoriesfor.php
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/vcard.php
2012-11-14 01:11:42 +01:00
Thomas Tanghus
2fe8439bfb Made adding contact work again. 2012-11-13 22:42:55 +01:00
Thomas Tanghus
bec1bb5e78 Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Conflicts:
	contacts/appinfo/app.php
2012-11-13 12:02:15 +01:00
Thomas Tanghus
888b05f0b2 Contacts: Correct syntax error. 2012-11-12 02:29:27 +01:00
Thomas Tanghus
aa22e083f7 Contacts: First steps on making searchable properties. Relates to issue #113 2012-11-12 02:11:19 +01:00
Thomas Tanghus
de26552f2f Correct namespace. 2012-11-12 01:24:56 +01:00
Thomas Tanghus
1453ecab48 Contacts: Correct javadoc 2012-11-12 01:24:20 +01:00
Thomas Tanghus
0f02508121 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Conflicts:
	contacts/ajax/contact/details.php
	contacts/lib/addressbook.php
	contacts/lib/vcard.php
2012-11-12 00:46:15 +01:00
Thomas Tanghus
814819092e Use CRUDS consts as defined in https://github.com/owncloud/core/pull/356 2012-11-11 19:43:44 +01:00
Thomas Tanghus
4b73ded2ac Trying to limit Cyclomatic Complexity (?) 2012-11-06 01:36:27 +01:00
Thomas Tanghus
71e247f097 Namespace fix. 2012-11-01 15:31:36 +01:00
Thomas Tanghus
307409b7e2 Open contact from search without reloading app. 2012-11-01 02:01:00 +01:00
Thomas Tanghus
09843741e3 Fix namespace error. 2012-11-01 02:00:29 +01:00
Thomas Tanghus
7383915904 Added more error checking to db queries. 2012-10-31 21:37:49 +01:00
Thomas Tanghus
7ccaa51361 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Conflicts:
	contacts/appinfo/app.php
2012-10-31 16:14:37 +01:00
Thomas Tanghus
a96fea3541 VCF export plugin now included in SabreDAV. 2012-10-30 08:49:24 +01:00
Thomas Tanghus
ec86736336 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Fix conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/hooks.php
	contacts/lib/search.php
	contacts/lib/vcard.php
2012-10-30 07:19:56 +01:00
Thomas Tanghus
db8175bb3d Use local namespace. 2012-10-30 07:08:41 +01:00
Bart Visscher
c2d29f20f7 Merge remote-tracking branch 'git://github.com/susinths/apps'
Conflicts:
	calendar/ajax/event/edit.form.php
	calendar/lib/object.php
2012-10-27 16:36:06 +02:00
Bart Visscher
d696522f3a Merge branch 'routing' 2012-10-27 15:07:15 +02:00
Thomas Tanghus
3ab079e781 Cut some more off of the json response. 2012-10-26 00:02:44 +02:00
Thomas Tanghus
66b2d0c42a Missed to namespace a class name. 2012-10-25 23:13:59 +02:00
Thomas Tanghus
a208a66df2 Keep array of names for properties that can appear more than once. 2012-10-25 23:12:21 +02:00
Thomas Tanghus
b8813e0357 Only do checksum on properties that can appear more than once. Cuts off around a 3rd of the the json response size. 2012-10-25 23:10:36 +02:00
Thomas Tanghus
3b3adb318a Use mb_convert_encoding() if iconv() is not available. 2012-10-25 23:09:39 +02:00
Thomas Tanghus
d5d81b36c7 Check if iconv exists. 2012-10-25 18:04:57 +02:00
Thomas Tanghus
69cdc09d93 Use OCA namespace. 2012-10-25 03:34:12 +02:00
Thomas Tanghus
48f4cab791 Cache thumbnails and use remote.php service to avoid loading all apps for each thumbnail. 2012-10-24 21:35:51 +02:00
Thomas Tanghus
0179b9a488 Add parameter to control if shared addressbooks should also be returned. 2012-10-24 20:28:43 +02:00
Thomas Tanghus
e5c6665a05 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-22 15:37:50 +02:00
Susinthiran Sithamparanathan
9c3ba7bed0 Update Contacts and Calendar with namespaces for Sabre 1.7.1 2012-10-18 23:08:26 +02:00
Thomas Tanghus
87273d60af Merge branch 'master' of github.com:owncloud/apps into vcategories_db
Conflicts:
	contacts/lib/vcard.php
2012-10-18 18:11:32 +02:00
Thomas Tanghus
2bd762c86f Unshare Calendar/Event/Addressbook/Contact on delete. 2012-10-16 22:25:03 +02:00
Thomas Tanghus
4b1739efc8 Fix PHOTO handling in serializer method. 2012-10-15 21:34:22 +02:00
Thomas Tanghus
a3c4ae6e94 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-10 23:01:21 +02:00
Thomas Tanghus
d7354034ae Major rewrite almost done. 2012-10-05 05:05:49 +02:00
Thomas Tanghus
9bfe53bbb9 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-05 03:52:25 +02:00
Thomas Tanghus
b8d6b7bcfb Fix regression where contact photo was included in json response. 2012-10-05 02:09:52 +02:00
Thomas Tanghus
e24e2cf9fe Merge branch 'vcategories_db' into contacts_rework 2012-10-03 22:12:21 +02:00
Thomas Tanghus
6fbd4ddec8 Make default groups/categories more relevant for contacts. 2012-10-03 22:10:48 +02:00
Thomas Tanghus
6785e2f2c1 Don't scan for categories/groups in shared addressbooks/calendars. 2012-10-03 22:03:29 +02:00
Thomas Tanghus
9505b23ab7 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-03 21:40:13 +02:00
Thomas Tanghus
09883cc4d8 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-02 23:25:31 +02:00
Thomas Tanghus
d9a3f56b9d Don't prevent calendar and contant data deletion on user deletion because of sharing permissions. 2012-10-02 23:22:29 +02:00