Commit graph

89 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
Thomas Tanghus
91d85e9b16 Use OC.dialogs. 2012-03-07 22:57:37 +01:00
Bart Visscher
340320625e Contacts: Add UI for categories 2012-03-07 21:50:55 +01:00
Bart Visscher
46aa011ef9 Contacts: Add Organisation as Name property choice 2012-03-07 21:46:41 +01:00
Bart Visscher
9ccf46d350 Contacts: convert class attribute selectors to class selectors 2012-03-07 21:46:41 +01:00
Thomas Tanghus
57c4d39b1e Fix conflict. 2012-03-07 20:57:05 +01:00
Thomas Tanghus
75323b86d1 Contacts: UI updates and ajax methods for categories. 2012-03-07 16:39:56 +01:00
Marvin Thomas Rabe
b3f3b8c23f UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Thomas Tanghus
e0c92662f8 JS fix on address book creation. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
ffdfe8257b Contacts: Fix adding/updating address book with empty name. 2012-02-20 15:24:54 +01:00
Thomas Tanghus
2ee2f87efe Strip tags on address on client side. 2012-02-18 11:49:31 +01:00
Thomas Tanghus
96612c506e Removed obsolete commented code and made minor speed improvements.
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
Thomas Tanghus
fa7fabf024 Minor tweaks 2012-02-16 10:38:00 +01:00
Thomas Tanghus
31dab0372d Added some fixes for what to show when address books are (de)selected, all contacts deleted etc. Still need some cleaning up. 2012-02-14 13:57:11 +01:00
Thomas Tanghus
ae426ad115 Added some check for when addinf deleting contacts. 2012-02-14 10:36:22 +01:00
Thomas Tanghus
024405e4f1 Added function for later testing. 2012-02-14 01:00:41 +01:00
Thomas Tanghus
1d6b4f8f3c Merge branch 'tanghus_contacts' 2012-02-10 16:44:06 +01:00
Thomas Tanghus
b4924ed1e5 Variable wasn't reset. 2012-02-10 16:43:40 +01:00
Thomas Tanghus
c95e8a1fc5 Added custom combobox widget. 2012-02-10 16:40:40 +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
25faa40bd0 More @£#¤ conflicts
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
Thomas Tanghus
f4a586a52c Fix merge conflicts 2012-02-08 09:18:58 +01:00
Thomas Tanghus
c191ef6459 Added files for new contact editor/viewer. 2012-02-08 09:14:10 +01:00
Thomas Tanghus
0c5eb542bd Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
6112cdc7e8 Hide container for emails/phones/adresses if there are none. 2012-02-08 08:47:03 +01:00
Thomas Tanghus
9f1370a6d1 Updated copyrights.
Element menu didn't update.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
c0c6b5310e Added files for new contact editor/viewer. 2012-02-08 08:47:03 +01:00
Thomas Tanghus
3e9a69b9b7 Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
Conflicts:
	apps/contacts/ajax/contactdetails.php
	apps/contacts/js/contacts.js
2012-02-08 08:33:51 +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
23396721e4 Hide container for emails/phones/adresses if there are none. 2012-02-08 07:59:39 +01:00
Thomas Tanghus
1e4444f25b Updated copyrights.
Element menu didn't update.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
90a830baba Added files for new contact editor/viewer. 2012-02-08 07:59:39 +01:00
Thomas Tanghus
2cebfb50a4 Fixed broken "Add new" contact.
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
Thomas Tanghus
5962e66b6d Hide container for emails/phones/adresses if there are none. 2012-02-06 08:15:23 +01:00
Thomas Tanghus
bc79951f33 Updated copyrights.
Element menu didn't update.
2012-02-06 08:04:06 +01:00
Thomas Tanghus
3af427fa54 Added files for new contact editor/viewer. 2012-02-06 07:32:57 +01:00