Thomas Müller
7232c4f1ad
Merge pull request #995 from owncloud/LukasReschke-patch-3
...
Fix PHP 5.3 compatibility
2015-07-20 11:36:54 +02:00
Lukas Reschke
2a3b44e8da
Fix PHP 5.3 compatibility
2015-07-18 22:08:36 +02:00
Thomas Müller
94900c3959
Merge pull request #858 from lupusmeatus/stable7-bugfix-restrict-addressbookprovider-search-to-single-addressbook
...
restrict addressbookprovider-search to its addressbook in oc7
2015-06-26 17:56:32 +02:00
lupusmeatus
ab5fa78126
restrict addressbookprovider-search to its addressbook in oc7
...
backport of #857
2015-03-22 05:17:40 +01:00
Lukas Reschke
72dcf24061
Fix encoding in 3rdparty lib
2015-02-06 15:12:43 +01:00
LEDfan
dbf410fa0a
Fix wrong parameter order
2014-12-25 13:06:03 +01:00
LEDfan
5dab5fd68c
Use thumbnail cache instead of refreshing every time
2014-12-25 13:05:57 +01:00
LEDfan
2a794dfdc8
Merge pull request #739 from Gomez/stable7
...
Manual Backport of #710
2014-12-14 10:27:54 +01:00
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
jbtbnl
3664ccb597
Merge pull request #732 from zinks-/l10n-fr-backport
...
Patched french translation (backported from master)
2014-12-09 11:54:15 +01:00
Thomas Imbreckx
850d37c67d
Fixed new line error
2014-12-06 17:55:05 +01:00
Thomas Imbreckx
2809c2b30d
Patched french translation (backported from master)
2014-12-05 19:14:38 +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
jbtbnl
509b4223ce
Merge pull request #681 from dirdi/stable7
...
Use correct method to extract image from vcard
2014-10-22 10:51:59 +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
b1df56c875
customize search results
2014-10-01 18:08:24 +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
25571ee31a
Hopefully fixs travis build
2014-09-28 12:21:10 +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
2bf76c213c
Remove old properties from deleted contacts, which were already deleted but readded
2014-09-28 12:17:52 +02:00
LEDfan
3d4224a090
This should solve the 404 error
2014-09-28 12:17:46 +02:00
Nicolas Mora
15d3a0b2cc
Merge pull request #658 from owncloud/import-fixes-stable
...
Import fixes on stable branch
2014-09-22 12:23:05 -04: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
babelouest
b75dcb27f0
replace \:// with :// in the original vcard
2014-09-21 14:38:51 -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
Jan ten Bokkel
78460dd17d
Fixes contacts export function
2014-09-13 15:52:24 +02:00
Jan ten Bokkel
3a380f610a
Remove responsive CSS leftover and fix column selection based on screen
...
width
2014-09-13 15:52:10 +02:00
Jan ten Bokkel
db9de23e77
Fix header positioning. Make sort order reappear afder deselection.
2014-09-13 15:51:52 +02:00
Bernhard Reiter
d367cee448
Merge pull request #584 from owncloud/backport-fix-TagMgr-access
...
fix TagMgr access remove unwanted error_log
2014-08-19 14:19:32 +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
babelouest
bf56a8ded2
backport PR #507
2014-08-01 16:23:27 -04: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
Jan-Christoph Borchardt
23056e8c05
fix excessive overwrite of mobile sizes defined in core, fix #555
2014-07-30 15:11:18 +02:00
babelouest
eef0d2dd51
Change label when there is no contact
2014-07-30 15:09:03 +02:00
Thomas Müller
b8ad6889ed
return 'PHOTO' attribute on AddressbookProvider::search
2014-07-30 15:07:18 +02:00
Adam Williamson
f4e00e72e4
correct selection of current type for multi-type parameters: #536
...
This check was exactly the wrong way around, so the code to select
the appropriate type wouldn't run when it was actually needed.
2014-07-30 11:42:52 +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
Thomas Müller
07217e0ec4
adding php-lint
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
