rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity
2,209 Commits 18 Branches 95 Tags 40 MiB
ed7f3ae877
Commit Graph

549 Commits

Author SHA1 Message Date
Thomas Tanghus
aa87d0de73 Stop floating the log on import 2013-03-29 06:50:47 +01:00
Thomas Tanghus
7693785933 Contacts: Importing, indexing and group extraction in working state. 2013-03-29 05:00:03 +01:00
Thomas Tanghus
1d0a41d6fb Contacts: Document variables. 2013-03-28 17:33:30 +01:00
Thomas Tanghus
0bbb6afcba Contacts: Properly implement Countable in AddressBook And support in Database backend 2013-03-28 17:32:36 +01:00
Thomas Tanghus
c58940336c Contacts: Improve docs on AbstractBackend 2013-03-28 17:31:20 +01:00
Thomas Tanghus
b66770b697 Contacts: Cleanup and more logging in Contact 2013-03-28 05:01:45 +01:00
Thomas Tanghus
ca7d8d3332 Contacts: Don't store empty child in AddressBook 2013-03-28 05:00:51 +01:00
Thomas Tanghus
db74b3c665 Contacts: Quick hack to create default address book 2013-03-28 03:36:23 +01:00
Thomas Tanghus
255c538a60 Contacts: Add more routes and wrap response in a JSONResponse object. 2013-03-28 03:19:01 +01:00
Thomas Tanghus
3d5e740325 Contacts: Fix deleting properties. 2013-03-26 12:35:37 +01:00
Thomas Tanghus
ebca7c662d Contacts: PoC request. 2013-03-26 12:33:44 +01:00
Thomas Tanghus
787931bc16 Contacts: Fix undefined index in search. 2013-03-25 22:05:59 +01:00
Thomas Tanghus
334751a18b Contacts: Properly prepare query and quote values. thx @eMerzh :) 2013-03-25 21:41:37 +01:00
Thomas Tanghus
6e3e4d263b Contacts: Properly prepare query and quote values. thx @eMerzh :) 2013-03-25 21:34:18 +01:00
Thomas Tanghus
3eb5303c3e Contacts: More updates on backends 2013-03-25 17:10:21 +01:00
Thomas Tanghus
3e9813bc68 Contacts: Rename getPropertyByChecksum unsetPropertyByChecksum 2013-03-23 02:03:23 +01:00
Thomas Tanghus
321cb7bf94 Contacts: Cleanup sql in Database backend. 2013-03-22 15:03:50 +01:00
Thomas Tanghus
b6b32f3ed5 Contacts: Add missing argument to backend. 2013-03-22 15:02:08 +01:00
Thomas Tanghus
a92eb61135 Contacts: Disable magic accessors in collection class. 2013-03-22 15:00:47 +01:00
Thomas Tanghus
e0b95a2857 Contacts: PoC shared collection update. 2013-03-22 14:59:24 +01:00
Thomas Tanghus
d85a6c36aa Contacts: Temporarily reenable legacy categories methods. 2013-03-22 14:58:32 +01:00
Thomas Tanghus
f6541dafc3 Contacts: Cache thumbnails in Contact class. 2013-03-22 14:50:41 +01:00
Thomas Tanghus
55338242dd Contacts: Add reminder 2013-03-20 11:27:40 +01:00
Thomas Tanghus
2f24dbbc8a Contacts: Temporarily disable birthday event hook 2013-03-20 11:26:39 +01:00
Thomas Tanghus
671eecd2ce Contacts: Misc. fixes for Contact 2013-03-20 11:26:01 +01:00
Thomas Tanghus
7d6ce18b0a Contacts: Document Properties::updateIndex() 2013-03-20 11:25:04 +01:00
Thomas Tanghus
5e67fc27d6 Contacts: Some updates to Datebase backend 2013-03-20 11:24:05 +01:00
Thomas Tanghus
9044749985 Contacts: Add addChild, deleteChild, delete and save to collections. 2013-03-20 11:22:53 +01:00
Thomas Tanghus
24ee12ed31 Contacts: Use Property class for TYPE vales. 2013-03-20 11:20:35 +01:00
Thomas Tanghus
457dfefdb2 Contacts: Add some reminders 2013-03-17 23:06:14 +01:00
Thomas Tanghus
6fc05fa4cc Contacts: Updates on PIM classes. 2013-03-17 21:32:53 +01:00
Thomas Tanghus
f8b0387fdd Contacts: Document class assumptions 2013-03-17 21:31:46 +01:00
Thomas Tanghus
7a69ed85d3 Contact: port getACL 2013-03-17 10:48:12 +01:00
Thomas Tanghus
dd00e6872b Contacts: Return Return {DAV:}write for own address books. Fix #788 
Propably fixes #780 and #694
 2013-03-17 10:31:23 +01:00
Thomas Tanghus
0f1800c2de Contacts: Various fixes found when adding unit tests. Unit tests FTW \o/ 2013-03-17 00:38:00 +01:00
Thomas Tanghus
5bfe561937 Contacts: Misc backend updates. 2013-03-16 15:59:23 +01:00
Thomas Tanghus
a4d26981d8 Contacts: Fix JSON serializer 2013-03-16 15:57:22 +01:00
Thomas Tanghus
9fda90791f Contacts: Temporarily disable userCreate hook. 2013-03-16 15:56:21 +01:00
Thomas Tanghus
8c1d04edac Contacts: remove stray semi-colon 2013-03-15 17:03:43 +01:00
Thomas Tanghus
5b08c7fcdc Contacts: Updates to backends API. 2013-03-15 17:02:33 +01:00
Thomas Tanghus
67474ebbc0 Contacts: First stub for App 2013-03-15 17:01:06 +01:00
Thomas Tanghus
d7a47af586 Contacts: Remove old VCard::delete() 2013-03-14 15:20:49 +01:00
Thomas Tanghus
2d3769f273 Contacts: CardDAV getCard() returns false if not found. 2013-03-13 19:48:25 +01:00
Thomas Tanghus
107e8d4bd2 Contacts: Move GEO class map to appinfo/app.php 2013-03-13 09:59:12 +01:00
Thomas Tanghus
3d278c0e11 Contacts: Moved misc. functionality to hooks and utility classes. 2013-03-13 08:52:00 +01:00
Thomas Tanghus
4c093890f1 Updated 2012 => 2013 2013-03-13 05:58:46 +01:00
Thomas Tanghus
e956420b1e Contacts: Move checksum check to Contact. 2013-03-13 05:57:35 +01:00
Thomas Tanghus
006bf317f4 Contacts: var 'url' => 'uri'. 2013-03-13 05:56:31 +01:00
Thomas Tanghus
5e938caf75 Contacts: Stripped out stale code. 2013-03-13 05:55:44 +01:00
Thomas Tanghus
08ad7b1a32 Contacts: Remove obsolete methods. 2013-03-13 05:54:39 +01:00
Thomas Tanghus
3b8cc18aff Contacts: Cache queries in Database backend. 2013-03-13 05:19:38 +01:00
Thomas Tanghus
d9640bdc4e Contacts: Remove obsolete methods. 2013-03-13 04:14:27 +01:00
Thomas Tanghus
897560fcc7 Contacts: Moved translated parameters to utility class. 2013-03-13 04:11:37 +01:00
Thomas Tanghus
8a7302045d Contacts: Moved structureContact etc to JSONSerializer class. 2013-03-13 04:10:06 +01:00
Thomas Tanghus
c7971b4071 Merge branch 'master' into contacts_backends 
Conflicts:
	contacts/lib/addressbook.php
	contacts/lib/vcard.php
 2013-03-12 23:03:30 +01:00
Thomas Tanghus
ccc32aac25 Contacts: Some Exceptions weren't namspaced. 2013-03-12 22:15:04 +01:00
Thomas Tanghus
fccea3347c Contacts: Adjustments to backends. 2013-03-12 20:00:22 +01:00
Thomas Tanghus
152386946e Contacts: Updates on interfaces 2013-03-12 09:25:10 +01:00
Thomas Tanghus
3ac86ce032 Merge branch 'five_zero_dot_one' into contacts_backends 
Conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/import.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/carddav/backend.php
 2013-03-12 09:24:06 +01:00
Thomas Tanghus
1b1a2ef7d4 Contacts: New backends WiP 2013-03-12 09:15:40 +01:00
Thomas Tanghus
0449d706ed Contacts: Temporarily use AddressbookLegacy 2013-03-12 09:14:06 +01:00
Thomas Tanghus
29dc6cf0b0 Contacts: Convinience method for getting backend in carddav. 2013-03-11 16:22:27 +01:00
Thomas Tanghus
edc10d08e9 Contacts: Added missing twitter scheme. 2013-03-10 12:51:21 +01:00
Thomas Tanghus
293c0b260d Contacts: Use new backends for CardDAV. 2013-03-10 12:50:37 +01:00
Thomas Tanghus
e8a2b6fc74 Contacts: Avoid double escaping on serialize. 2013-03-10 12:50:02 +01:00
Thomas Tanghus
c7dfc8fc33 Contacts: Add generic PIM classes + Contact class. 2013-03-10 12:40:11 +01:00
Thomas Tanghus
275c98cce8 Contacts: Generate prettier target for shared address books. 2013-03-10 12:38:27 +01:00
Thomas Tanghus
efad313280 Contacts: Typo in CardDAV plugin. 2013-03-10 12:36:08 +01:00
Thomas Tanghus
604b819014 Contacts: Added backends for database and shared contacts. 2013-03-10 12:34:41 +01:00
Thomas Tanghus
19246ebe22 Contacts: Fix missing URI scheme for twitter IMPP. Thx @dmfs :) 2013-03-09 22:50:00 +01:00
Thomas Tanghus
bcdc7e3ecd Contacts: Wrong variable name in Sabre backend. 2013-03-07 04:06:04 +01:00
Thomas Tanghus
4aa46c5736 Contacts: Title wasn't shown. 2013-03-06 23:37:55 +01:00
Georg Ehrke
0769e833d9 fix some PHP Notices and fix birthday calendar - fix #610 2013-03-06 14:47:26 +01:00
Thomas Tanghus
99e8f5b5f6 Contacts: Properly namespace VObject subclasses. 2013-03-05 11:36:35 +01:00
Thomas Tanghus
ac19b7f0f3 Contacts: Namespace CardDAV backend. 2013-03-05 11:08:04 +01:00
Thomas Tanghus
ec24a73c48 Contacts: Properly escape commas and semi-colons. 2013-03-05 02:31:14 +01:00
Thomas Tanghus
93315a05fa Contacts: Use isAdminUser() 2013-03-05 02:31:14 +01:00
Thomas Tanghus
7047e3e7b3 Contacts: Fix copy/paste mistake. 2013-03-05 02:31:14 +01:00
Thomas Tanghus
cab4ceea84 Contacts: Fix undefined indexes on search. 2013-03-05 02:31:14 +01:00
Thomas Tanghus
75c1302197 Upgrade: ENCODING: BASE64 -> 'b' and format image mime types. 2013-03-05 02:31:13 +01:00
Thomas Tanghus
b752145ce3 Also set version when upgrading. 2013-03-05 02:31:13 +01:00
Thomas Tanghus
1e4bc27e02 Use VObject\StringUtil::convertToUTF8() to decode v. 2.1 properties. 2013-03-05 02:31:13 +01:00
Thomas Tanghus
4aa894d0aa Fix variable name. 2013-03-05 02:31:13 +01:00
Thomas Tanghus
2fecf91483 Updated header: 2013-03-05 02:31:12 +01:00
Thomas Tanghus
65957c8737 Contacts: Move vCard validation and repair to SabreDAV subclasses. 2013-03-05 02:31:12 +01:00
Thomas Tanghus
39c5e4700e Contacts: Replace hardcoded db prefixes. 2013-03-05 01:32:34 +01:00
Thomas Tanghus
358a41a8ac Contacts: Use int instead of bool to help pgsql ;) 2013-03-04 19:31:28 +01:00
Thomas Tanghus
464919e93c Contacts: Fix copy/paste error. 2013-03-04 19:23:45 +01:00
Thomas Tanghus
574cec4b60 Contacts: Fix caching newly edited photo. 2013-03-04 15:15:47 +01:00
Thomas Tanghus
88a1e4d770 Contacts: Didn't show birthday. 2013-02-18 03:08:01 +01:00
Thomas Tanghus
d3e80b91fa Contacts: Make $addressBookInfo protected instead of private. 2013-02-09 20:29:23 +01:00
Thomas Tanghus
d7c5ccdb15 Contacts: Make $carddavBackend protected instead of private. 2013-02-09 20:27:06 +01:00
Tom Needham
8912726a56 Add missing backslash to delete addressbook method 
Relevant error: 
[09-Feb-2013 17:03:31] PHP Fatal error:  Class 'OCA\Contacts\OCP\User' not found in /Users/tomneedham/Sites/htdocs/cloud/apps2/contacts/lib/addressbook.php on line 349

Relevant Backtrace:
[09-Feb-2013 17:03:31] PHP   7. OC_User::deleteUser() /Users/tomneedham/Sites/htdocs/cloud/apps2/provisioning_api/lib/users.php:169
[09-Feb-2013 17:03:31] PHP   8. OC_Hook::emit() /Users/tomneedham/Sites/htdocs/cloud/lib/user.php:228
[09-Feb-2013 17:03:31] PHP   9. call_user_func() /Users/tomneedham/Sites/htdocs/cloud/lib/hook.php:71
[09-Feb-2013 17:03:31] PHP  10. OCA\Contacts\Hooks::deleteUser() /Users/tomneedham/Sites/htdocs/cloud/lib/hook.php:0
[09-Feb-2013 17:03:31] PHP  11. OCA\Contacts\Addressbook::delete() /Users/tomneedham/Sites/htdocs/cloud/apps2/contacts/lib/hooks.php:59
 2013-02-09 17:07:44 +00:00
Thomas Tanghus
b6a25e62b2 Contacts: sanitizeHTML 2013-02-08 23:24:24 +01:00
Thomas Tanghus
13c395e895 Contacts: Don't loop forever when exporting contacts. 2013-02-08 20:14:54 +01:00
Thomas Tanghus
5f6d029c11 Contacts: Only query for properties if contacts matches search criteria. 2013-02-04 02:07:00 +01:00
Thomas Tanghus
525ebecc89 Contacts: Search improvements. 2013-01-30 00:47:47 +01:00
Thomas Tanghus
4b2a32d0b2 Contacts: Use OCP\Contacts for search. 2013-01-29 20:17:55 +01:00
Thomas Tanghus
860073502f Contacts: No inline js in search results. 2013-01-25 19:00:10 +01:00
Thomas Tanghus
333ad9a1fa Contacts: Work around bug in current Sabre VObject. 2013-01-14 09:50:57 +01:00
Thomas Tanghus
d63705a9b6 Contacts: Also index UID. 2013-01-08 05:50:41 +01:00
Thomas Tanghus
85ec5eeb9f Calendar/Contacts: Check for string value of BDAY. Closes #336 2012-12-14 04:33:14 +01:00
Brice Maron
29fa35760a Make addressbookprovider compatible with older version of php 2012-12-12 20:39:58 +00:00
Thomas Tanghus
db863a4986 Contacts: Properly quote CardDAV etag. 2012-12-12 00:29:24 +01:00
Thomas Tanghus
283b93a024 Contacts: Added AddressbookProvider 2012-12-12 00:07:36 +01:00
Thomas Tanghus
b0f1407495 Contacts: Also index NOTE 2012-12-11 02:35:31 +01:00
Thomas Tanghus
9aa005a9c4 Contacts: Only query 'lastmodified' in App::lastModified() 2012-12-10 05:54:17 +01:00
Thomas Tanghus
775cce38f0 Contacts: Add 'fields' argument to VCard:all and VCard::find. 2012-12-10 05:52:57 +01:00
Thomas Tanghus
b8e5e7a06f Contacts: Missing variable. 2012-12-10 00:10:39 +01:00
Thomas Tanghus
0f843a95f1 Contacts: Set revision (maybe) fix. 2012-12-07 15:09:13 +01:00
Thomas Tanghus
5d6cb9f005 Namespace fix. 2012-12-07 15:09:13 +01:00
Thomas Tanghus
edd356a252 Contacts: Enable Caching contact list if not changed. 2012-12-07 15:09:13 +01:00
Thomas Tanghus
fd18bf9d2a Contacts: More fine-grained ACL checks for CardDAV. 2012-11-26 23:11:40 +01:00
Thomas Tanghus
86b081ad80 Contacts: fix more namespace errors. 2012-11-26 23:11:40 +01:00
Thomas Tanghus
040d79bc21 Contacts: Added debugging statements to deleteFromDAVData() 2012-11-26 23:11:40 +01:00
Thomas Tanghus
e7ab74053f Contacts: Use own delete() method in deleteFromDAVData() 2012-11-26 23:11:40 +01:00
Thomas Tanghus
0b27c3a82c Contacts: Don't use userid when setting addressbook ctag. 2012-11-26 23:11:40 +01:00
Thomas Tanghus
e8375b1217 Contacts: Correct variable name. 2012-11-26 23:11:40 +01:00
Thomas Tanghus
5abe44120d Contacts: Space after comma 2012-11-26 23:11:40 +01:00
Thomas Tanghus
79c6e78e8e Merge branch 'master' of github.com:owncloud/apps into contacts_rework 
Conflicts:
	contacts/lib/vcard.php
 2012-11-24 01:52:13 +01:00
Thomas Tanghus
76236b7e28 Contacts: Cut some additional bytes off the response. 2012-11-24 01:46:00 +01:00
Thomas Tanghus
4e4baf8b77 Contacts: Increment addressbook ctag on contact delete. 2012-11-23 23:38:28 +01:00
Luke Owncloud
6a37a1baf6 Touch address book cTag after deleting a contact. Bugfix for 
https://github.com/owncloud/apps/issues/238
 2012-11-23 14:51:21 +01:00
Thomas Tanghus
3ac9cf0d1f Contacts: Edit structured name inline. 2012-11-22 04:09:52 +01:00
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
Thomas Tanghus
ce2535521b Add 'Other' as standard email type. 2012-09-30 06:40:04 +02:00
Bart Visscher
a4f5478d06 Merge branch 'master' into routing 
Conflicts:
	gallery/lib/tiles.php
 2012-09-28 21:43:48 +02:00
Thomas Tanghus
6b77479899 First work on new Contacts js and group based UI. 2012-09-17 16:15:31 +02:00
Thomas Tanghus
993c8f36f1 Missed one 'contacts' => 'contact' update. 2012-09-17 02:17:41 +02:00
Thomas Tanghus
9571e4077c Use types (event/contact) instead of app names for vcategories. Also purge category/object relations on object deletion. 2012-09-17 02:03:28 +02:00
Thomas Tanghus
fbfe8aab45 Transitional filter-by-category design take 1. 2012-09-11 14:19:28 +02:00
Michael Gapczynski
475de65901 Update getChildren() for calendar and addressbook share backends 2012-09-08 23:11:40 -04:00
Bart Visscher
d31248007e Merge branch 'master' into routing 
Conflicts:
	gallery/lib/tiles.php
 2012-09-07 15:45:35 +02:00
Thomas Mueller
089b7e8f8a adding space between) and { 2012-09-07 15:21:03 +02:00
Bart Visscher
b179feeea2 Fix whitespace in contacts 2012-09-07 14:32:45 +02:00
Thomas Tanghus
d261bb9a90 Disable excessive debugging when importing. 2012-09-06 23:26:09 +02:00
Thomas Tanghus
09f7b632d4 Permission check in OC_Contacts_Addressbook::find() 2012-09-06 16:02:00 +02:00
Thomas Tanghus
84e867669f Only return first - and only - addressbook in the shared addressbooks array. 2012-09-06 05:23:38 +02:00
Thomas Tanghus
c7b116f3d7 Reminder to unshare on delete when a method is provided. 2012-09-06 05:23:37 +02:00
Thomas Tanghus
aefe7db84c Don't write translated shared by strings to db, instead have a shared indicator on the addressbook. 2012-09-06 02:12:22 +02:00
Thomas Tanghus
4ac74a5e67 Also check parents permissions when updating/deleting contact. 2012-09-04 13:40:29 +02:00
Thomas Tanghus
2083d40d9d Formatting. 2012-09-03 22:22:26 +02:00
Thomas Tanghus
e9315abed5 Strip control chars after decoding from quoted printable. 2012-09-03 17:11:58 +02:00
Thomas Tanghus
1836adca99 Add missing permission checks. 2012-09-01 22:55:53 +02:00
Thomas Tanghus
59b675964d Avoid uri name collision for Cal-/CardDAV sharing. 2012-09-01 22:55:52 +02:00
Bart Visscher
b5cb037e73 Fix linkTo calls for new routing 2012-08-31 18:05:49 +02:00
Thomas Tanghus
8ff56cfbf2 Fix return values on update. 2012-08-31 05:12:18 +02:00
Thomas Tanghus
b454e6a3d3 Only show CRUDS actions if you have proper permissions. 2012-08-30 23:02:19 +02:00
Thomas Tanghus
5905e6c314 Error and permission checking. 2012-08-30 18:43:01 +02:00
Thomas Tanghus
0d3d7fd1c1 White-space 2012-08-30 18:43:01 +02:00
jfd
1102fa46a9 use limit parameter instead of LIMIT SQL for vcard 2012-08-25 02:27:43 +02:00