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

876 Commits

Author SHA1 Message Date
Steffen Lindner
fb65570747 Manual Backport of #710 2014-12-11 15:29:56 +01:00
babelouest
4ebbf1ceed use tabs instead of space for indentation 2014-12-09 15:48:37 +01:00
babelouest
65bca0269f fix bug with colon and space that made the import controller guess it's a ldif file instead of a vcard... 2014-12-09 15:48:23 +01:00
Jan ten Bokkel
2963f9e93f Remove unnecessary log message 2014-11-02 16:33:59 +01:00
Bernhard Reiter
fecc173b52 Add a backslash to fix an error.
Plus a simple whitespace fix.
2014-11-02 16:25:11 +01:00
Bernhard Reiter
e0eb3ddf5a Fix typos in variable names that broke stuff. 2014-11-01 14:54:47 +01:00
Jan ten Bokkel
b9c100c605 Add avatar and placeholder JavaScripts 2014-10-22 12:54:22 +02:00
Felix Eckhofer
6d0a8ad997 Use correct method to extract image from vcard
It was incorrectly assumed, that $vcard is always an
OCA\Contacts\Contact (which is true when the contacts app is rendered)
but when called from the `contactUpdated` hook, it actually is a
OCA\Contacts\VObject\VCard.

Fixes owncloud/contacts#585
2014-10-16 11:05:55 +02:00
Jörn Friedrich Dreyer
d4fbd5ffa7 fix class names 2014-10-01 18:06:41 +02:00
Jörn Friedrich Dreyer
d77f0d353c Delete searchprovider.php
no longer needed
2014-10-01 17:48:12 +02:00
Andrew Brown
30152ecbf6 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-10-01 17:47:51 +02:00
LEDfan
5e714a7e8e Fix additional 404's refs https://github.com/owncloud/contacts/issues/623#issuecomment-56631474 2014-09-28 12:18:00 +02:00
LEDfan
3d4224a090 This should solve the 404 error 2014-09-28 12:17:46 +02:00
babelouest
0995148bc6 fix issue #537, handle multiple values in a not connected property 2014-09-21 14:39:14 -04:00
babelouest
48af7ff223 fix $id is array in database.php line 529 #559 2014-09-21 14:39:04 -04:00
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
Thomas Müller
7065c9be05 properly convert the json serialized data to the format as expected by the public contacts search 2014-07-30 17:19:13 +02:00
Thomas Müller
b8ad6889ed return 'PHOTO' attribute on AddressbookProvider::search 2014-07-30 15:07:18 +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 Posselt
73c35f43aa fix php 4.3 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
Stephane V
2f67599968 Fix #532. Adds an intermediate variable to be compatible with php 5.3 2014-07-27 21:38:49 -04: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
LEDfan
8d5c4456da Remove localusers from contacts app 2014-06-19 15:17:22 +02:00
LEDfan
97d7fe40d6 Support jpg images for avatars from users 2014-06-19 15:17:22 +02:00
jbtbnl
ebb7535c85 Merge pull request #501 from owncloud/sabredav-1.8.10
update SabreDAV to 1.8.10
2014-06-18 11:11:29 +02:00
LEDfan
d0be5056be add extra code for localusers 2014-06-15 10:28:30 +02:00
LEDfan
e96b5272bc Disable localusers backend by default since it's will be ported into core refs #502 2014-06-06 08:12:05 +02:00
Thomas Müller
ea6629df63 update SabreDAV to 1.8.10 2014-05-26 22:09:12 +02:00
Volkan Gezer
adf946f1fe another grammar fix 2014-05-25 13:18:20 +02:00
Volkan Gezer
096eb36d23 fix plural typo 2014-05-25 13:14:06 +02:00
LEDfan
0e863592e6 Fix php53 errors 2014-05-25 08:45:59 +02:00
babelouest
fed712b0c9 fixed issue #498 another time
seems that the problem was due to the array $this->objects that didn't accept ldap backend ids as key
forced the key to string, seems better now (ldap and local backend tested)
2014-05-20 14:53:04 -04:00
babelouest
bb1733da81 fix bug #498 2014-05-20 14:10:17 -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
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