Merge pull request #334 from kosssi/master

Upgrade dependencies

.gitignore

@@ -13,3 +13,5 @@ src/node_modules
 /fastlane/Error*.png
 /fastlane/Preview.html
 build
+res/drawable*
+res/mipmap*

config.xml

@@ -67,16 +67,16 @@
  </feature>
  <access origin="*" />
  <allow-intent href="mailto:*" />
- <engine name="android" spec="https://github.com/cozy/cordova-android" />
- <engine name="ios" spec="4.2.1" />
+ <engine name="android" spec="6.0.0" />
+ <engine name="ios" spec="4.3.0" />
  <plugin name="cordova-plugin-battery-status" spec="1.1.2" />
  <plugin name="cordova-plugin-blob-constructor-polyfill" spec="1.0.2" />
  <plugin name="cordova-plugin-device" spec="1.1.3" />
  <plugin name="cordova-plugin-dialogs" spec="1.3.0" />
  <plugin name="cordova-plugin-file" spec="4.3.0" />
  <plugin name="cordova-plugin-file-opener2" spec="https://github.com/kosssi/cordova-plugin-file-opener2" />
  <plugin name="cordova-plugin-file-transfer" spec="1.6.0" />
- <plugin name="cordova-plugin-globalization" spec="https://github.com/StyrLabs/cordova-plugin-globalization.git" />
+ <plugin name="cordova-plugin-globalization" spec="https://github.com/cozy/cordova-plugin-globalization" />
  <plugin name="cordova-plugin-inappbrowser" spec="1.5.0" />
  <plugin name="cordova-plugin-network-information" spec="1.3.0" />
  <plugin name="cordova-plugin-splashscreen" spec="https://github.com/cozy/cordova-plugin-splashscreen" />
@@ -85,7 +85,7 @@
  <plugin name="cordova-sqlite-storage" spec="1.4.7" />
  <plugin name="de.appplant.cordova.plugin.local-notification" spec="0.8.4" />
  <plugin name="io.cozy.calendarsync" spec="https://github.com/cozy/cordova-plugin-calendarsync#v1.0.1" />
- <plugin name="io.cozy.contacts" spec="https://github.com/cozy/cordova-plugin-contacts#c1.0.5" />
+ <plugin name="io.cozy.contacts" spec="https://github.com/cozy/cordova-plugin-contacts#c1.0.6" />
  <plugin name="io.cozy.cordova-images-browser" spec="https://github.com/cozy/cordova-images-browser#v1.0.2" />
  <plugin name="io.cozy.jsbackgroundservice" spec="https://github.com/cozy/cordova-jsbackgroundservice#v1.1.5" />
  <plugin name="io.cozy.jsbgservice-newpicture" spec="https://github.com/cozy/cordova-jsbgservice-newpicture#v1.0.0" />

src/app/lib/mimetype.coffee

@@ -26,30 +26,30 @@ module.exports =
  'image/bmp'
  # pdf
  'application/pdf'
- # audio
- 'audio/aac'
- 'audio/mp4'
- 'audio/mpeg'
- 'audio/ogg'
- 'audio/wav'
- 'audio/x-wav'
- 'audio/webm'
- # video
- 'video/mp4'
- 'video/ogg'
- 'video/webm'
- 'video/mpeg'
- 'video/x-m4v'
- # document
- 'application/vnd.oasis.opendocument.text',
- 'application/vnd.oasis.opendocument.text-flat-xml',
- 'application/vnd.oasis.opendocument.text-template',
- 'application/vnd.oasis.opendocument.presentation',
- 'application/vnd.oasis.opendocument.presentation-flat-xml',
- 'application/vnd.oasis.opendocument.presentation-template',
- 'application/vnd.oasis.opendocument.spreadsheet',
- 'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
- 'application/vnd.oasis.opendocument.spreadsheet-template'
+# # audio
+# 'audio/aac'
+# 'audio/mp4'
+# 'audio/mpeg'
+# 'audio/ogg'
+# 'audio/wav'
+# 'audio/x-wav'
+# 'audio/webm'
+# # video
+# 'video/mp4'
+# 'video/ogg'
+# 'video/webm'
+# 'video/mpeg'
+# 'video/x-m4v'
+# # document
+# 'application/vnd.oasis.opendocument.text',
+# 'application/vnd.oasis.opendocument.text-flat-xml',
+# 'application/vnd.oasis.opendocument.text-template',
+# 'application/vnd.oasis.opendocument.presentation',
+# 'application/vnd.oasis.opendocument.presentation-flat-xml',
+# 'application/vnd.oasis.opendocument.presentation-template',
+# 'application/vnd.oasis.opendocument.spreadsheet',
+# 'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
+# 'application/vnd.oasis.opendocument.spreadsheet-template'
  ]
 
  cozyFile.mime in mimetypesCompatible

src/app/locales/de.json

@@ -140,9 +140,9 @@
  "config_loading_contacts": "Lade Kontakte.",
  "config_log_send": "Protokoll senden",
  "config_log_share": "Protokoll freigeben",
- "modal_action_file_download": "Make available offline",
- "modal_action_file_display_in": "Display",
- "modal_action_file_display_out": "Open with ...",
- "modal_action_file_remove_device": "Remove offline",
+ "modal_action_file_download": "Offline verfügbar machen",
+ "modal_action_file_display_in": "Anzeigen",
+ "modal_action_file_display_out": "Öffnen mit ...",
+ "modal_action_file_remove_device": "Offlinedaten löschen",
  "Unexpected token <": "Prüfe, ob dein Cozy richtig funktioniert."
 }

src/app/locales/es.json

@@ -139,10 +139,10 @@
  "config_loading_calendars": "Cargando agendas.",
  "config_loading_contacts": "Cargando contactos.",
  "config_log_send": "Enviar Log",
- "config_log_share": "Share logs",
- "modal_action_file_download": "Make available offline",
- "modal_action_file_display_in": "Display",
- "modal_action_file_display_out": "Open with ...",
- "modal_action_file_remove_device": "Remove offline",
+ "config_log_share": "Compartir logs",
+ "modal_action_file_download": "Hacer accesible cuando esté desconectado",
+ "modal_action_file_display_in": "Visualizar",
+ "modal_action_file_display_out": "Abrir con ...",
+ "modal_action_file_remove_device": "Remover cuando esté desconectado",
  "Unexpected token <": "Chequear que su cozy trabaja adecuadamente."
 }

src/app/replicator/change/change_event_handler.coffee

@@ -23,7 +23,7 @@ module.exports = class ChangeEventHandler
  @permission = new Permission()
  unless @timezone
  @timezone = 'Europe/Paris'
- successCB = (date) => @timezone = date.timezone
+ successCB = (date) => @timezone = date.iana_timezone
  errorCB = -> log.warn 'Error getting timezone'
  navigator.globalization.getDatePattern successCB, errorCB
 

src/package.json

@@ -30,8 +30,8 @@
  "jquery": "1.9.1",
  "material-design-icons": "3.0.1",
  "materialize-css": "https://github.com/cozy/materialize.git",
- "moment": "2.15.1",
- "moment-timezone": "0.5.6",
+ "moment": "2.15.2",
+ "moment-timezone": "0.5.7",
  "node-polyglot": "2.0.0",
  "node-viewerjs": "https://github.com/cozy/ViewerJS.git",
  "path-browser": "2.2.1",
@@ -50,7 +50,7 @@
  "coffee-script": "1.11.1",
  "coffee-script-brunch": "1.8.3",
  "coffeelint": "1.16.0",
- "cordova": "6.3.1",
+ "cordova": "6.4.0",
  "css-brunch": "1.7.0",
  "istanbul": "0.4.5",
  "jade-brunch": "1.8.2",