rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-10 00:46:16 +01:00
Code Issues Releases Activity
2,992 Commits 18 Branches 95 Tags
Commit Graph

787 Commits

Author SHA1 Message Date
Thomas Tanghus
ded6b9ba46 Preliminary support for Apple X-ABLabel. Also for oc-1508. 2012-08-21 03:57:48 +02:00
Michael Gapczynski
d80d66fe58 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Thomas Tanghus
2e6a8b4ba1 Strip slashes from commas and semi-colons. 2012-08-19 16:32:32 +02:00
Thomas Tanghus
1d9d5e64e9 Merge addressbooks. 2012-08-16 00:25:32 +02:00
Bart Visscher
8679aa2699 Contacts: Check format parameter 2012-08-10 14:40:43 +02:00
Bart Visscher
fe8bae5b1e Contacts: Better parameter names in addressbook share backend 2012-08-10 14:32:54 +02:00
Michael Gapczynski
e2c3489e79 Additional permission checks for editing and deleting contacts 2012-08-09 13:54:59 -04:00
Michael Gapczynski
a1ac3767ce Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
 2012-08-09 11:38:22 -04:00
Thomas Tanghus
4ed4ef96cd Change parameter name and update docs. 2012-08-09 17:04:14 +02:00
Thomas Tanghus
696a330c37 Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
Michael Gapczynski
14d67ba771 Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski
34fdb2306c Don't include shared addressbook if source not found 2012-08-08 19:12:59 -04:00
Michael Gapczynski
9b2e8de621 Sharing backends for contacts and addressbooks 2012-08-06 16:11:03 -04:00
Michael Gapczynski
6db5e23c77 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Michael Gapczynski
693b496fdd Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Michael Gapczynski
4e99280907 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Thomas Tanghus
a8c0bfe1d7 Line length... 2012-08-02 05:02:36 +02:00
Thomas Tanghus
990e13cdd0 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
Michael Gapczynski
9e16c8ae7c Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
jfd
a57799bcec escape all identifiers with backticks 2012-07-31 18:53:05 +02:00
Thomas Tanghus
3b2c7c5981 Fix errors when no addressbook. 2012-07-30 12:28:10 +02:00
Thomas Tanghus
b9e23c409e Remove deprecated code. 2012-07-30 05:31:48 +02:00
Thomas Tanghus
06c8e0cfe6 Code style. 2012-07-30 05:31:06 +02:00
Thomas Tanghus
c4796b93de Fixed potential error in logging. 2012-07-30 04:57:14 +02:00
Michael Gapczynski
93556984f2 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Thomas Tanghus
f5fb32700a Damn, that Jenkins dude is tough ;) 2012-07-21 00:43:01 +02:00
Thomas Tanghus
61ec1d43ea Code style. 2012-07-20 17:11:13 +02:00
Thomas Tanghus
7681e23761 Coding style. 2012-07-20 00:18:23 +02:00
Thomas Tanghus
ae670c222b Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265. 2012-07-17 10:45:15 +02:00
Thomas Tanghus
31465b7f31 Wrong argument count in postCreateUser hook for contacts. 2012-07-17 01:37:28 +02:00
Thomas Tanghus
2aebf6f7ac Remove obsolete FIXMEs. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
ba05dfc2de Refactored contacts import. 2012-07-15 04:17:30 +02:00
Thomas Tanghus
87d0412ac3 Give default address book a more intuitive name and replace spaces with underscores in uri. 2012-07-14 14:11:43 +02:00
Michael Gapczynski
00ef91f830 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php
 2012-07-11 20:25:59 -04:00
Michael Gapczynski
379eea1779 Fix addressbook sharing, formatItems() changed in past commits 2012-07-11 11:33:48 -04:00
Thomas Tanghus
bcb5a95ace Revert reversion of f5c329af981f59f78c12648ea41c258f477f3e82 :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus
c93a4ce0f2 Look for the right field :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus
50b6b1d94d Revert "Delay fetching of carddata and set ETag and size instead." 
This reverts commit f5c329af981f59f78c12648ea41c258f477f3e82.
 2012-07-10 01:24:40 +02:00
Thomas Tanghus
8b12b691af Delay fetching of carddata and set ETag and size instead. 2012-07-09 01:48:42 +02:00
Thomas Tanghus
c6326dda76 Rescan categories in small batches to reduce memory usage. 2012-07-09 00:16:14 +02:00
Thomas Tanghus
1436165ab3 Simplify VCF generation. 2012-07-08 23:36:52 +02:00
Thomas Tanghus
8a616c79ec Implemented VCFExportPlugin. 2012-07-08 17:52:57 +02:00
Thomas Tanghus
e84c13f70a Improve checking for active addressbooks and creating default addressbook. 2012-07-08 15:41:38 +02:00
Thomas Tanghus
412a583213 Fix endless loop when no addressbooks. 2012-07-06 13:24:56 +02:00
Thomas Tanghus
0ceb588b15 No need for being protected. 2012-07-06 03:22:42 +02:00
Bart Visscher
0f416a5219 Contacts: Fix copy&paste error 2012-07-05 17:12:52 +02:00
Thomas Tanghus
7caf34aac1 Remove ugly activation hack. 2012-07-04 22:13:36 +02:00
Michael Gapczynski
20bdeb71b4 Use formatted shared addressbook in all cases, addressbooks out of order now 2012-07-03 11:36:57 -04:00
Michael Gapczynski
f98a660abc Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app 2012-07-03 11:11:01 -04:00
Michael Gapczynski
9fc953d447 Change getItems() return to a 3-dimensional array to handle multiple shares of the same item 2012-07-02 15:29:34 -04:00