mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,074 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

43 Commits

Author SHA1 Message Date
Thomas Tanghus a33a62bf60 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 ae7aab2d6e 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 9908adb320 Merge branch 'master' into vcategories 
Conflicts:
	apps/contacts/lib/vcard.php
 2012-03-07 21:49:46 +01:00
Bart Visscher d8cfe77ba5 Contacts: small fixes and cleanups 2012-03-07 21:46:42 +01:00
Bart Visscher 9599548203 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 75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Thomas Tanghus 9794e7e427 Fix merge conflict. 2012-02-22 11:20:57 +01:00
Thomas Tanghus c5c843bfef 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 7a49c8e59c Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-20 23:42:06 +01:00
Thomas Tanghus 12bcbcdc62 Update ctag in deleteFromDAVData. 2012-02-20 14:24:10 +01:00
Thomas Tanghus c62673d360 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 f7161bb48b 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 dc20900e10 Modify check for missing UID. 2012-02-14 01:56:38 +01:00
Thomas Tanghus 07c422d81d Removed superfluous debug. 2012-02-14 01:02:01 +01:00
Thomas Tanghus 3adaacc0ce Added OC_Contacts_VCard::moveToAddressBook 2012-02-14 01:00:41 +01:00
Thomas Tanghus ff53b0c209 Keep js data structure in sync on changes. 
More checks for missing properties.
 2012-02-09 19:04:07 +01:00
Thomas Tanghus 424c64c0eb Don't import cards that can't be parsed by Sabre, but log it instead. 
Fix missing 'N' or 'FN' fields on import.
 2012-02-08 07:59:39 +01:00
Thomas Tanghus 249e46c5b7 Some fixes for malformed VCards. 2012-02-08 07:59:39 +01:00
Thomas Tanghus 4db661ba9d Fixed broken "Add new" contact. 
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
 2012-02-08 07:59:39 +01:00
Thomas Tanghus db1f77e4f5 Some reminders in the code of what I have to change post OC3.0 2012-01-31 19:30:56 +01:00
Thomas Tanghus 5458e52935 Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92 
"Character '&' in address data causes wrong data".
This was also the case for the 'N' property.
 2012-01-24 23:08:40 +01:00
Thomas Tanghus ca03a26f15 - Added fix for empty 'FN' field on import via CardDAV clients. 
- Make sure that the contact in the list has a display name.
- More tweaks on thumbnail caching.
 2012-01-19 19:47:09 +01:00
Thomas Tanghus 0d120efda5 Add PRODID to vcards created by ownCloud. 2012-01-12 22:50:12 +01:00
Thomas Tanghus 237ba65a20 Localizin strings and adding error checking. 2012-01-11 20:07:15 +01:00
Thomas Tanghus eae3e134ff Make sure VERSION is set. 
Set REV for each edit.
Download single VCard.
 2012-01-11 06:20:06 +01:00
Thomas Tanghus 1a6ad816a3 CSS cleanup, more error checking, better error messages, general cleanup. 2012-01-11 04:05:30 +01:00
Thomas Tanghus aadb81a32a OC_DB::insertid was being called too late to get the correct result. 2012-01-09 23:14:11 +01:00
Thomas Tanghus 1b146b85d2 Removed redundant DB queries. 2011-12-31 01:34:22 +01:00
Thomas Tanghus 4793d25c57 Added license and waiver of conditions for jquery.inview. 
CSS fix on contact list.
Query contacts from multiple address books.
 2011-12-30 21:07:16 +01:00
Thomas Tanghus c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Thomas Tanghus 7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
 2011-12-09 15:25:26 +01:00
Thomas Tanghus b3661adf02 Various fixes to multiple address books handling 2011-12-09 15:10:51 +01:00
Bart Visscher 247146f703 Contacts: refactor rendering of part.details template 2011-12-07 20:40:58 +01:00
Bart Visscher c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Bart Visscher a2ecdfcac1 Contacts: support multiple phone type parameter 2011-11-23 21:07:32 +01:00
Bart Visscher ef124c3e21 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Jakob Sack 938c5ef21c contacts: every card needs a version! 2011-11-09 11:35:50 +01:00
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher 61660c068a Fix function name error in contacts app 2011-10-21 21:49:58 +02:00
Bart Visscher a13d42fdaf Fixes for adding contact property 2011-10-07 23:01:49 +02:00
Bart Visscher 2c95c799e6 Add new contact name to end of cantact list 2011-10-04 21:16:57 +02:00
Bart Visscher fada3517b0 All the basic field for add contact added 2011-10-04 21:16:57 +02:00
Jakob Sack 54a3b28dce Split OC_Contacts_Addressbook in _Addressbook and _VCard 2011-09-17 00:26:57 +02:00