6 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	50a4e8ed8d	Some UI improvements on the addressbooks settings.	2012-08-07 00:06:18 +02:00
Michael Gapczynski	9fa545b2ec	Load icons for addressbooks, fix statuses for types other than files	2012-08-06 15:24:08 -04:00
Thomas Tanghus	95c00c16f6	Return properly formatted jsondata.	2012-08-02 19:03:45 +02:00
Thomas Tanghus	af6ffc9505	Updated JS namespace.	2012-08-02 04:18:44 +02:00
Thomas Tanghus	4ff2f2aaf9	And then the missing files ;)	2012-08-02 00:02:07 +02:00