Merge pull request #13 from WLAN-Kabel/development

Development

.npmignore

@@ -30,4 +30,10 @@ maintenance/**
 
 
 www_old/
-tsconfig.json
+tsconfig.json
+
+main.test.js
+admin/admin.d.ts
+.github
+
+lib/adapter-config.d.ts

.travis.yml

@@ -17,6 +17,11 @@ before_script:
   - npm install winston@3.2.1
   - 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
   - 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./cc-test-reporter before-build; fi'
+script:
+  - npm run test:package
+  - npm run test:unit
+  - export DEBUG=testing:*
+  - npm run test:integration
 after_success:
   - sed -i "s|tmp/node_modules/iobroker.calendar/||" ./coverage/lcov.info
   - 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT -r 3623f3070bd9cae772a6757bdb0bcac4f8c2ebfbdebbe8e577bea9275810950d; fi'
@@ -27,4 +32,4 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - g++-6
+      - g++-6

README.md

@@ -53,14 +53,24 @@ Create the client id and copy the displayed client ID and the client secret.
 
 Go to the adapter config an add the client ID and the client secret.
 
-## Caldav Calendar (Tested with Nextcloud)
+## Caldav Calendar (Tested with Nextcloud, Web.de and Mail.de)
 
-You can add yout caldav calendar in the adapter config.
+You can add your caldav calendar in the adapter config.
 
 Enter your access data and the host name in the config.
 
+## iCal File Calendar
+
+You can add your ical calendar in the adapter config.
+
+Enter the file path on the CalDav tab in the hostname field.
+
 ## Changelog
 
+### 1.1.0 (2020-02-05)
+* (WLAN-Kabel) Caldav support expanded
+* (WLAN-Kabel) iCal file support added
+
 ### 1.0.1 (2020-01-11)
 * (WLAN-Kabel) Missing dependency added
 

io-package.json

@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "calendar",
-        "version": "1.0.1",
+        "version": "1.1.0",
         "news": {
+            "1.1.0": {
+                "en": "Caldav support expanded\niCal file support added",
+                "de": "Die Unterstützung von Caldav wurde erweitert\nUnterstützung für iCal-Dateien hinzugefügt",
+                "ru": "Поддержка Caldav расширена\nдобавлена поддержка файлов iCal",
+                "pt": "Suporte Caldav expandido\nSuporte ao arquivo iCal adicionado",
+                "nl": "Caldav-ondersteuning uitgebreid\nOndersteuning voor iCal-bestanden toegevoegd",
+                "fr": "Prise en charge de Caldav étendue\nAjout de la prise en charge des fichiers iCal",
+                "it": "Supporto Caldav ampliato\nAggiunto supporto file iCal",
+                "es": "Soporte Caldav expandido\nSoporte de archivos iCal agregado",
+                "pl": "Obsługa Caldav została rozszerzona\nDodano obsługę plików iCal",
+                "zh-cn": "卡尔达夫支持扩大\n添加了iCal文件支持"
+            },
             "1.0.1": {
                 "en": "Missing dependency added",
                 "de": "Fehlende Abhängigkeit hinzugefügt",
@@ -114,6 +126,8 @@
         "type": "date-and-time",
         "compact": true,
         "materialize": true,
+        "connectionType": "cloud",
+        "dataSource": "poll",
         "dependencies": [
             {
                 "js-controller": ">=1.4.2"