rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity
3,091 Commits 18 Branches 95 Tags 40 MiB
229c49d43e
Commit Graph

842 Commits

Author SHA1 Message Date
babelouest
229c49d43e Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui 
Conflicts:
	js/addressbooks.js
	templates/contacts.php
 2014-05-10 12:09:23 -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
babelouest
da0d990472 adapted import ui to fit in the ocdialog 
might be some bugs left though
 2014-05-07 22:46:22 -04:00
babelouest
f3272ad159 reimplemented import ui in a ocdialog 2014-05-07 16:54:58 -04: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
Thomas Tanghus
a50b1b4860 Add use OCP\ICache to ImportController 2014-04-18 02:00:17 +02:00
Thomas Tanghus
ed3a7ea31f is not allowed in Closures in PHP 5.3 2014-04-17 20:08:32 +02:00
Thomas Tanghus
561d13c20e Simplify cropPhoto args 2014-04-17 17:38:01 +02:00
Thomas Tanghus
f75dee996e Some cleanups. cc @LEDfan 2014-04-17 04:59:14 +02:00
Thomas Tanghus
fd2b7423a6 Indentation/Code style 2014-04-17 02:05:56 +02:00
Thomas Tanghus
a7ea3e4706 Clean indentation 2014-04-17 01:40:41 +02:00
Volkan Gezer
e9f52acd9c add space between on this and Name 2014-04-16 21:20:21 +02:00
babelouest
6920f3c2d9 sanitize code, remove error_log debug messages 2014-04-16 13:04:07 -04:00
Thomas Tanghus
25446f0e48 Add getSearchProvider() to AbstractBackend. Refs #465 2014-04-16 17:12:14 +02:00
babelouest
b8c3c4e1ea Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-15 11:13:05 -04:00
Thomas Tanghus
41cdd2173d Merge pull request #457 from owncloud/oc-users-backend 
OC users backend for the Chat app
 2014-04-15 13:43:10 +02:00
babelouest
5512e72ef4 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-11 07:56:06 -04:00
Thomas Tanghus
bf37aead8e Inject API in AddressBookController. Refs. #460 2014-04-11 12:45:15 +02:00
babelouest
cffc06cc47 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-10 23:33:17 -04:00
Thomas Tanghus
569b2c4a3f Register middleware as string. Refs owncloud/core#8139 2014-04-10 20:29:34 +02:00
Thomas Tanghus
08b5bf4514 Line break for readability 2014-04-10 20:29:34 +02:00
babelouest
78183bebf6 fix scrutinizer errors 2014-04-10 13:51:52 -04:00