Commit Graph

13 Commits

Author SHA1 Message Date
Joas Schilling 2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Thomas Müller bb6fac1102 Merge branch 'master' into contactsmanager-register
Conflicts:
	lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Robin McCorkell b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Bart Visscher 7c0370105a Fix wrong var name 2014-04-26 11:15:09 +02:00
Bart Visscher fc9371ae10 Merge branch 'master' into contactsmanager-register
Conflicts:
	lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
Tobia De Koninck efff7dd2a4 Change key to addressbook-key 2014-04-22 12:46:09 +02:00
LEDfan b78c1373b6 Add key to every contact 2014-04-18 14:30:44 +02:00
Bart Visscher 9583549556 camelCase vars in OC\ContactsManager 2014-04-17 17:56:23 +02:00
Bart Visscher 694244f2e0 Supply the contactsmanager object to the callbacks 2014-04-10 18:07:15 +02:00
Bart Visscher 5c412f480c $key is not needed for registering contactsmanager callbacks 2014-04-10 18:06:31 +02:00
Bart Visscher 511816b878 Implement the register function of OC\ContactsManager 2014-04-09 21:53:06 +02:00
Bart Visscher 35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Thomas Müller 9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
	lib/private/vcategories.php
2013-09-30 16:36:59 +02:00