Merge branch 'master' into 77/dev/beta_1.0/docker

install/requirements.txt

@@ -51,7 +51,7 @@ tgapp-resetpassword==0.1.8
 tgext.admin==0.6.4
 tgext.asyncjob==0.3.1
 tgext.crud==0.7.3
-tgext.pluggable==0.5.5
+tgext.pluggable==0.6.2
 transaction==1.4.4
 tw2.core==2.2.2
 tw2.forms==2.2.2.1

tracim/tracim/public/_caldavzap/resource.js

@@ -503,8 +503,8 @@ function ResourceCalDAVList()
     }).done(function (data) {
       var currentICS = parseInt(inputResource.displayvalue.replace('.ics', ''))
 
-      var regExpUser = new RegExp('\/cal\/user\/')
-      var regExpWorkspace = new RegExp('\/cal\/workspace\/')
+      var regExpUser = new RegExp('\/user\/')
+      var regExpWorkspace = new RegExp('\/workspace\/')
 
       var user_or_workspace