rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-02 14:24:10 +01:00
Code Issues Releases Activity
907 Commits 18 Branches 95 Tags 40 MiB
2308a4b69f
Commit Graph

217 Commits

Author SHA1 Message Date
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
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
dc5b13a827 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:33:37 +02:00
Thomas Tanghus
f3e19ca230 Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00
Thomas Tanghus
2c289d3a75 Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:15:31 +02:00
Thomas Tanghus
1ee05e12bd Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:14:21 +02:00
Thomas Tanghus
5397dcf695 Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:56:55 +02:00
Thomas Tanghus
1bf36539f4 Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:54:52 +02:00
Thomas Tanghus
f5d3ba18f2 Contacts: Double check XSS, and fix a rookie error ;-) 2012-05-28 13:19:31 +02:00
Thomas Tanghus
7317b67272 Please don't tell me I did that :-P 2012-05-28 12:52:18 +02:00
Thomas Tanghus
393578a609 Contacts: Backport XSS fix. 2012-05-21 21:49:35 +02:00
Thomas Tanghus
d78ec64e80 Contacts: XSS fix. Still some more to check. 2012-05-21 21:47:15 +02:00
Thomas Mueller
39f99602bf removing executable bit - again 2012-05-15 00:52:00 +02:00
Thomas Tanghus
967134ccb6 Contacts: Forgot one file for the import fix. 2012-05-13 23:27:14 +02:00
Thomas Tanghus
f5a9b8d2e7 Contacts: Add error checking and reporting to import from files app. 2012-05-13 23:27:14 +02:00
Thomas Tanghus
afe3f30dff Contacts: Hack to add structured name from formatted name. 2012-05-11 01:14:11 +02:00
Thomas Tanghus
dd48fc009e Contacts: Fix check for version. 2012-05-11 01:14:11 +02:00
Thomas Tanghus
bbb3cd0d18 Some UI and code restructering according to usability tests: https://mail.kde.org/pipermail/owncloud/2012-May/003194.html 2012-05-10 16:53:25 +02:00
Thomas Tanghus
6fc62e2827 Contacts: Don't try to render invalid properties. 2012-05-05 13:49:47 +02:00
Thomas Tanghus
682a47e8b4 Contacts: Hack around malformed BDAY. 2012-05-04 01:27:59 +02:00
Frank Karlitschek
3d62cf716a ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek
0343af38fd ported oc_json 2012-05-03 12:23:29 +02:00
Frank Karlitschek
0b43e94733 port oc_response 2012-05-03 10:46:27 +02:00
Bart Visscher
9b433705ba Contacts: check for malformed VCards in calendar hook 2012-05-02 21:36:33 +02:00
Frank Karlitschek
299cabaf87 port oc_preferences 2012-05-02 15:54:34 +02:00
Thomas Müller
57ce95df77 fixing namespace 2012-05-02 00:55:26 +02:00
Frank Karlitschek
b2f19f3a7f ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek
47b18a270e port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek
a3dc9e8b2a ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek
26930d0d83 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Thomas Tanghus
82a2011dc2 Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI. 
Remove an obsolute file and did some cleanup.
 2012-04-29 22:12:27 +02:00
Thomas Tanghus
20734b60a9 Contacts: removed unused method and ajax file. 2012-04-29 22:12:27 +02:00
Thomas Tanghus
887747394b Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-) 2012-04-24 11:35:56 +02:00
Thomas Tanghus
5e735201b6 Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html 2012-04-24 01:44:07 +02:00
Jakob Sack
d1b0434d82 Remove useless, unmaintained dav.php 2012-04-15 16:50:44 +02:00
Robin Appelman
6bfb0189b6 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman
bb559d028f improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Bart Visscher
08c0dc9c87 Contacts: Save the category list update when updating/adding contact 2012-04-13 21:13:58 +02:00
Thomas Tanghus
2716018d44 Contacts: Better error reporting. 2012-04-13 18:50:40 +02:00
Bart Visscher
77b173f70b Contacts: Also initialize org var in updateValuesFromAdd 2012-04-12 23:10:49 +02:00
Bart Visscher
b354c4c77e Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App 
This is in preparation of making $categories protected and initialized
with default categories.
 2012-04-12 23:10:49 +02:00
Thomas Tanghus
29a4ffb730 Contacts: Fix for not being able to add contact to empty/non-existant address book. 2012-04-09 16:30:58 +02:00
Thomas Tanghus
0506fa9856 Fixed error in OC_Contacts_VCard::addFromDAVData as pointed out by Guillaume ZITTA 2012-03-26 02:04:34 +02:00
Thomas Tanghus
7b00319bae Contacts: Modifications for using categories. 2012-03-12 14:13:03 +01:00
Thomas Tanghus
d005c9123b Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php
 2012-03-08 02:55:48 +01:00
Thomas Tanghus
279fc58088 Merge gitorious.org:owncloud/owncloud into vcategories 
Conflicts:
	apps/contacts/ajax/saveproperty.php
	apps/contacts/lib/vcard.php
 2012-03-07 23:38:44 +01:00
Bart Visscher
be94d7caf3 Contacts: Add UI for categories 2012-03-07 21:50:55 +01:00
Bart Visscher
cfbf2e62c1 Merge branch 'master' into vcategories 
Conflicts:
	apps/contacts/lib/vcard.php
 2012-03-07 21:49:46 +01:00
Bart Visscher
3dc6e658fe Contacts: small fixes and cleanups 2012-03-07 21:46:42 +01:00
Bart Visscher
c8598c3df1 Contacts: change card parameter type of VCard::edit and VCard::add 
changed to OC_VObject
 2012-03-07 21:46:42 +01:00
Thomas Tanghus
df70d9eeed Fix conflict. 2012-03-07 20:57:05 +01:00
Thomas Tanghus
80ce69e089 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Jakob Sack
f1d6e9c313 Fix missing bracket 2012-03-02 21:01:44 +01:00
Jakob Sack
96181c1ea5 Add /dav.php, a single location bundling all *DAV-operations. 2012-03-02 20:25:20 +01:00
Bart Visscher
a6d0482606 Search: Change provider registration to class name, for lazy loading of search providers 2012-03-01 22:59:35 +01:00
Bart Visscher
3355b3f2e7 Small cleanups 2012-03-01 21:00:23 +01:00