rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-30 12:24:11 +01:00
Code Issues Releases Activity
731 Commits 18 Branches 95 Tags 40 MiB
a1ac3767ce
Commit Graph

77 Commits

Author SHA1 Message Date
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
Michael Gapczynski
14d67ba771 Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Thomas Tanghus
c4796b93de Fixed potential error in logging. 2012-07-30 04:57:14 +02: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
2aebf6f7ac Remove obsolete FIXMEs. 2012-07-16 01:46:16 +02:00
Thomas Tanghus
9e0f6bd612 Load contactlist progressivly. 2012-06-27 22:44:28 +02:00
Thomas Tanghus
14b22239ee Added error checking on all db queries. 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
a534cc54d4 Log error as ERROR. 2012-06-20 21:00:49 +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
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
f5d3ba18f2 Contacts: Double check XSS, and fix a rookie error ;-) 2012-05-28 13:19:31 +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
afe3f30dff Contacts: Hack to add structured name from formatted name. 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
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
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
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
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
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
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
80ce69e089 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Thomas Tanghus
e0f14bf818 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Thomas Tanghus
a803359506 Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
109314b532 Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 23:42:06 +01:00
Thomas Tanghus
dfc25bd405 Update ctag in deleteFromDAVData. 2012-02-20 14:24:10 +01:00
Thomas Tanghus
f8e36a6bce Added public static OC_VCategories object to OC_Contacts_App. 
Parse cards for new categories in add and edit methods.
 2012-02-19 23:32:09 +01:00
Thomas Tanghus
a6d37ee9ff Added some error checking as mentioned in http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227 2012-02-14 02:15:21 +01:00
Thomas Tanghus
d55aa3a8f7 Modify check for missing UID. 2012-02-14 01:56:38 +01:00
Thomas Tanghus
1cf89738e2 Removed superfluous debug. 2012-02-14 01:02:01 +01:00
Thomas Tanghus
a0a4534247 Added OC_Contacts_VCard::moveToAddressBook 2012-02-14 01:00:41 +01:00
Thomas Tanghus
bcd1470ea9 Keep js data structure in sync on changes. 
More checks for missing properties.
 2012-02-09 19:04:07 +01:00