2897 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
babelouest	440fce7ca8	Merge branch 'master' of https://github.com/owncloud/contacts into ldap ... Conflicts: formats/backend_ldap_connector.xml lib/backend/abstractbackend.php lib/backend/database.php lib/backend/ldap.php lib/controller/addressbookcontroller.php	2014-03-28 10:39:25 -04:00
Jenkins for ownCloud	d48f327b3e	[tx-robot] updated from transifex	2014-03-24 00:49:54 -04:00
Thomas Tanghus	69750ebb1e	Add title to names that would elliptisized (is that a word?)	2014-03-24 00:09:13 +01:00
Thomas Tanghus	7552d20373	Scroll list after rendering contact to show all of it	2014-03-23 23:51:08 +01:00
Thomas Tanghus	ff395f36a3	Misc. code cleanups	2014-03-23 19:02:16 +01:00
Thomas Tanghus	71a4ca334b	Wrap OC.Contacts in immediate function	2014-03-23 14:21:25 +01:00
Thomas Tanghus	a1c8fe7f1e	Merge pull request #444 from owncloud/import_multi_format2 ... Import from multiple formats	2014-03-23 14:18:48 +01:00
Thomas Tanghus	f0ee17d22c	On use jqXHR as argument to JSONResponse	2014-03-23 14:14:36 +01:00
Thomas Tanghus	ccb7490630	Mark globals in jshintrc	2014-03-23 14:13:46 +01:00
Thomas Tanghus	4ddf388bfd	White-space	2014-03-23 13:41:04 +01:00
Thomas Tanghus	d4283bed80	Fix undefined var	2014-03-23 12:08:56 +01:00
Thomas Tanghus	ad2d20ba2d	Check for stale link to contact	2014-03-23 11:51:59 +01:00
Thomas Tanghus	5a70cac6da	Remove duplicate jquery.multiselect	2014-03-23 10:25:00 +01:00
Jenkins for ownCloud	5d10cfb2fc	[tx-robot] updated from transifex	2014-03-23 00:49:53 -04:00
Thomas Tanghus	5eb8ac1398	Fix translation string wording	2014-03-22 21:33:36 +01:00
Thomas Tanghus	2aa97eeece	Fix thumbnail caching	2014-03-22 21:20:08 +01:00
Jenkins for ownCloud	c90413f24b	[tx-robot] updated from transifex	2014-03-22 00:49:53 -04:00
Thomas Tanghus	f28751e3d8	Get Image directly from Contact in cacheThumbnail	2014-03-21 15:19:32 +01:00
Thomas Tanghus	a2323e1dc6	Add to CacheThumbnail call	2014-03-21 15:19:32 +01:00
Thomas Tanghus	b4436257a9	Add Contact to CacheThumbnail call	2014-03-21 15:19:32 +01:00
Thomas Tanghus	ee21fb30d7	Also return response on failure in js Storage	2014-03-21 15:19:32 +01:00
Thomas Tanghus	b4f4147195	Remove unneeded test that will be caught by http middleware anyways	2014-03-21 15:19:32 +01:00
Thomas Tanghus	702b0cdc18	Revert fix to please Scrutinizer	2014-03-21 15:19:32 +01:00
Thomas Tanghus	cc0b0a4c9a	Correct call to AddressBook->getChild()	2014-03-21 15:19:32 +01:00
Thomas Tanghus	ebc1eb4568	REmove unused ctor	2014-03-21 15:19:32 +01:00
Thomas Tanghus	ba87ba60a2	Correct types for VCard properties	2014-03-21 15:19:31 +01:00
Thomas Tanghus	ce9a2797a9	Use \OC::->close(); instead of session_write_close();	2014-03-21 15:19:31 +01:00
Thomas Tanghus	bbba21d8eb	Add 3rdparty to .gitignore	2014-03-21 15:19:31 +01:00
babelouest	d7f8b57025	added standard vcard connector ... cleaned code according to scrutinizer log fixed import message on UI	2014-03-21 01:59:19 -04:00
Jenkins for ownCloud	338c2f19b1	[tx-robot] updated from transifex	2014-03-21 00:49:54 -04:00
Thomas Tanghus	43e65fc817	More photo handling cleanups	2014-03-20 21:53:13 +01:00
Thomas Tanghus	d9a1089c7d	@returns => @return	2014-03-20 21:52:44 +01:00
Thomas Tanghus	4d71167d56	Change calls to legacy methods	2014-03-20 21:52:07 +01:00
Thomas Tanghus	8bbb60a68e	Stray semi-colon	2014-03-20 17:12:11 +01:00
Thomas Tanghus	98e1dfe7a6	Scrutinizer weirdness	2014-03-20 16:58:06 +01:00
Thomas Tanghus	eb7c143718	More contact photo refactoring	2014-03-20 16:00:38 +01:00
Thomas Tanghus	1a7a7cbc80	Add missing @property annotations	2014-03-20 16:00:38 +01:00
Thomas Tanghus	b222447fa5	Use ajax instead of posting to iframe and the likes	2014-03-20 16:00:38 +01:00
Jenkins for ownCloud	b620af33fb	[tx-robot] updated from transifex	2014-03-20 00:49:52 -04:00
Thomas Tanghus	05acb6e87a	Mostly done refactoring Photo controller	2014-03-20 01:55:57 +01:00
Jenkins for ownCloud	d31547b12a	[tx-robot] updated from transifex	2014-03-19 00:49:17 -04:00
Thomas Tanghus	fc85adb1b8	Missing 'case:'	2014-03-19 01:59:09 +01:00
Thomas Tanghus	1f4eec0ae5	Reduce complexity of DB query calls	2014-03-19 01:50:10 +01:00
Thomas Tanghus	95c54b6bab	White-space	2014-03-19 01:17:00 +01:00
Thomas Tanghus	202d23813b	Misc. fixes after refactoring	2014-03-18 23:51:32 +01:00
Thomas Tanghus	cdcb9e504e	Database backend refactoring	2014-03-18 23:51:07 +01:00
Thomas Tanghus	4c78e1fea0	Add title attribute to group element	2014-03-18 18:14:47 +01:00
Thomas Tanghus	83c3d0c094	Add types to @property annotations	2014-03-18 16:20:25 +01:00
Thomas Tanghus	dfda6d1ea6	Wrong var name	2014-03-18 16:20:25 +01:00
Thomas Tanghus	dab64ee15c	Missing @return	2014-03-18 16:20:25 +01:00