rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-04 15:24:35 +01:00
Code Issues Releases Activity
722 Commits 18 Branches 95 Tags 40 MiB
9fa545b2ec
Commit Graph

165 Commits

Author SHA1 Message Date
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
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
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
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
Michael Gapczynski
b61a303475 Fix generateTarget() for contacts backend 2012-06-30 21:03:36 -04:00
Georg Ehrke
02b935f4a9 fix birthday calendar 2012-06-29 15:43:18 +02:00
Thomas Tanghus
9e0f6bd612 Load contactlist progressivly. 2012-06-27 22:44:28 +02:00
Bart Visscher
56299511f2 Something like this should do it for sharing contacts 2012-06-27 15:44:42 +02:00
Thomas Tanghus
37b71ecf86 Load default categories if there are none, 2012-06-27 02:12:53 +02:00
Bart Visscher
69771d2050 Basic framework for contacts sharing 2012-06-27 01:05:36 +02:00
Thomas Tanghus
14b22239ee Added error checking on all db queries. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
7c26a86550 Added createUser hook. 2012-06-26 18:15:24 +02:00
Thomas Tanghus
6f85700984 Fix variable name. 2012-06-26 16:06:52 +02:00
Thomas Tanghus
5c649dc2d5 Added signals. 2012-06-26 05:26:50 +02:00
Thomas Tanghus
541dfa2580 Cast translation to string. 2012-06-22 14:27:46 +02:00
Thomas Tanghus
b41b2c38b8 Fix URL delimiter. 2012-06-21 22:03:57 +02:00
Thomas Tanghus
1f6bb63f8d Better error checking. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
a534cc54d4 Log error as ERROR. 2012-06-20 21:00:49 +02:00
Thomas Tanghus
d8b662c25f Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus
2ac341c871 If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier... 2012-06-14 23:05:31 +02:00
Thomas Tanghus
f3e19ca230 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00