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

3629 Commits

Author SHA1 Message Date
Thomas Müller
1e9a7c161e Merge pull request #749 from owncloud/use-di
Use DI for principal backend
2015-01-05 20:08:57 +01:00
Jenkins for ownCloud
29dd4f6577 [tx-robot] updated from transifex 2015-01-05 00:48:22 -05:00
Jenkins for ownCloud
84346d545f [tx-robot] updated from transifex 2015-01-04 00:48:21 -05:00
Jenkins for ownCloud
2b2ec44da0 [tx-robot] updated from transifex 2015-01-03 00:48:22 -05:00
Jenkins for ownCloud
75f6ca69f7 [tx-robot] updated from transifex 2015-01-02 00:48:22 -05:00
jbtbnl
5b5baccaf9 Merge pull request #735 from owncloud/import-different-addressbooks
fix bug #488
2015-01-01 15:30:04 +01:00
Jenkins for ownCloud
fa16ab1e1c [tx-robot] updated from transifex 2015-01-01 00:48:30 -05:00
Jenkins for ownCloud
5c89355836 [tx-robot] updated from transifex 2014-12-31 00:48:25 -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
Jenkins for ownCloud
bdffe22525 [tx-robot] updated from transifex 2014-12-24 00:48:21 -05: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
Morris Jobke
fd41a737bb Merge pull request #746 from owncloud/update_info
search changes require oc 8
2014-12-20 11:52:55 +01:00
LEDfan
f322defadf Use thumbnail cache instead of refreshing every time 2014-12-20 11:16:40 +01:00
LEDfan
023ba4b1de Merge pull request #738 from owncloud/share_backend_update
in oc8 or later share_backend need to implement isShareTypeAllowed()
2014-12-20 10:17:34 +01:00
Jenkins for ownCloud
5c3a48b7b9 [tx-robot] updated from transifex 2014-12-20 00:48:21 -05:00
Lukas Reschke
a4e03516d6 Use DI for principal backend
Required for owncloud/core#12960
2014-12-19 16:54:14 +01:00
Jörn Friedrich Dreyer
43bdefc1c0 search changes require oc 8 2014-12-19 11:25:33 +01:00
Morris Jobke
fe38635a6c placeholder are now escaped in core 2014-12-18 14:46:52 +01:00
jbtbnl
85a766b960 Merge pull request #725 from owncloud/app_specific_search
make search results app specific
2014-12-15 17:45:04 +01:00
Bjoern Schiessle
c5555e89c5 in oc8 or later share_backend need to implement isShareTypeAllowed() 2014-12-10 15:43:17 +01:00
Jenkins for ownCloud
511ac3d735 [tx-robot] updated from transifex 2014-12-10 00:48:40 -05:00
jbtbnl
f167153e9b Merge pull request #733 from owncloud/colon_space
fix bug with colon and space in vcard import
2014-12-09 15:46:11 +01:00
babelouest
713ad24d67 fix bug #488 2014-12-08 15:56:12 -05:00
Jenkins for ownCloud
a2fa3ddeb0 [tx-robot] updated from transifex 2014-12-08 00:48:22 -05: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
jbtbnl
ec065cc8ab Merge pull request #729 from owncloud/use_correct_combobox
Use correct combobox
2014-12-05 11:01:44 +01:00
LEDfan
67281815b8 Remove uneeded files and lines 2014-12-05 08:28:40 +01:00
LEDfan
be111f3cab Use correct combobox 2014-12-05 08:28:18 +01:00
LEDfan
0c136bcb2a Merge pull request #650 from ymv/fix-prefered
Show preferred value in contacts list
2014-12-05 07:54:25 +01:00
LEDfan
e40104f6e1 Merge pull request #578 from owncloud/fix-search-master
adding first unit test for search of address book provider
2014-12-05 07:47:07 +01: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
Jenkins for ownCloud
8024bdd177 [tx-robot] updated from transifex 2014-12-05 00:48:22 -05:00
Jenkins for ownCloud
101f035315 [tx-robot] updated from transifex 2014-12-04 00:48:22 -05:00
Jörn Friedrich Dreyer
aed04416cb make search results app specific 2014-12-02 17:42:54 +01:00
ionum
15d2d74246 extend func getIDFromUri
uri is no unique value; only combination of uri and addressbookid is unique
2014-12-01 13:16:52 +01:00
jbtbnl
9862f45652 Merge pull request #720 from owncloud/drop-oc_preferences
migrate from OC_Preferences to DI config object
2014-12-01 11:19:16 +01:00
Jenkins for ownCloud
a2d23c0d89 [tx-robot] updated from transifex 2014-11-29 00:48:23 -05:00
Morris Jobke
f6ac4ea683 migrate from OC_Preferences to DI config object 2014-11-28 16:51:10 +01:00
Jenkins for ownCloud
eb79b4ddce [tx-robot] updated from transifex 2014-11-28 00:48:22 -05:00
Jenkins for ownCloud
da3c58d554 [tx-robot] updated from transifex 2014-11-27 00:48:35 -05:00
jbtbnl
63a9a50c45 Merge pull request #718 from owncloud/fix-session
migrate OC::session to OC::server->getSession
2014-11-26 11:20:50 +01:00
Morris Jobke
550b8f125c migrate OC::session to OC::server->getSession 2014-11-26 09:29:05 +01:00