rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-11 00:52:29 +01:00
Code Issues Releases Activity
3,557 Commits 18 Branches 95 Tags
Commit Graph

18 Commits

Author SHA1 Message Date
Vincent Petry
0b5fb1bfc7 Fix to make it compatible with Sabre 2.1 
Also fixed unit tests so they run but some still fail

- Added IUserSession mock
- Replaced OCP::getUser() with IUserSession usage to make the mock work
- Added base class for test cases
 2015-03-17 12:53:05 +01:00
David Prévot
8280042bfe Drop useless execution bits 2015-02-27 12:38:54 -04:00
babelouest
ea0f5119db improve import automatic selection 2015-01-29 09:42:22 -05: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
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
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 Posselt
7957769c59 fix php 4.3 2014-07-30 11:04:15 +02: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
babelouest
de4bb76c53 after a painful rebase 2014-05-09 14:30:14 -04:00
babelouest
f3272ad159 reimplemented import ui in a ocdialog 2014-05-07 16:54:58 -04:00
babelouest
d7f8b57025 added standard vcard connector 
cleaned code according to scrutinizer log
fixed import message on UI
 2014-03-21 01:59:19 -04:00
babelouest
919f540d01 Import from multiple formats 2014-03-11 16:43:32 +01:00
Nicolas Mora
fc09c31def use new backend prefs 2013-08-03 22:40:52 -04:00
Nicolas Mora
6367edf8b2 add connector 2013-06-02 15:52:46 -04:00
Nicolas Mora
7b75285d3b seperate find multiple cards and find one card 2013-06-02 15:00:40 -04:00
Thomas Tanghus
635a6e2825 Contacts: Added start on LDAP backend by @babelouest 2013-04-25 01:46:47 +02:00