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
jbtbnl
e947469545
Merge pull request #628 from owncloud/issue-592
...
Add avatar and placeholder JavaScripts
2014-10-22 12:51:23 +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
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
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
Jan ten Bokkel
2cec676c10
Add avatar and placeholder JavaScripts
2014-08-31 10:51:24 +02:00
Jan ten Bokkel
7945f1fcc8
Fix export of contacts
2014-08-29 17:52:51 +02:00
Bernhard Reiter
0eb18b2a15
Fix typos in variable names that broke stuff.
2014-08-29 00:45:56 +02:00
Bernhard Reiter
e69f1374f3
Fix a comment typo.
2014-08-29 00:45:56 +02:00
Bernhard Reiter
0d6f16f612
Fix one error reporting line in the group controller.
2014-08-29 00:45:56 +02:00
Bernhard Reiter
319f68051b
In public function inGroup($name), add missing "return" keyword.
2014-08-29 00:45:56 +02:00
Jan ten Bokkel
f1cbc92ec7
Remove unnecessary log message
2014-08-27 13:48:53 +02:00
jbtbnl
0129e59024
Hide upload iframe and fix merge flaws
2014-08-26 19:28:45 +02:00
jbtbnl
a9ade3079d
Merge remote-tracking branch 'origin/master' into import-new-ui
...
Conflicts:
css/contacts.css
lib/controller/importcontroller.php
2014-08-26 17:42:14 +02:00
Bernhard Reiter
1e015d9872
Rename $this->tagMgr to $this->tags as that's what they are.
...
They're instances of OCP\ITags, not of OCP\ITagManager.
2014-08-19 14:29:46 +02:00
Felix Eckhofer
87fa4d055c
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-08-10 20:16:52 +02:00
Thomas Müller
55fc3dda63
properly convert the json serialized data to the format as expected by the public contacts search
2014-07-30 17:05:09 +02:00
Jan-Christoph Borchardt
7075e94ee0
Merge pull request #545 from owncloud/return-photo-on-search-master
...
return 'PHOTO' attribute on AddressbookProvider::search
2014-07-30 15:05:50 +02:00
Thomas Müller
0549c01fe8
Merge pull request #568 from owncloud/adding-php-lint
...
adding php-lint
2014-07-30 11:33:10 +02:00
Clark Tomlinson
e7755dcc32
Extracting closures into methods to solve php 5.3 issue #546
2014-07-30 11:07:44 +02:00
Bernhard Posselt
7957769c59
fix php 4.3
2014-07-30 11:04:15 +02:00
Bernhard Reiter
dd2c0f7c14
Use OCP\ITags in lib/controller/importcontroller.php.
2014-07-23 20:43:32 +02:00
Thomas Müller
e8e9d34725
return 'PHOTO' attribute on AddressbookProvider::search
2014-07-22 12:42:59 +02:00
Stephane V
e62dc63947
Fix #532 . Adds an intermediate variable to be compatible with php 5.3
2014-07-09 19:18:20 +02:00
root
5c5bc56ae4
fix TagMgr access
...
remove unwanted error_log
2014-07-04 10:51:59 -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
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
