Merge pull request #4712 from schnell18/feat/subpath

Refine subpath deployment support

Dockerfile

@@ -43,7 +43,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     ATTACHMENTS_UPLOAD_MAX_SIZE=0 \
     AVATARS_UPLOAD_EXTERNAL_PROGRAM="" \
     AVATARS_UPLOAD_MIME_TYPES="" \
-    AVATARS_UPLOAD_MAX_SIZE=0 \
+    AVATARS_UPLOAD_MAX_SIZE=72000 \
     RICHER_CARD_COMMENT_EDITOR=false \
     CARD_OPENED_WEBHOOK_ENABLED=false \
     MAX_IMAGE_PIXEL="" \

client/00-startup.js

@@ -1,6 +1,6 @@
 // PWA
 if ('serviceWorker' in navigator) {
   window.addEventListener('load', function() {
-    navigator.serviceWorker.register('/pwa-service-worker.js');
+    navigator.serviceWorker.register('./pwa-service-worker.js');
   });
 }

client/components/boards/boardsList.css

@@ -1,4 +1,4 @@
-@import url("/css/reset.css") print, screen;
+@import url("../../../css/reset.css") print, screen;
 
 .board-list {
   margin: 0 8px;

client/components/boards/boardsList.js

@@ -152,7 +152,8 @@ BlazeComponent.extendComponent({
       $and: [
         { archived: false },
         { type: { $in: ['board', 'template-container'] } },
-        { $or: [] }
+        { $or: [] },
+        { title: { $not: { $regex: /^\^.*\^$/ } } }
       ]
     };
 

client/components/cards/minicard.jade

@@ -10,7 +10,7 @@ template(name="minicard")
     else
       a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
     if cover
-      .minicard-cover(style="background-image: url('{{cover.link 'original' '/'}}?dummyReloadAfterSessionEstablished={{sess}}');")
+      .minicard-cover(style="background-image: url('{{cover.link 'original'}}?dummyReloadAfterSessionEstablished={{sess}}');")
     if labels
       .minicard-labels(class="{{#if hiddenMinicardLabelText}}minicard-labels-no-text{{/if}}")
         each labels

client/components/main/fonts.css

@@ -2,29 +2,29 @@
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
-  src: local('Roboto'), local('Roboto-Regular'), url("/fonts/roboto-regular.woff2") format('woff2'), url("/fonts/roboto-regular.woff") format('woff');
+  src: local('Roboto'), local('Roboto-Regular'), url("../../../roboto-regular.woff2") format('woff2'), url("../../../roboto-regular.woff") format('woff');
 }
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 700;
-  src: local('Roboto Bold'), local('Roboto-Bold'), url("/fonts/roboto-bold.woff2") format('woff2'), url("/fonts/roboto-bold.woff") format('woff');
+  src: local('Roboto Bold'), local('Roboto-Bold'), url("../../../roboto-bold.woff2") format('woff2'), url("../../../roboto-bold.woff") format('woff');
 }
 @font-face {
   font-family: 'Poppins';
   font-style: normal;
   font-weight: 400;
-  src: local('Poppins'), local('Poppins-Regular'), url("/fonts/poppins-regular.woff") format('woff');
+  src: local('Poppins'), local('Poppins-Regular'), url("../../../poppins-regular.woff") format('woff');
 }
 @font-face {
   font-family: 'Poppins';
   font-style: normal;
   font-weight: 500;
-  src: local('Poppins Medium'), local('Poppins-Medium'), url("/fonts/poppins-medium.woff") format('woff');
+  src: local('Poppins Medium'), local('Poppins-Medium'), url("../../../poppins-medium.woff") format('woff');
 }
 @font-face {
   font-family: 'Poppins';
   font-style: normal;
   font-weight: 700;
-  src: local('Poppins Bold'), local('Poppins-Bold'), url("/fonts/poppins-bold.woff") format('woff');
+  src: local('Poppins Bold'), local('Poppins-Bold'), url("../../../poppins-bold.woff") format('woff');
 }

client/components/main/layouts.jade

@@ -10,7 +10,7 @@ head
   link(rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png")
   link(rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png")
   link(rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png")
-  link(rel="manifest" href="/site.webmanifest")
+  // link(rel="manifest" href="/site.webmanifest")
   link(rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5")
   meta(name="apple-mobile-web-app-title" content="Wekan")
   meta(name="application-name" content="Wekan")

imports/i18n/data/zh-CN.i18n.json

@@ -693,10 +693,10 @@
     "active": "活跃",
     "card-received": "已接收",
     "card-received-on": "接收于",
-    "card-end": "终止",
-    "card-end-on": "终止于",
+    "card-end": "结束",
+    "card-end-on": "结束于",
     "editCardReceivedDatePopup-title": "修改接收日期",
-    "editCardEndDatePopup-title": "修改终止日期",
+    "editCardEndDatePopup-title": "修改结束日期",
     "setCardColorPopup-title": "设置颜色",
     "setCardActionsColorPopup-title": "选择一种颜色",
     "setSwimlaneColorPopup-title": "选择一种颜色",
@@ -1195,4 +1195,4 @@
     "register": "注册",
     "forgot-password": "忘记密码",
     "minicardDetailsActionsPopup-title": "卡片详情"
-}
+}

packages/wekan-accounts-cas/README.md

@@ -23,9 +23,11 @@ meteor add wekan:accounts-cas
 
 ## Usage
 
-Put CAS settings in Meteor.settings (for example using METEOR_SETTINGS env or --settings) like so:
+Put CAS settings in Meteor.settings (for example using METEOR_SETTINGS env or
+--settings) like so:
 
-If casVersion is not defined, it will assume you use CAS 1.0. (note by xaionaro: option `casVersion` seems to be just ignored in the code, ATM).
+If casVersion is not defined, it will assume you use CAS 1.0. (note by
+xaionaro: option `casVersion` seems to be just ignored in the code, ATM).
 
 Server side settings:
 
@@ -46,11 +48,17 @@ Meteor.settings = {
 CAS `attributes` settings :
 
 * `attributes`: by default `{}` : all default values below will apply
-* *  `debug` : by default `false` ; `true` will print to the server console the CAS attribute names to map, the CAS attributes values retrieved, if necessary the new user account created, and finally the user to use
-* *  `id` : by default, the CAS user is used for the user account, but you can specified another CAS attribute
-* *  `firstname` : by default `cas:givenName` ; but you can use your own CAS attribute
-* *  `lastname` : by default `cas:sn` (respectively) ; but you can use your own CAS attribute
-* *  `fullname` : by default unused, but if you specify your own CAS attribute, it will be used instead of the `firstname` + `lastname`
+* *  `debug` : by default `false` ; `true` will print to the server console the
+  CAS attribute names to map, the CAS attributes values retrieved, if necessary
+  the new user account created, and finally the user to use
+* *  `id` : by default, the CAS user is used for the user account, but you can
+  specified another CAS attribute
+* *  `firstname` : by default `cas:givenName` ; but you can use your own CAS
+  attribute
+* *  `lastname` : by default `cas:sn` (respectively) ; but you can use your own
+  CAS attribute
+* *  `fullname` : by default unused, but if you specify your own CAS attribute,
+  it will be used instead of the `firstname` + `lastname`
 * *  `mail` : by default `cas:mail`
 
 Client side settings:

server/header-login.js

@@ -1,10 +1,8 @@
 Meteor.startup(() => {
   if (process.env.HEADER_LOGIN_ID) {
-    Meteor.settings.public.headerLoginId = process.env.HEADER_LOGIN_ID;
-    Meteor.settings.public.headerLoginEmail = process.env.HEADER_LOGIN_EMAIL;
-    Meteor.settings.public.headerLoginFirstname =
-      process.env.HEADER_LOGIN_FIRSTNAME;
-    Meteor.settings.public.headerLoginLastname =
-      process.env.HEADER_LOGIN_LASTNAME;
+    Meteor.settings.public.headerLoginId        = process.env.HEADER_LOGIN_ID;
+    Meteor.settings.public.headerLoginEmail     = process.env.HEADER_LOGIN_EMAIL;
+    Meteor.settings.public.headerLoginFirstname = process.env.HEADER_LOGIN_FIRSTNAME;
+    Meteor.settings.public.headerLoginLastname  = process.env.HEADER_LOGIN_LASTNAME;
   }
 });