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,142 Commits 18 Branches 95 Tags 40 MiB
ebb7535c85
Commit Graph

848 Commits

Author SHA1 Message Date
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
f7ea06fe79 Cleanup in TemporaryPhoto 2014-03-25 01:16:08 +01:00
Thomas Tanghus
ff395f36a3 Misc. code cleanups 2014-03-23 19:02:16 +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
2aa97eeece Fix thumbnail caching 2014-03-22 21:20:08 +01: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
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
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
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
05acb6e87a Mostly done refactoring Photo controller 2014-03-20 01:55:57 +01: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
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
Thomas Tanghus
f7811490a2 Add missing use arg to closure 2014-03-18 16:20:25 +01:00
Thomas Tanghus
54c79d65c5 Fix logic in IndexProperties hook 2014-03-18 16:20:25 +01:00
Thomas Tanghus
868bf088b3 camelCase variables 2014-03-18 00:58:01 +01:00
Thomas Tanghus
d7d8d3e998 Scrutinizer fixes 2014-03-17 23:48:16 +01:00
Thomas Tanghus
1724c872ef Don't force UTF-8 convertion on a raw vCard. 
- See http://lists.kde.org/?l=kde-pim&m=139499803011869&w=2
 2014-03-17 23:20:21 +01:00
Thomas Tanghus
67c53df958 Improve UID generator 2014-03-17 23:19:58 +01:00
Thomas Tanghus
aed174483d Fix @param 2014-03-17 23:18:57 +01:00
Thomas Tanghus
86406d5599 Remove faulty multi-byte detection 2014-03-17 22:56:09 +01:00
Thomas Tanghus
4da09ff2e7 Prevent multi-bute chars (Emoji) from being added 2014-03-17 06:14:23 +01:00
Thomas Tanghus
d1da143191 Removed obsolete dicontainer.php 2014-03-16 01:30:33 +01:00
Thomas Tanghus
7441ae66e7 Add {@inheritdoc} for backends 2014-03-16 01:30:33 +01:00
Thomas Tanghus
5b30b408d3 camelCase variabels 2014-03-14 20:57:26 +01:00
Thomas Tanghus
e0846b454f Return null if shared address book is not found 2014-03-14 20:36:44 +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
cbb7b0db8f Remove wrong argument to HttpMiddleware ctor 2014-03-11 12:59:06 +01:00
Thomas Tanghus
c184fc5973 Remove wrong argument to HttpMiddleware ctor 2014-03-11 12:59:06 +01:00
Thomas Tanghus
b685af611a Remove unused code in Http middleware 2014-03-10 22:24:19 +01:00
Thomas Tanghus
ef30cdc524 Add userid to address book query. Fix owncloud/security-tracker#48 2014-03-10 15:53:49 +01:00
Thomas Tanghus
1afddaa98e Finally actually implement the interfaces I claim to. 
\Iterator, \Countable, \ArrayAccess

Still need some checks to assure validity after unset()
 2014-03-10 15:16:15 +01:00
Thomas Tanghus
45aa3198f7 More cleanups 2014-03-09 15:03:29 +01:00
Thomas Tanghus
d724149c56 More fixes 2014-03-08 19:09:17 +01:00
Thomas Tanghus
55c50dd1b2 More fixes 2014-03-08 18:13:43 +01:00
Thomas Tanghus
f63081a06b More fixes 2014-03-08 17:37:05 +01:00
Thomas Tanghus
f6bfea77e7 Scrutinizer cleanup 2014-03-08 16:22:51 +01:00
Thomas Tanghus
f1aa86204f Return cached shared address book. Fix #442 2014-03-08 14:10:30 +01:00
Thomas Tanghus
8cbfec3b0a Scrutinizer fixes 2014-03-08 04:32:18 +01:00
babelouest
2dc75e962e apparently it works -ish 2014-03-03 23:11:18 -05:00
babelouest
ac16864059 fix bug in ldap->vcard translation that caused the remote update not to work (was hard to find this one !) 2014-03-03 22:59:50 -05:00
Thomas Tanghus
4bbbe3d95a Revert "fix ldap a bit" @babelouest 
This reverts commit 5cb99a657e.
 2014-03-03 01:16:02 +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
Thomas Tanghus
ddcf0f2e53 Resize contact photo on upload. Fixes #296 2014-02-27 11:03:14 +01:00
Thomas Tanghus
394d15350e Remove use of %webroot%. Closes #406 2014-02-26 23:23:01 +01:00
Thomas Tanghus
809d79163b Remove stray App instantiation. Thx @ednt :) 2014-02-26 12:59:08 +01:00
Thomas Tanghus
2a1f308acb Improve search. Fix #385 and #421 2014-02-26 12:30:38 +01:00
Thomas Tanghus
16de03fcfd Quiet down address book provider 2014-02-26 12:29:05 +01:00
babelouest
3300bed849 Merge branch 'master' of https://github.com/owncloud/contacts 2014-02-25 07:53:35 -05:00
babelouest
23f7729018 tmp 2014-02-23 16:33:50 -05:00
babelouest
f412d41a9b apparently it works -ish 2014-02-10 15:16:43 -05:00
babelouest
a4e45c435e Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-02-10 13:31:39 -05:00
Thomas Tanghus
b672cd7ea7 Doc for carddav backend class 2014-02-10 16:55:51 +01:00
Thomas Tanghus
a7d3a69fdd Show year in CalDAV BDAY events 2014-02-08 19:22:22 +01:00
Thomas Tanghus
047ed7634f Merge pull request #401 from owncloud/chat_app_integration 
Add ownCloud handle field
 2014-02-08 14:25:26 +01:00
LEDfan
90ec264caa Add 'x-' since the protocol is not standard 2014-02-08 12:28:21 +01:00
babelouest
9d83e92cb0 it's been a long time 2014-02-07 15:55:55 -05:00
Thomas Tanghus
1ab880f348 Also log errors 2014-02-05 22:48:29 +01:00
Thomas Tanghus
c75b52cb8f Revert "Initialize JSONReponse data with null" 
This reverts commit e2898139bb.
 2014-02-05 22:46:26 +01:00
Thomas Tanghus
0b6cd04a3b Fix invalid BDAYs before import. Fixes #395 2014-02-04 22:33:07 +01:00
Thomas Tanghus
8383bafce6 Try parse invalid BDAYs already imported. Refs #395 2014-02-04 22:23:36 +01:00
Thomas Tanghus
e2898139bb Initialize JSONReponse data with null 2014-02-04 21:38:22 +01:00
LEDfan
a008057f59 Use dash instead of underscore 2014-02-04 08:03:32 +01:00
LEDfan
104c7d9be4 Add ownCloud handle field 2014-02-03 18:37:55 +01:00
Thomas Tanghus
7ada585112 Don't thrown exception in CardDAV backend if card not found 2014-02-03 17:36:02 +01:00
Thomas Tanghus
3f23a5afb3 Fix SQL query. Refs. #386 2014-02-03 14:53:04 +01:00
Thomas Tanghus
8a7ada1c37 Add support for HEAD and OPTIONS to address book 2014-01-29 23:49:58 +01:00
Thomas Tanghus
04dc2c8a12 Add some checks. Refs #386 2014-01-28 17:21:54 +01:00
Thomas Tanghus
f347f3725a name -> displayname 2014-01-27 17:51:13 +01:00
Thomas Tanghus
a5d3697b97 Don't reset array. Refs #361 2014-01-27 17:31:05 +01:00
jbtbnl
9530b8d14d Partial fix for #379. 2014-01-27 13:47:00 +01:00
Thomas Tanghus
c3d30be656 CardDAV: Etag wasn't returned in getCard() 2014-01-26 23:00:32 +01:00
Thomas Tanghus
b269bfce6d Fix photo loading 2014-01-26 03:22:49 +01:00
Thomas Tanghus
9abdeb75ce 2014 2014-01-26 00:40:22 +01:00
Thomas Tanghus
c738174937 Refactor groups management. Fix #370 
- Moved adding/removing groups to OCA\Contacts\VObject\VCard
- CATEGORIES property wasn't removed when empty
- When removing all groups from contact, it wasn't assigned to ungrouped.
- When adding contact(s) to group it wasn't removed from ungrouped until
  you changed to other group and back.
 2014-01-25 17:08:01 +01:00
Thomas Tanghus
a742486150 Indentation 2014-01-25 03:42:03 +01:00
Thomas Tanghus
217923d6a5 Fix CSRF checks. Ref owncloud/core#6840 2014-01-24 16:24:31 +01:00
Thomas Tanghus
e22d39aa10 Try to fix DAV adr.book creation. Refs. #361 2014-01-23 10:23:30 +01:00
Thomas Tanghus
b81a475b78 Do more error checking. Refs. #367 2014-01-22 22:22:58 +01:00
Thomas Tanghus
a8de751533 Merge pull request #323 from owncloud/remove-numRows-master 
- replace numRows() calls
 2014-01-22 12:55:45 -08:00
Thomas Tanghus
86e2d305a8 Better check for UID. Refs. #367 2014-01-22 18:27:34 +01:00
Thomas Tanghus
b0474d7da4 Fix empty FN. Related: #353 2014-01-22 17:46:58 +01:00
Thomas Tanghus
0a59d6c164 Namespace fix 2014-01-22 17:45:24 +01:00
Jan
2fa9b95cad Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-31 12:21:23 +01:00
Thomas Müller
33016b3b1b - replace numRows() calls 
- fixing some namespace and syntax issues
 2013-12-30 14:10:22 +01:00
Thomas Tanghus
48c2f8eaa5 Merge branch 'master' of github.com:owncloud/contacts 2013-12-28 10:02:56 +01:00
Thomas Tanghus
b532adfaaa Throw a more understable exception 2013-12-28 10:02:22 +01:00
Jan
6f8888c9b1 Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-21 16:50:06 +01:00
Thomas Tanghus
3cb61fc10c Shorten request URI on selected export. Refs. #304 2013-12-20 00:11:48 +01:00
Thomas Tanghus
944e6e79ce Test for string value. Refs. 307 2013-12-19 23:29:14 +01:00
Jan
0b2d5a788c Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-18 11:45:43 +01:00
Thomas Tanghus
faff3aaaa6 Don't index PHOTO and truncate value to 254 chars. Fixes #306 2013-12-17 18:05:36 +01:00
Jan
38ab10ef3e Merge branch 'master' of https://github.com/owncloud/contacts.git 2013-12-17 16:28:50 +01:00
Jan
1ca5efeec4 Revert "Possibly fixes owncloud/#298" 
This reverts commit bb1a799c84.
 2013-12-17 16:26:20 +01:00
Thomas Tanghus
c430120092 Check for null, not just falsy. Refs #298 2013-12-17 16:11:55 +01:00
Thomas Tanghus
58f6f36fc3 Erronious continue statement. Fix owncloud/calendar#260 2013-12-17 15:38:10 +01:00
Jan ten Bokkel
bb1a799c84 Possibly fixes owncloud/#298 2013-12-16 13:39:39 +01:00
Jan ten Bokkel
0386e1fcfc Implemented default ownCloud contact avatars. Fixes https://github.com/owncloud/contacts/issues/287 2013-12-14 15:22:42 +01:00
Thomas Tanghus
1ee1ca9dd2 Missing var. Refs #295 2013-12-13 09:14:29 +01:00
Thomas Tanghus
fcf1d99fce Don't try to set FN if it's null. Possibly fix #293 2013-12-13 08:49:55 +01:00
Thomas Tanghus
fe368e69a7 Used wrong index. Refs #269 2013-11-28 14:21:06 +01:00
Thomas Tanghus
5f7d7a9ddb Prevent duplicate URI. Fix #263 2013-11-28 14:15:17 +01:00
Thomas Tanghus
6fc07aad83 Don't useoc:// wrapper. Fix #261 2013-11-28 12:18:15 +01:00
Nicolas Mora
5cb99a657e fix ldap a bit 2013-11-24 15:07:04 -05:00
babelouest
6f7f0dd871 Merge branch 'master' of https://github.com/owncloud/contacts 2013-11-16 14:46:23 -05:00
Thomas Tanghus
c9e1155211 Missing comma in ContactPhotoController. Fixes #259 2013-11-16 12:00:35 +01:00
Thomas Tanghus
b5858dd78f Temporarily disable caching for userAddressBooks 2013-11-13 20:24:02 +01:00
Nicolas Mora
90e8773ec3 Merge branch 'master' of https://github.com/owncloud/contacts 2013-11-08 11:20:25 -05:00
Thomas Tanghus
dd846a15f8 Fix setting address book active 2013-11-07 14:24:55 +01:00
Thomas Tanghus
aa8a51d9a7 Move cacheThumbnail to Properties. Fix #252 2013-11-07 14:06:31 +01:00
babelouest
9db34d133d Merge branch 'master' of https://github.com/owncloud/contacts 2013-11-05 10:30:02 -05:00
Thomas Tanghus
7416a16bef Refresh groups on CardDAV update. Refs #246 2013-11-04 15:59:07 +01:00
Thomas Tanghus
a13a319efb Right owner for shared AB. Fix #229 2013-10-30 16:15:11 +01:00
Vincent Petry
42091106c4 Fix app not loading any more in OC6 with PHP 5.3 2013-10-24 11:14:46 +02:00
Thomas Tanghus
3ba2913279 Temporary hack to make sharing look workable. Refs #229 2013-10-23 19:12:31 +02:00
Thomas Tanghus
a388525111 Adjust code to appframework api 2013-10-23 12:56:30 +02:00
Thomas Tanghus
fa83aaef80 Fix link in search results 2013-10-23 02:56:17 +02:00
babelouest
935b10f77b Merge branch 'master' of https://github.com/owncloud/contacts 2013-10-22 15:55:04 -04:00
Thomas Tanghus
bf095621e0 Fix editing contact photos. 2013-10-22 17:10:23 +02:00
babelouest
86fb9df26e Merge branch 'master' of https://github.com/owncloud/contacts 2013-10-20 14:18:22 -04:00
Thomas Tanghus
155a61c867 Misc cleanup 2013-10-18 15:29:32 +02:00
Thomas Tanghus
1d29b943ae Finally works with core master 2013-10-17 02:10:50 +02:00
Thomas Tanghus
99899531d2 Remove legacy categories code 2013-10-17 02:10:50 +02:00
Thomas Tanghus
d71d4c84fd Current adjustements with core. Still doesn't work with master 2013-10-11 14:47:54 +02:00