rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-12 23:09:15 +01:00
Code Issues Releases Activity
3,191 Commits 18 Branches 95 Tags 40 MiB
2bf76c213c
Commit Graph

133 Commits

Author SHA1 Message Date
Bernhard Reiter
a9405d43e8 Rename $this->tagMgr to $this->tags as that's what they are. 
They're instances of OCP\ITags, not of OCP\ITagManager.
 2014-09-14 23:54:12 +02:00
Jan ten Bokkel
822f4f1083 Fix export of contacts 2014-09-13 15:52:39 +02:00
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
Clark Tomlinson
17f679076e Extracting closures into methods to solve php 5.3 issue #546 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
LEDfan
bf9d2cd999 Instead of throwing error, give a JSON result when there isn't a photo 2014-07-02 17:25:34 +02: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
Thomas Tanghus
f699812f69 Move instantiation of ImportManager to PageController 2014-05-09 13:39:17 +02:00
babelouest
a3166ee452 add admin settings to enable/disable ldap backend 2014-05-05 01:10:01 -04:00
Thomas Tanghus
a50b1b4860 Add use OCP\ICache to ImportController 2014-04-18 02:00:17 +02:00
Thomas Tanghus
561d13c20e Simplify cropPhoto args 2014-04-17 17:38:01 +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
03cf95f37c Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-09 13:45:48 -04:00
babelouest
c674b8db00 code clean in js config dialog 
distinction between a ldap addressbook edition and a local addressbook edition in the UI
several bug fixes
 2014-04-09 13:38:09 -04:00
babelouest
e354d0fae3 use ocdialog 
fix a bug in the contact.save() methid that was readonly for no reason
 2014-04-07 19:40:21 -04:00
Thomas Tanghus
e993761cb3 Forgot access sig 2014-04-08 01:32:53 +02:00
Thomas Tanghus
c5bdc2f74d Scrutinizer fixes 2014-04-08 01:19:30 +02:00
Thomas Tanghus
d0e8457fc3 No need to instantiate App twice 2014-04-07 23:35:57 +02:00
Thomas Tanghus
8dcd7a7d8b server => cache in ContactPhotoController 2014-04-07 23:21:12 +02:00
Thomas Tanghus
70438c997d Align controllers to owncloud/core#8017 2014-04-07 22:29:24 +02:00
babelouest
57211530f8 clean code 2014-04-07 01:17:48 -04:00
babelouest
ec8053c915 Several corrections and improvements, thanks to the feedbacks on the PR 2014-04-04 18:50:55 -04:00
babelouest
e9c9f6d363 first batch of a working of add/update addressbook dialog window 
several bugs remaining and code cleaning is necessary
 2014-04-03 17:35:58 -04:00
babelouest
536b5d5261 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-01 09:17:38 -04:00
babelouest
3f26148233 implementing ldap addressbook modification (draft) 2014-04-01 09:16:53 -04:00
Thomas Tanghus
06f865beeb Explicitly check for request vars 2014-04-01 03:38:01 +02:00
Thomas Tanghus
fa9f66e140 Unused var 2014-04-01 02:31:16 +02:00
Thomas Tanghus
9d672249da Add route for getting AddressBook metadata. Refs. #412 2014-04-01 02:11:29 +02:00
babelouest
a8e6ab0d33 change new addressbook ui for a dialog 
implemented delete ldap addressbook
 2014-03-29 01:22:52 -04:00
babelouest
e70faa6e82 Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-03-28 10:39:49 -04:00
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
Thomas Tanghus
1c1fc532d5 Throw proper exceptions in GroupController 2014-03-25 01:16:08 +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
a2323e1dc6 Add to CacheThumbnail call 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
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
Thomas Tanghus
43e65fc817 More photo handling cleanups 2014-03-20 21:53:13 +01:00
Thomas Tanghus
eb7c143718 More contact photo refactoring 2014-03-20 16:00:38 +01:00
Thomas Tanghus
05acb6e87a Mostly done refactoring Photo controller 2014-03-20 01:55:57 +01:00
Thomas Tanghus
f7811490a2 Add missing use arg to closure 2014-03-18 16:20:25 +01:00
Thomas Tanghus
868bf088b3 camelCase variables 2014-03-18 00:58:01 +01:00
babelouest
c85b284208 Revert "a little code cleaning, removed {count} value during the import process" 
This reverts commit 2a43562229.
 2014-03-12 14:23:42 -04:00
babelouest
2a43562229 a little code cleaning, removed {count} value during the import process 2014-03-12 13:32:09 -04:00
babelouest
919f540d01 Import from multiple formats 2014-03-11 16:43:32 +01:00
Thomas Tanghus
45aa3198f7 More cleanups 2014-03-09 15:03:29 +01:00
Thomas Tanghus
f6bfea77e7 Scrutinizer cleanup 2014-03-08 16:22:51 +01:00
babelouest
a13e1bd28c Merge branch 'master' of https://github.com/owncloud/contacts into ldap 
Conflicts:
	lib/backend/abstractbackend.php
	lib/backend/ldap.php
 2014-02-27 13:51:21 -05:00