1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Commit Graph

925 Commits

Author SHA1 Message Date
babelouest
ea0f5119db improve import automatic selection 2015-01-29 09:42:22 -05:00
LEDfan
ff13e3e081 Merge pull request #751 from owncloud/fix_741
Use thumbnail cache instead of refreshing every time
2014-12-24 07:55:09 +01:00
LEDfan
308241a0f5 Merge pull request #706 from owncloud/fix_704
Fix the createOrUpdate function
2014-12-21 09:20:46 +01:00
LEDfan
8e23084254 Fix wrong parameter order 2014-12-20 13:48:22 +01:00
LEDfan
f322defadf Use thumbnail cache instead of refreshing every time 2014-12-20 11:16:40 +01:00
Bjoern Schiessle
c5555e89c5 in oc8 or later share_backend need to implement isShareTypeAllowed() 2014-12-10 15:43:17 +01:00
LEDfan
3b70690e05 Create Update part 2014-12-07 14:01:39 +01:00
LEDfan
5a653a2a52 Use setPropertyByName 2014-12-07 09:22:13 +01:00
LEDfan
adfbbe3fbf Directly return 2014-12-07 09:17:38 +01:00
LEDfan
ae69dbf74f Fix identation 2014-12-07 09:17:38 +01:00
LEDfan
23a92e2b74 Fix the createOrUpdate function 2014-12-07 09:17:38 +01:00
babelouest
89c65e35a4 use tabs instead of space for indentation 2014-12-06 16:57:00 -05:00
babelouest
b90f05c0c6 fix bug with colon and space that made the import controller guess it's a ldif file instead of a vcard... 2014-12-06 16:42:34 -05:00
LEDfan
95bd2ff182 Merge pull request #621 from jakobsack/master
Move creation of default address book to backend
2014-12-05 07:45:49 +01:00
LEDfan
2ad05e3bdb Merge pull request #710 from owncloud/fix_404
Fix 404 contact not found with shared addressbook
2014-12-05 07:33:58 +01:00
Morris Jobke
f6ac4ea683 migrate from OC_Preferences to DI config object 2014-11-28 16:51:10 +01:00
LEDfan
579819bee8 also search for shared contacts 2014-11-21 13:03:15 +01:00
LEDfan
b6cdd06db2 Fix double line 2014-11-21 11:47:09 +01:00
LEDfan
2e9dbc4a38 Remove uneeded func 2014-11-21 11:37:08 +01:00
LEDfan
bd9706756d Use join instead of 2 queries 2014-11-21 11:36:28 +01:00
LEDfan
825884adc7 Refactor code to make it simpler 2014-11-21 11:06:54 +01:00
LEDfan
7ce883b33d First step to fix 404's with a shared addressbook 2014-11-21 11:05:06 +01:00
Bernhard Reiter
66f8c5d882 Merge pull request #668 from ockham/share-contact-groups2
Share contact groups
2014-11-17 16:51:07 +01:00
Bernhard Reiter
ea7e3b4844 Load resources from template using script() and style() functions. 2014-11-08 16:35:22 +01:00
Bernhard Reiter
5728c8663b Load md5 and Jcrop scripts and styles from their new locations.
They could not be loaded as they have been replaced by their bower
counterparts with
owncloud/core@49fbd766c2 and
owncloud/core@73569b29bc
2014-11-07 21:44:56 +01:00
Bernhard Reiter
8f23166955 Display correct number of contacts in shared addressbooks.
Fixes #654.
2014-10-28 23:17:38 +01:00
Bernhard Reiter
d29a4b3179 Replace "if (is_null($a) || $a === '')" clauses by "if (empty($a))". 2014-10-23 21:30:09 +02:00
jbtbnl
e947469545 Merge pull request #628 from owncloud/issue-592
Add avatar and placeholder JavaScripts
2014-10-22 12:51:23 +02:00
Bernhard Reiter
9cdf7a57e7 Include shared groups.
Fixes #38.
2014-10-11 01:47:49 +02:00
Bernhard Reiter
51d6783240 Fix and re-activate Contact sharing backend.
While not needed for actual contacts sharing (which is solely done via
the Addressbook sharing backend), we need its isValidSource() function
in core's \OC\Tags::getIdsForTag() (which implements \OCP\ITags::getIdsForTag()).
It is required there to test if the items that are tagged with a given
tag are actually allowed to be accessed by the user, i.e. owned by the
user or someone who is sharing it with the user.
2014-10-11 01:47:49 +02:00
Bernhard Reiter
c86dbf11b5 Delete groups by their id instead of their name. 2014-10-11 01:47:49 +02:00
Bernhard Reiter
83bc1eaadf Prepare for sharing of contact groups. 2014-10-11 01:47:44 +02:00
Bernhard Reiter
74a8af09a2 Add displayName() to GroupController. 2014-10-10 17:55:46 +02:00
Jan-Christoph Borchardt
f71d66164f Merge pull request #598 from tribut/fix-585
Use correct method to extract image from vcard
2014-10-10 12:33:00 +02:00
jbtbnl
9a869e40ca Merge pull request #617 from owncloud/issue-616
Remove unnecessary log message
2014-10-04 10:38:12 +02:00
Bernhard Reiter
8a8ef10b61 Fix log output in purgeIndexes(). 2014-10-01 21:06:57 +02:00
Bernhard Reiter
2db4e3b4e7 Fix Addressbook::childExists($id).
Return false instead of throwing an exception if there's no child with $id.
Also, add a test for that function.
2014-10-01 21:06:57 +02:00
Jörn Friedrich Dreyer
e426d7e867 fix class names 2014-10-01 18:08:53 +02:00
Jörn Friedrich Dreyer
7c54ac4f75 Delete searchprovider.php
no longer needed
2014-10-01 17:46:22 +02:00
Jörn Friedrich Dreyer
ea7f1545a7 Merge pull request #300 from owncloud/update_search_classes
Update search classes
2014-10-01 17:45:32 +02:00
Bernhard Reiter
51bc3fbe5f Add a backslash to fix an error.
Plus a simple whitespace fix.
2014-10-01 13:58:28 +02:00
LEDfan
cd2d7573d9 Merge pull request #638 from owncloud/fix_404
Solve the 404 contact not found error #623
2014-09-28 10:03:06 +02:00
LEDfan
7478295db5 Fix additional 404's refs https://github.com/owncloud/contacts/issues/623#issuecomment-56631474 2014-09-25 08:08:50 +02:00
jbtbnl
18c7e95380 Merge branch 'master' into import-new-ui
Conflicts:
	css/contacts.css
2014-09-15 11:14:31 +02:00
babelouest
7a9145d524 fix issue #537, handle multiple values in a not connected property 2014-09-10 12:52:30 -04:00
babelouest
b15ee161cf fix $id is array in database.php line 529 #559 2014-09-10 12:29:35 -04:00
Jan-Christoph Borchardt
ea5d8fbb79 Merge pull request #619 from owncloud/fix-header
Small fixes for header
2014-09-08 17:00:46 +02:00
LEDfan
5947a27884 This should solve the 404 error 2014-09-07 10:34:25 +02:00
Jakob Sack
7d214dbaea Fix creation of default address book 2014-09-02 22:54:54 +02:00
Andrew Brown
670848b860 Update search classes to with the new search system
Add a Contact search result type to distinguish these results within a search view.

reformat code
2014-09-01 17:00:23 +02:00