Skip to content

Commit 22c47f3

Browse files
author
Christian Putzke
committed
Merge branch 'development'
2 parents 4a20228 + 041af95 commit 22c47f3

21 files changed

+1078
-509
lines changed

‎CHANGELOG

+67-56
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,78 @@
1-
v0.3.1 to v0.4
2-
- added add-functionality for CardDAV-Contacts
3-
- added vCard import-functionality for CardDAV-Addressbooks
4-
- license change from LGPLv2 to AGPLv3
5-
- CardDAV-Backend class update to v0.4.9
6-
- added logging
7-
- each CardDAV-Server is now an own addressbook not a group of a global CardDAV-Addressbook like before
8-
- minor bugfixes
9-
- improved synchronization
1+
Changes from v0.4 to v0.5
2+
- Added automaticly synchronized CardDAV contacts via cronjob
3+
- Added larry skin support
4+
- Added list of CardDAV server URLs
5+
- Added read only option for CardDAV servers
6+
- Added SOGo support
7+
- Added package.xml
8+
- Major standard skin UI improvements
9+
- CardDAV backend class update to v0.5.1
10+
- Minor comment, phpdoc and documentation changes
1011

11-
v0.3 to v0.3.1
12-
- bugfix: didn't merged vCards on edit correctly
12+
Changes from v0.3.1 to v0.4
13+
- Added add functionality for CardDAV contacts
14+
- Added vCard import functionality for CardDAV addressbooks
15+
- License change from LGPLv2 to AGPLv3
16+
- CardDAV backend class update to v0.4.9
17+
- Added logging functionality
18+
- Each CardDAV server is now an own addressbook not a group of a global CardDAV addressbook like before
19+
- Minor bugfixes
20+
- Improved synchronization
1321

14-
changes from v0.2.5 to v0.3
15-
- added edit and delete functionality for CardDAV-Contacts
16-
- added sabreDAV support
17-
- added ownCloud support
18-
- CardDAV-Backend class update to v0.4.6
19-
- restructured and cleaned carddav_addressbook class (not completly done yet)
20-
- minor improvements (CURL install check, usability improvements, sync don't add empty vcards now, ...)
21-
- added IT and FR language files
22+
Changes from v0.3 to v0.3.1
23+
- Bugfix: didn't merged vCards on edit correctly
2224

23-
changes from v0.2.4 to v0.2.5
24-
- bugfix: email and name can now be null
25-
- ajax POST contents are now base64 encoded
26-
- username and password can now be empty
27-
- minor localization changes
25+
Changes from v0.2.5 to v0.3
26+
- Added edit and delete functionality for CardDAV contacts
27+
- Added sabreDAV support
28+
- Added ownCloud support
29+
- CardDAV backend class update to v0.4.6
30+
- Restructured and cleaned carddav_addressbook class (not completly done yet)
31+
- Minor improvements (CURL install check, usability improvements, sync don't add empty vCards now, ...)
32+
- Added IT and FR language files
2833

29-
changes from v0.2.3 to v0.2.4
30-
- bugfix: last_modified date is now STRING instead of INT
31-
- CardDAV-Backend class update to v0.4.2
34+
Changes from v0.2.4 to v0.2.5
35+
- Bugfix: email and name can now be null
36+
- Ajax POST contents are now base64 encoded
37+
- Username and password can now be empty
38+
- Minor localization changes
3239

33-
changes from v0.2.2 to v0.2.3
34-
- added memotoo support
40+
Changes from v0.2.3 to v0.2.4
41+
- Bugfix: last_modified date is now STRING instead of INT
42+
- CardDAV backend class update to v0.4.2
43+
44+
Changes from v0.2.2 to v0.2.3
45+
- Added memotoo support
3546
- CardDAV-Backend class update to v0.4.1
36-
- added addressbook search functionality
37-
- changed version naming
38-
- carddav_addressbook class restructured
47+
- Added addressbook search functionality
48+
- Changed version naming
49+
- Restructured carddav_addressbook class
3950

40-
changes from 0.2.1 to 0.2.2
41-
- CardDAV-Backend class update to v0.4
42-
- added apple addressbook server support
51+
Changes from 0.2.1 to 0.2.2
52+
- CardDAV backend class update to v0.4
53+
- Added apple addressbook server support
4354

44-
changes from 0.2 to 0.2.1
45-
- show CardDAV-Contacts list (addressbook pagination) bugfix
46-
- autocomplete CardDAV-Contacts groups bugfix
47-
- CardDAV-Groups will now be displayed correctly in the CardDAV-Contact detail view
48-
- hide CardDAV-Contacts sync button if no CardDAV-Servers were added
49-
- fallback skin path added "skins/default"
50-
- minor localization changes
55+
Changes from 0.2 to 0.2.1
56+
- Show CardDAV contacts list (addressbook pagination) bugfix
57+
- Autocomplete CardDAV contacts groups bugfix
58+
- CardDAV groups will now be displayed correctly in the CardDAV contact detail view
59+
- Hide CardDAV contacts sync button if no CardDAV servers were added
60+
- Fallback skin path added "skins/default"
61+
- Minor localization changes
5162

52-
changes from 0.1 to 0.2
53-
- save / delete CardDAV-Server settings via ajax
54-
- minor class structure changes
55-
- minor localization changes
56-
- minor database changes
57-
- initial CardDAV-Contacts sync
58-
- addressbook integration (read only)
59-
- manuel CardDAV-Contacts sync (read only)
60-
- CardDAV-Backend class update to v0.3.4
61-
- autocomplete CardDAV-Contacts
63+
Changes from 0.1 to 0.2
64+
- Save / delete CardDAV server settings via ajax
65+
- Minor class structure changes
66+
- Minor localization changes
67+
- Minor database changes
68+
- Initial CardDAV contacts sync
69+
- Addressbook integration (read only)
70+
- Manuel CardDAV contacts sync (read only)
71+
- CardDAV backend class update to v0.3.4
72+
- Autocomplete CardDAV contacts
6273

6374
release 0.1
64-
- save / delete CardDAV-Server settings
65-
- realtime CardDAV-Server check
66-
- multiple CardDAV-Server for each user
67-
- English and German localization
75+
- Save / delete CardDAV server settings
76+
- Realtime CardDAV server check
77+
- Multiple CardDAV server for each user
78+
- English and German localization

‎README

+28-18
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,56 @@
11
Description
22
-----------
3-
This is a CardDAV-Implementation for roundcube 0.6 or higher
3+
This is a CardDAV-Implementation for roundcube 0.6 or higher.
44

55

66
Features
77
--------
8-
* add multiple CardDAV-Server for each user
9-
* CardDAV-Contacts are stored in the local database which provides great performance
10-
* tested CardDAV-Servers: davical, apple addressbook server, meetoo, sabreDAV, owncloud
11-
* read / add / delete / edit CardDAV-Contacts
12-
* autocomplete all CardDAV-Contacts within the compose email view
13-
* search for all CardDAV-Contacts within the addressbook
8+
* Add multiple CardDAV server for each user
9+
* CardDAV contacts are stored in the local database which provides great performance
10+
* Tested CardDAV servers: DAViCal, Apple Addressbook Server, meetoo, SabreDAV, ownCloud, SOGo
11+
* You can read / add / delete / edit CardDAV contacts (vCards)
12+
* Autocomplete all CardDAV contacts within the compose email view
13+
* Search for all CardDAV contacts within the addressbook
14+
* Automaticly synchronized CardDAV contacts (just execute /plugins/carddav/cronjob/synchronize.php within the crontab)
1415

1516

16-
Planned Features
17+
Planned features
1718
----------------
18-
* automaticly synchronized CardDAV-Contacts
19-
* improved search for CardDAV-Contacts within the addressbook
19+
* Improved search for CardDAV contacts within the addressbook
2020

2121

2222
Requirements
2323
------------
24-
* SQL-Database
24+
* SQL database
2525
* CURL
2626

2727

2828
Installation
2929
------------
30-
* execute SQL-Statements from /plugins/carddav/SQL/mysql.sql
31-
* add 'carddav' to the plugins-array in /config/main.inc.php
32-
* copy /plugins/carddav/config.inc.php.dist to /plugins/carddav/config.inc.php
33-
* login into your roundcube webmail and add your CardDAV-Server in the settings
30+
* Execute SQL statements from /plugins/carddav/SQL/mysql.sql
31+
* Add 'carddav' to the plugins array in /config/main.inc.php
32+
* Copy /plugins/carddav/config.inc.php.dist to /plugins/carddav/config.inc.php
33+
* Login into your roundcube webmail and add your CardDAV server in the settings
3434

3535

3636
Update
3737
------
38-
* execute new SQL-Statements from /plugins/carddav/SQL/mysql.update.sql
38+
* Execute new SQL statements from /plugins/carddav/SQL/mysql.update.sql
39+
40+
41+
CardDAV server list
42+
-------------------
43+
* DAViCal: https://example.com/{resource|principal|username}/{collection}/
44+
* Apple Addressbook Server: https://example.com/addressbooks/users/{resource|principal|username}/{collection}/
45+
* memotoo: https://sync.memotoo.com/cardDAV/
46+
* SabreDAV: https://example.com/addressbooks/{resource|principal|username}/{collection}/
47+
* ownCloud: https://example.com/apps/contacts/carddav.php/addressbooks/{resource|principal|username}/{collection}/
48+
* SOGo: https://example.com/SOGo/dav/{resource|principal|username}/Contacts/{collection}/
3949

4050

4151
Contact
4252
-------
4353
* Author: Christian Putzke <[email protected]>
44-
* Report feature requests and bugs here: https://github.com/graviox/CardDAV-PHP/issues
54+
* Report feature requests and bugs here: https://github.com/graviox/Roundcube-CardDAV/issues
4555
* Visit Graviox Studios: http://www.graviox.de/
46-
* Follow me on Twitter: http://twitter.com/graviox
56+
* Follow me on Twitter: https://twitter.com/graviox/

‎SQL/mysql.sql

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS `carddav_server` (
2323
`username` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
2424
`password` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
2525
`label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
26+
`read_only` tinyint(1) NOT NULL,
2627
PRIMARY KEY (`carddav_server_id`),
2728
KEY `user_id` (`user_id`)
2829
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;

‎SQL/mysql.update.sql

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ CHANGE `email` `email` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci
1111
// updates from version 0.3
1212
ALTER TABLE `carddav_contacts` ADD `words` TEXT NULL DEFAULT NULL AFTER `vcard` ,
1313
ADD `firstname` VARCHAR( 128 ) NULL DEFAULT NULL AFTER `words` ,
14-
ADD `surname` VARCHAR( 128 ) NULL DEFAULT NULL AFTER `firstname` ;
14+
ADD `surname` VARCHAR( 128 ) NULL DEFAULT NULL AFTER `firstname` ;
15+
16+
// updates from version 0.5
17+
ALTER TABLE `carddav_server` ADD `read_only` tinyint(1) NOT NULL AFTER `label`;

0 commit comments

Comments
 (0)