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
|
3ab079e781
|
Cut some more off of the json response.
|
2012-10-26 00:02:44 +02:00 |
|
Thomas Tanghus
|
69cdc09d93
|
Use OCA namespace.
|
2012-10-25 03:34:12 +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
|
d7354034ae
|
Major rewrite almost done.
|
2012-10-05 05:05:49 +02:00 |
|
Thomas Tanghus
|
3992402f1a
|
Removed debug statement.
|
2012-09-12 21:19:15 +02:00 |
|
Thomas Tanghus
|
3e92c3b0ae
|
Permission checking for shared addressbooks/contacts.
|
2012-08-23 22:03:36 +02:00 |
|
Thomas Tanghus
|
4d0974175b
|
Don't add empty property parameters.
|
2012-08-23 01:18:59 +02:00 |
|
Thomas Tanghus
|
070bb410ba
|
Add support for IMPP properties.
|
2012-08-22 18:51:17 +02:00 |
|
Thomas Tanghus
|
f53a65ef3a
|
Fixed 3 - THREE - errors in one method call :-P
|
2012-08-09 23:16:07 +02:00 |
|
Thomas Tanghus
|
696a330c37
|
Another take at profile photo/thumbnail caching. oc-839.
|
2012-08-09 16:32:05 +02:00 |
|
Thomas Tanghus
|
ad653dddc9
|
Fix require statements. Fix for oc-1460.
|
2012-08-09 11:35:14 +02:00 |
|
Thomas Tanghus
|
e59775c602
|
Reorganize ajax scripts.
|
2012-08-03 21:32:27 +02:00 |
|