859 Commits

Author	SHA1	Message	Date
Lukas Reschke	31726be13c	Fix indentation	2014-08-17 19:04:56 +02:00
root	011db92486	fix TagMgr access ... remove unwanted error_log	2014-08-08 00:57:41 +02:00
Thomas Müller	7065c9be05	properly convert the json serialized data to the format as expected by the public contacts search	2014-07-30 17:19:13 +02:00
Thomas Müller	b8ad6889ed	return 'PHOTO' attribute on AddressbookProvider::search	2014-07-30 15:07:18 +02:00
Clark Tomlinson	17f679076e	Extracting closures into methods to solve php 5.3 issue #546	2014-07-30 11:33:53 +02:00
Bernhard Posselt	73c35f43aa	fix php 4.3	2014-07-30 11:33:53 +02:00
Bernhard Reiter	4d31c2eb62	Use OCP\ITags in lib/controller/importcontroller.php.	2014-07-30 11:13:12 +02:00
Stephane V	2f67599968	Fix #532. Adds an intermediate variable to be compatible with php 5.3	2014-07-27 21:38:49 -04:00
LEDfan	bf9d2cd999	Instead of throwing error, give a JSON result when there isn't a photo	2014-07-02 17:25:34 +02:00
LEDfan	8d5c4456da	Remove localusers from contacts app	2014-06-19 15:17:22 +02:00
LEDfan	97d7fe40d6	Support jpg images for avatars from users	2014-06-19 15:17:22 +02:00
jbtbnl	ebb7535c85	Merge pull request #501 from owncloud/sabredav-1.8.10 ... update SabreDAV to 1.8.10	2014-06-18 11:11:29 +02:00
LEDfan	d0be5056be	add extra code for localusers	2014-06-15 10:28:30 +02:00
LEDfan	e96b5272bc	Disable localusers backend by default since it's will be ported into core refs #502	2014-06-06 08:12:05 +02:00
Thomas Müller	ea6629df63	update SabreDAV to 1.8.10	2014-05-26 22:09:12 +02:00
Volkan Gezer	adf946f1fe	another grammar fix	2014-05-25 13:18:20 +02:00
Volkan Gezer	096eb36d23	fix plural typo	2014-05-25 13:14:06 +02:00
LEDfan	0e863592e6	Fix php53 errors	2014-05-25 08:45:59 +02:00
babelouest	fed712b0c9	fixed issue #498 another time ... seems that the problem was due to the array $this->objects that didn't accept ldap backend ids as key forced the key to string, seems better now (ldap and local backend tested)	2014-05-20 14:53:04 -04:00
babelouest	bb1733da81	fix bug #498	2014-05-20 14:10:17 -04:00
babelouest	b2d26811e3	fixed scrutinizer issues	2014-05-09 15:18:44 -04:00
babelouest	c682a3585d	Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap ... Conflicts: admin.php lib/backend/ldap.php lib/dispatcher.php	2014-05-09 14:54:49 -04:00
babelouest	de4bb76c53	after a painful rebase	2014-05-09 14:30:14 -04:00
babelouest	93f7ccbc09	tmp	2014-05-09 13:58:11 -04:00
babelouest	7e3da29c87	rebase	2014-05-09 13:55:51 -04:00
babelouest	5e95953799	rebase	2014-05-09 13:54:45 -04:00
Thomas Tanghus	f699812f69	Move instantiation of ImportManager to PageController	2014-05-09 13:39:17 +02:00
Tobia De Koninck	3806f0236b	Change displayname of ownCloud username field	2014-05-09 09:50:50 +02:00
Thomas Tanghus	5a35e74270	Merge pull request #481 from owncloud/fix_php53_errors ... Use instead of	2014-05-08 14:37:08 +02:00
Tobia De Koninck	7856fc22ef	more getServer() instead server	2014-05-08 14:26:57 +02:00
Tobia De Koninck	f64ca8af7c	getServer() instead server	2014-05-08 14:25:47 +02:00
Tobia De Koninck	415821e2c3	Implement getKey() for the localusers backend provider	2014-05-06 13:50:18 +02:00
Tobia De Koninck	0a035175bb	Use instead of	2014-05-05 17:32:07 +02:00
babelouest	a3166ee452	add admin settings to enable/disable ldap backend	2014-05-05 01:10:01 -04:00
Tobia De Koninck	feacd10f1a	fix typo	2014-04-27 16:44:42 +02:00
Tobia De Koninck	594088a258	Add in the localuseradressbookprovider	2014-04-27 16:43:35 +02:00
Thomas Tanghus	c5f4713915	DownloadResponse now in public namespace	2014-04-26 00:41:22 +02:00
Thomas Tanghus	5358a312cb	Code style	2014-04-24 18:32:33 +02:00
Thomas Tanghus	a457684f41	Updates to localusers backend. cc @LEDfan	2014-04-24 15:30:59 +02:00
Thomas Tanghus	971675f7fe	Cleanup backend code and docs	2014-04-24 15:30:59 +02:00
Thomas Tanghus	06fd41e886	Update docs for AddressBook::getSearchProvider. Refs #470	2014-04-23 11:43:26 +02:00
Thomas Tanghus	7c37422c93	Merge pull request #470 from owncloud/add-localusers-app ... Implement getSearchProvider	2014-04-23 11:39:42 +02:00
Tobia De Koninck	c03ad310cb	fix issues	2014-04-23 08:42:17 +02:00
Tobia De Koninck	f0784e906d	Fix #474 issue 2	2014-04-23 08:37:08 +02:00
Tobia De Koninck	cc3fc4b9ba	Fix #474 isssue 2	2014-04-23 08:35:28 +02:00
Thomas Tanghus	90d7f1e282	Shared address books was shown twice	2014-04-22 15:39:44 +02:00
Thomas Tanghus	a839a9ae6e	Shared address books wasn't shown. Fix #471	2014-04-22 15:39:14 +02:00
LEDfan	0d619b835c	Add docs	2014-04-18 12:52:52 +02:00
LEDfan	11eef60a55	Implement getSearchProvidder	2014-04-18 12:47:44 +02:00
Thomas Tanghus	bb606e9223	Use realpath() for import connectors. Refs. #469	2014-04-18 03:46:27 +02:00