1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-13 23:49:04 +01:00
Commit Graph

1559 Commits

Author SHA1 Message Date
Thomas Tanghus
37ce038d46 Yet a missing file :-P 2012-03-09 13:56:20 +01:00
Thomas Tanghus
a8c91ea900 Added missing template. 2012-03-09 12:11:52 +01:00
Thomas Tanghus
3f78a641f7 Merge branch 'vcategories' 2012-03-09 10:29:58 +01:00
Thomas Tanghus
014edbe94d Temporarily disabled multi_autoselect. 2012-03-09 10:29:00 +01:00
Thomas Tanghus
82998ab1a6 Parses malformed N fields a bit more tolerantly. Thanks to nibbler for the patch :-) 2012-03-09 07:39:35 +01:00
Thomas Tanghus
4498b9a9cc Add missing file. 2012-03-09 07:39:35 +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
Thomas Tanghus
ac8a55689f Use OC.dialogs. 2012-03-07 22:57:37 +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
Bart Visscher
44bcdfc2cf Contacts: No random token for contactphoto 2012-03-07 21:46:42 +01:00
Bart Visscher
23f088a8bc Contacts: Add Organisation as Name property choice 2012-03-07 21:46:41 +01:00
Bart Visscher
b25dcf1805 Contacts: convert class attribute selectors to class selectors 2012-03-07 21:46:41 +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
Bart Visscher
073bd92af7 Implement showing Birthdays of contacts in the calendar 2012-03-01 21:00:22 +01:00
Georg Ehrke
cb5fd38157 fix baseUri of the Carddav server 2012-02-26 21:46:20 +01:00
Frank Karlitschek
5df69f434b first part of the abstraction work of the apps folder. more to come 2012-02-26 18:26:41 +01:00
Marvin Thomas Rabe
b5aa235719 UI problems solved. Bookmarks app updated. 2012-02-22 16:04:31 +01:00
Thomas Tanghus
b35e47ecd5 Translate and fix copy/paste error. 2012-02-22 14:19:23 +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
ea4f1ebbaf JS fix on address book creation. 2012-02-21 23:22:06 +01:00
Thomas Tanghus
ec6be92253 Remove my FIXME comments when I've fixed it :-P 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
VicDeo
61e98cae3c Contact list scroll fix 2012-02-20 23:54:23 +03:00
Thomas Tanghus
16702e97c0 Contacts: Fix adding/updating address book with empty name. 2012-02-20 15:24:54 +01:00
Thomas Tanghus
b4783d63a6 Contacts: Apply strip_tags on compound values. 2012-02-20 14:36:21 +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
1a42b35bf9 Merge gitorious.org:owncloud/owncloud into vcategories 2012-02-19 13:11:13 +01:00
Tom Needham
7631d0d438 Fixed call to OC_User. Thanks Burillo on IRC 2012-02-18 23:53:10 +00:00
Thomas Tanghus
af8085853e Strip tags on address on client side. 2012-02-18 11:49:31 +01:00
Thomas Tanghus
be2ecb63f3 Avoid errors from missing GD library. 2012-02-18 11:49:31 +01:00
Thomas Tanghus
0424854b41 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
a877cf5e3f Strip tags on address on client side. 2012-02-18 11:42:58 +01:00
Bart Visscher
ad9b912e10 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher
e1ff1fdebb Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Bart Visscher
b65aa3ff1a Contacts: Add removed app enabled check 2012-02-17 22:07:14 +01:00
Thomas Tanghus
1f35cb53f8 Avoid errors from missing GD library. 2012-02-17 19:04:12 +01:00
Thomas Tanghus
64d7534f11 Removed obsolete commented code and made minor speed improvements.
Added stub function for loading categories.
2012-02-17 09:35:18 +01:00
Thomas Tanghus
749faef97f UI tweaks for name selector combobox. 2012-02-16 10:38:00 +01:00
Thomas Tanghus
e7a13fedb8 Minor tweaks 2012-02-16 10:38:00 +01:00