12 Commits

Author	SHA1	Message	Date
Thomas Tanghus	b83796e251	Merge branch 'master' of github.com:owncloud/apps into contacts_rework ... Conflicts: contacts/ajax/categories/categoriesfor.php contacts/ajax/contact/saveproperty.php contacts/js/contacts.js contacts/lib/vcard.php	2012-11-14 01:11:42 +01:00
Thomas Tanghus	69cdc09d93	Use OCA namespace.	2012-10-25 03:34:12 +02:00
Thomas Tanghus	4890bdf705	Don't set checksum for non-existing property.	2012-10-19 02:27:37 +02:00
Thomas Mueller	089b7e8f8a	adding space between) and {	2012-09-07 15:21:03 +02:00
Bart Visscher	b179feeea2	Fix whitespace in contacts	2012-09-07 14:32:45 +02:00
Thomas Tanghus	a76ed1a35d	Code style	2012-07-20 00:18:23 +02:00
Jörn Friedrich Dreyer	f7bdc57888	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
Thomas Mueller	39f99602bf	removing executable bit - again	2012-05-15 00:52:00 +02:00
Frank Karlitschek	0343af38fd	ported oc_json	2012-05-03 12:23:29 +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
Georg Ehrke	3863a44589	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
Thomas Tanghus	d1dc4f23c6	Rename...	2012-03-12 16:47:29 +01:00