update chapril banner to v2

hardcode default dlimits to 100
add expiration time 2 days
2023-04-03 22:05:47 +02:00 · 2023-04-03 22:05:27 +02:00 · 2023-04-03 22:04:37 +02:00 · 2023-04-03 22:04:37 +02:00 · 2023-04-03 22:04:37 +02:00 · 2023-04-03 22:04:37 +02:00
49 changed files with 30586 additions and 10741 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,105 +1,72 @@
-image: "node:15-slim"

 stages:
  - test
-  - artifact
  - release

-before_script:
-  # Install dependencies
-  - apt-get update
-  - apt-get install -y git python3 build-essential libxtst6
-
-  # Prepare Chrome for puppeteer
-  - apt-get install -y wget gnupg
-  - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-  - sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-  - apt-get update
-  - apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
-
 # Build Send, run npm tests
 test:
  stage: test
+  image: "node:16-slim"
+  only:
+    - api
+    - branches
+    - chat
+    - merge_requests
+    - pushes
+    - schedules
+    - tags
+    - triggers
+    - web
+  before_script:
+    # Install dependencies
+    - apt-get update
+    - apt-get install -y git python3 build-essential libxtst6
+
+    # Prepare Chrome for puppeteer
+    - apt-get install -y wget gnupg
+    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+    - sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - apt-get update
+    - apt-get install -y gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils
+    - apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 --no-install-recommends
  script:
    - npm ci
    - npm run lint
    - npm test

-# Build Docker image, export Docker image artifact
-artifact-docker:
-  stage: artifact
-  image: docker:latest
-  needs: []
-  services:
-    - docker:dind
-  variables:
-    IMG_FILE: "send:git-$CI_COMMIT_SHORT_SHA.tar"
-    IMG_NAME: "send:git-$CI_COMMIT_SHORT_SHA"
-  before_script: []
-  script:
-    - docker build -t $IMG_NAME .
-    - docker image save -o $IMG_FILE $IMG_NAME
-  artifacts:
-    name: artifact-docker
-    paths:
-      - $IMG_FILE
-    expire_in: 1 week
-
-# Release public Docker image for the master branch
-release-docker-master:
-  stage: release
-  image: docker:latest
-  dependencies:
-    - artifact-docker
-  services:
-    - docker:dind
-  only:
-    - master
-  variables:
-    IMG_IMPORT_FILE: "send:git-$CI_COMMIT_SHORT_SHA.tar"
-    IMG_IMPORT_NAME: "send:git-$CI_COMMIT_SHORT_SHA"
-    IMG_NAME: "registry.gitlab.com/timvisee/send:master-$CI_COMMIT_SHORT_SHA"
-  before_script: []
-  script:
-    # Login in to registry
-    - 'docker login registry.gitlab.com -u $DOCKER_USER -p $DOCKER_PASS'
-
-    # Load existing, retag for new image images
-    - docker image load -i $IMG_IMPORT_FILE
-    - docker tag $IMG_IMPORT_NAME $IMG_NAME
-
-    # Publish tagged image
-    - docker push $IMG_NAME
-
-    - 'echo "Docker image artifact published, available as:" && echo "  docker pull $IMG_NAME"'
-
-# Release public Docker image for a version tag
 release-docker:
  stage: release
  image: docker:latest
-  dependencies:
-    - artifact-docker
  services:
    - docker:dind
  only:
-    - /^v(\d+\.)*\d+$/
-  variables:
-    IMG_IMPORT_FILE: "send:git-$CI_COMMIT_SHORT_SHA.tar"
-    IMG_IMPORT_NAME: "send:git-$CI_COMMIT_SHORT_SHA"
-    IMG_NAME: "registry.gitlab.com/timvisee/send:$CI_COMMIT_REF_NAME"
-    IMG_NAME_LATEST: "registry.gitlab.com/timvisee/send:latest"
-  before_script: []
+    - api
+    - branches
+    - chat
+    - merge_requests
+    - pushes
+    - schedules
+    - tags
+    - triggers
+    - web
  script:
-    # Login in to registry
-    - 'docker login registry.gitlab.com -u $DOCKER_USER -p $DOCKER_PASS'
-
-    # Load existing, retag for new image images
-    - docker image load -i $IMG_IMPORT_FILE
-    - docker tag $IMG_IMPORT_NAME $IMG_NAME
-    - docker tag $IMG_IMPORT_NAME $IMG_NAME_LATEST
-
-    # Publish tagged image
-    - docker push $IMG_NAME
-    - docker push $IMG_NAME_LATEST
-
-    - 'echo "Docker image artifact published, available as:" && echo "  docker pull $IMG_NAME_LATEST" && echo "  docker pull $IMG_NAME"'
+    - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
+    - docker build -t send .
+    - |
+      if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
+        IMAGE_NAMES="$CI_REGISTRY_IMAGE/mr:$CI_MERGE_REQUEST_IID"
+      elif [ "$CI_COMMIT_TAG" != "" ]; then
+        IMAGE_NAMES="$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG $CI_REGISTRY_IMAGE:latest"
+      else
+        IMAGE_NAMES="$CI_REGISTRY_IMAGE/$CI_COMMIT_BRANCH:$CI_COMMIT_SHORT_SHA"
+      fi
+    - |
+      for image in $IMAGE_NAMES; do
+        docker tag send $image
+        docker push $image
+      done
+    - |
+      echo "Container image pushed. You can pull it with";
+      for image in $IMAGE_NAMES; do
+        echo "docker pull $image"
+      done
--- a/.stylelintrc
+++ b/.stylelintrc
@ -11,3 +11,5 @@ rules:
  selector-list-comma-newline-after: null
  value-list-comma-newline-after: null
  at-rule-no-unknown: null
+  # Conflicts with prettier
+  string-quotes: null
--- a/README.md
+++ b/README.md
@ -152,7 +152,7 @@ AWS example using Ubuntu Server `20.04`: [docs/AWS.md](docs/AWS.md)
 - Web: _this repository_
 - Command-line: [`ffsend`](https://github.com/timvisee/ffsend)
 - Android: _see [Android](#android) section_
- Thunderbird: [FileLink provider for Send](https://addons.thunderbird.net/en-US/thunderbird/addon/filelink-provider-for-send/)
+- Thunderbird: [FileLink provider for Send](https://addons.thunderbird.net/thunderbird/addon/filelink-provider-for-send/)

 #### Android

--- a/app/archive.js
+++ b/app/archive.js
@ -17,6 +17,7 @@ export default class Archive {
  constructor(files = [], defaultTimeLimit = 86400, defaultDownloadLimit = 1) {
    this.files = Array.from(files);
    this.defaultTimeLimit = defaultTimeLimit;
+    this.defaultDownloadLimit = defaultDownloadLimit;
    this.timeLimit = defaultTimeLimit;
    this.dlimit = defaultDownloadLimit;
    this.password = null;
@ -76,7 +77,7 @@ export default class Archive {

  clear() {
    this.files = [];
-    this.dlimit = 1;
+    this.dlimit = 100;
    this.timeLimit = this.defaultTimeLimit;
    this.password = null;
  }
--- a/app/experiments.js
+++ b/app/experiments.js
@ -7,7 +7,7 @@ const experiments = {
      return true;
    },
    variant: function() {
-      return ['white-blue', 'blue', 'white-violet', 'violet'][
+      return ['white-primary', 'primary', 'white-violet', 'violet'][
        Math.floor(Math.random() * 4)
      ];
    },
--- a/app/locale.js
+++ b/app/locale.js
@ -1,8 +1,8 @@
-import { FluentBundle } from '@fluent/bundle';
+import { FluentBundle, FluentResource } from '@fluent/bundle';

 function makeBundle(locale, ftl) {
  const bundle = new FluentBundle(locale, { useIsolating: false });
-  bundle.addMessages(ftl);
+  bundle.addResource(new FluentResource(ftl));
  return bundle;
 }

@ -19,7 +19,7 @@ export async function getTranslator(locale) {
  return function(id, data) {
    for (let bundle of bundles) {
      if (bundle.hasMessage(id)) {
-        return bundle.format(bundle.getMessage(id), data);
+        return bundle.formatPattern(bundle.getMessage(id).value, data);
      }
    }
  };
--- a/app/main.css
+++ b/app/main.css
@ -7,17 +7,14 @@ html {
@tailwind components;

 :not(input) {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
  user-select: none;
 }

 :root {
  --violet-gradient: linear-gradient(
    -180deg,
-    rgba(144, 89, 255, 0.8) 0%,
-    rgba(144, 89, 255, 0.4) 100%
+    rgb(144 89 255 / 80%) 0%,
+    rgb(144 89 255 / 40%) 100%
  );
 }

@ -39,7 +36,7 @@ body {
 }

 .btn {
-  @apply bg-blue-60;
+  @apply bg-primary;
  @apply text-white;
  @apply cursor-pointer;
  @apply py-4;
@ -48,11 +45,11 @@ body {
 }

 .btn:hover {
-  @apply bg-blue-70;
+  @apply bg-primary_accent;
 }

 .btn:focus {
-  @apply bg-blue-70;
+  @apply bg-primary_accent;
 }

 .checkbox {
@ -71,7 +68,7 @@ body {

 .checkbox > label::before {
  /* @apply bg-grey-10; */
-  @apply border;
+  @apply border-default;
  @apply rounded-sm;

  content: '';
@ -82,16 +79,16 @@ body {
 }

 .checkbox > label:hover::before {
-  @apply border-blue-50;
+  @apply border-primary;
 }

 .checkbox > input:focus + label::before {
-  @apply border-blue-50;
+  @apply border-primary;
 }

 .checkbox > input:checked + label::before {
-  @apply bg-blue-50;
-  @apply border-blue-50;
+  @apply bg-primary;
+  @apply border-primary;

  background-image: url('../assets/lock.svg');
  background-position: center;
@ -104,8 +101,8 @@ body {
 }

 .checkbox > input:disabled + label::before {
-  @apply bg-blue-50;
-  @apply border-blue-50;
+  @apply bg-primary;
+  @apply border-primary;

  background-image: url('../assets/lock.svg');
  background-position: center;
@ -153,16 +150,16 @@ footer li a:hover {
  white-space: nowrap;
 }

-.link-blue {
-  @apply text-blue-60;
+.link-primary {
+  @apply text-primary;
 }

-.link-blue:hover {
-  @apply text-blue-70;
+.link-primary:hover {
+  @apply text-primary_accent;
 }

-.link-blue:focus {
-  @apply text-blue-70;
+.link-primary:focus {
+  @apply text-primary_accent;
 }

 .main-header img {
@ -204,19 +201,18 @@ progress::-webkit-progress-value {
  background-image: -webkit-linear-gradient(
      -45deg,
      transparent 20%,
-      rgba(255, 255, 255, 0.4) 20%,
-      rgba(255, 255, 255, 0.4) 40%,
+      rgb(255 255 255 / 40%) 20%,
+      rgb(255 255 255 / 40%) 40%,
      transparent 40%,
      transparent 60%,
-      rgba(255, 255, 255, 0.4) 60%,
-      rgba(255, 255, 255, 0.4) 80%,
+      rgb(255 255 255 / 40%) 60%,
+      rgb(255 255 255 / 40%) 80%,
      transparent 80%
    ),
-    -webkit-linear-gradient(left, #0a84ff, #0a84ff);
+    -webkit-linear-gradient(left, var(--color-primary), var(--color-primary));
  /* stylelint-enable */
  border-radius: 2px;
  background-size: 21px 20px, 100% 100%, 100% 100%;
-  -webkit-animation: animate-stripes 1s linear infinite;
 }

 progress::-moz-progress-bar {
@ -224,27 +220,21 @@ progress::-moz-progress-bar {
  background-image: -moz-linear-gradient(
      135deg,
      transparent 20%,
-      rgba(255, 255, 255, 0.4) 20%,
-      rgba(255, 255, 255, 0.4) 40%,
+      rgb(255 255 255 / 40%) 20%,
+      rgb(255 255 255 / 40%) 40%,
      transparent 40%,
      transparent 60%,
-      rgba(255, 255, 255, 0.4) 60%,
-      rgba(255, 255, 255, 0.4) 80%,
+      rgb(255 255 255 / 40%) 60%,
+      rgb(255 255 255 / 40%) 80%,
      transparent 80%
    ),
-    -moz-linear-gradient(left, #0a84ff, #0a84ff);
+    -moz-linear-gradient(left, var(--color-primary), var(--color-primary));
  /* stylelint-enable */
  border-radius: 2px;
  background-size: 21px 20px, 100% 100%, 100% 100%;
  animation: animate-stripes 1s linear infinite;
 }

-@-webkit-keyframes animate-stripes {
-  100% {
-    background-position: -21px 0;
-  }
-}
-
@keyframes animate-stripes {
  100% {
    background-position: -21px 0;
@ -283,28 +273,28 @@ select {
  }

  .btn {
-    @apply bg-blue-40;
+    @apply bg-primary;
    @apply text-white;
  }

  .btn:hover {
-    @apply bg-blue-50;
+    @apply bg-primary_accent;
  }

  .btn:focus {
-    @apply bg-blue-50;
+    @apply bg-primary_accent;
  }

-  .link-blue {
-    @apply text-blue-40;
+  .link-primary {
+    @apply text-primary;
  }

-  .link-blue:hover {
-    @apply text-blue-50;
+  .link-primary:hover {
+    @apply text-primary_accent;
  }

-  .link-blue:focus {
-    @apply text-blue-50;
+  .link-primary:focus {
+    @apply text-primary_accent;
  }

  .main > section {
@ -313,7 +303,7 @@ select {

  @screen md {
    .main > section {
-      @apply border;
+      @apply border-default;
      @apply border-grey-80;
    }
  }
@ -323,13 +313,12 @@ select {

@responsive {
  .shadow-light {
-    box-shadow: 0 0 8px 0 rgba(12, 12, 13, 0.1);
+    box-shadow: 0 0 8px 0 rgb(12 12 13 / 10%);
  }

  .shadow-big {
-    box-shadow: 0 12px 18px 2px rgba(34, 0, 51, 0.04),
-      0 6px 22px 4px rgba(7, 48, 114, 0.12),
-      0 6px 10px -4px rgba(14, 13, 26, 0.12);
+    box-shadow: 0 12px 18px 2px rgb(34 0 51 / 4%),
+      0 6px 22px 4px rgb(7 48 114 / 12%), 0 6px 10px -4px rgb(14 13 26 / 12%);
  }
 }

@ -363,20 +352,20 @@ select {

 /* begin signin button color experiment */

-.white-blue {
-  @apply border-blue-60;
+.white-primary {
+  @apply border-primary;
  @apply border-2;
-  @apply text-blue-60;
+  @apply text-primary;
 }

-.white-blue:hover,
-.white-blue:focus {
-  @apply bg-blue-60;
+.white-primary:hover,
+.white-primary:focus {
+  @apply bg-primary;
  @apply text-white;
 }

-.blue {
-  @apply bg-blue-60;
+.primary {
+  @apply bg-primary;
  @apply text-white;
 }

--- a/app/ui/account.js
+++ b/app/ui/account.js
@ -69,7 +69,7 @@ class Account extends Component {
      return html`
        <send-account>
          <button
-            class="px-4 py-2 md:px-8 md:py-4 focus:outline signin border-2 link-blue border-blue-60 hover:border-blue-70 dark:border-blue-40 dark:hover:border-blue-50"
+            class="px-4 py-2 md:px-8 md:py-4 focus:outline signin border-2 link-primary border-primary hover:border-primary dark:border-primary dark:hover:border-primary"
            onclick="${e => this.login(e)}"
            title="${translate('signInOnlyButton')}"
          >
@ -83,19 +83,19 @@ class Account extends Component {
        <input
          type="image"
          alt="${user.email}"
-          class="w-8 h-8 rounded-full border text-blue-50 md:text-white focus:outline"
+          class="w-8 h-8 rounded-full border-default text-primary md:text-white focus:outline"
          src="${user.avatar}"
          onclick="${e => this.avatarClick(e)}"
        />
        <ul
          id="accountMenu"
-          class="invisible absolute top-0 right-0 mt-10 pt-2 pb-2 bg-white shadow-md whitespace-no-wrap outline-none z-50 dark:bg-grey-80"
+          class="invisible absolute top-0 right-0 mt-10 pt-2 pb-2 bg-white shadow-md whitespace-nowrap outline-none z-50 dark:bg-grey-80"
          onblur="${e => this.hideMenu(e)}"
        >
          <li class="p-2 text-grey-60 dark:text-grey-50">${user.email}</li>
          <li>
            <button
-              class="block w-full text-left px-4 py-2 text-grey-80 dark:text-grey-30 hover:bg-blue-50 hover:text-white cursor-pointer focus:outline"
+              class="block w-full text-left px-4 py-2 text-grey-80 dark:text-grey-30 hover:bg-primary hover:text-white cursor-pointer focus:outline"
              onclick="${e => this.logout(e)}"
              title="${translate('signOut')}"
            >
--- a/app/ui/archiveTile.js
+++ b/app/ui/archiveTile.js
@ -26,7 +26,7 @@ function expiryInfo(translate, archive) {
 }

 function password(state) {
-  const MAX_LENGTH = 32;
+  const MAX_LENGTH = 4096;

  return html`
    <div class="mb-2 px-1">
@ -53,7 +53,7 @@ function password(state) {
          id="password-input"
          class="${state.archive.password
            ? ''
-            : 'invisible'} border rounded focus:border-blue-60 leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
+            : 'invisible'} border-default rounded-default focus:border-primary leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
          autocomplete="off"
          maxlength="${MAX_LENGTH}"
          type="password"
@ -150,7 +150,7 @@ function password(state) {
 function fileInfo(file, action) {
  return html`
    <send-file class="flex flex-row items-center p-3 w-full">
-      <svg class="h-8 w-8 text-white dark:text-grey-90">
+      <svg class="h-8 w-8 text-primary">
        <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
      </svg>
      <p class="ml-4 w-full">
@ -166,7 +166,7 @@ function fileInfo(file, action) {
 function archiveInfo(archive, action) {
  return html`
    <p class="w-full flex items-center">
-      <svg class="h-8 w-6 mr-3 flex-shrink-0 text-white dark:text-grey-90">
+      <svg class="h-8 w-6 mr-3 flex-shrink-0 text-primary">
        <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
      </svg>
      <p class="flex-grow">
@ -188,7 +188,7 @@ function archiveDetails(translate, archive) {
        ontoggle="${toggled}"
      >
        <summary
-          class="flex items-center link-blue text-sm cursor-pointer outline-none"
+          class="flex items-center link-primary text-sm cursor-pointer outline-none"
        >
          <svg
            class="fill-current w-4 h-4 mr-1"
@ -218,7 +218,7 @@ module.exports = function(state, emit, archive) {
    state.capabilities.share || platform() === 'android'
      ? html`
          <button
-            class="link-blue self-end flex items-start"
+            class="link-primary self-end flex items-start"
            onclick=${share}
            title="Share link"
          >
@ -230,7 +230,7 @@ module.exports = function(state, emit, archive) {
        `
      : html`
          <button
-            class="link-blue focus:outline self-end flex items-center"
+            class="link-primary focus:outline self-end flex items-center"
            onclick=${copy}
            title="${state.translate('copyLinkButton')}"
          >
@ -244,7 +244,7 @@ module.exports = function(state, emit, archive) {
    platform() === 'web'
      ? html`
          <a
-            class="flex items-baseline link-blue"
+            class="flex items-baseline link-primary"
            href="${archive.url}"
            title="${state.translate('downloadButtonLabel')}"
            tabindex="0"
@ -261,7 +261,7 @@ module.exports = function(state, emit, archive) {
  return html`
    <send-archive
      id="archive-${archive.id}"
-      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full dark:bg-grey-90 dark:border dark:border-grey-70"
+      class="flex flex-col items-start rounded-default shadow-light bg-white p-4 w-full dark:bg-grey-90 dark:border-default dark:border-grey-70"
    >
      ${archiveInfo(
        archive,
@ -335,7 +335,7 @@ module.exports.wip = function(state, emit) {
            fileInfo(f, remove(f, state.translate('deleteButtonHover')))
          ),
        'flex-shrink bg-grey-10 rounded-t overflow-y-auto px-6 py-4 md:h-full md:max-h-half-screen dark:bg-black',
-        'bg-white px-2 my-2 shadow-light rounded dark:bg-grey-90 dark:border dark:border-grey-80'
+        'bg-white px-2 my-2 shadow-light rounded-default dark:bg-grey-90 dark:border-default dark:border-grey-80'
      )}
      <div
        class="flex-shrink-0 flex-grow flex items-end p-4 bg-grey-10 rounded-b mb-1 font-medium dark:bg-grey-90"
@ -358,7 +358,7 @@ module.exports.wip = function(state, emit) {
            class="flex items-center cursor-pointer"
            title="${state.translate('addFilesButton')}"
          >
-            <svg class="w-6 h-6 mr-2 link-blue">
+            <svg class="w-6 h-6 mr-2 link-primary">
              <use xlink:href="${assets.get('addfiles.svg')}#plus" />
            </svg>
            ${state.translate('addFilesButton')}
@ -438,7 +438,7 @@ module.exports.uploading = function(state, emit) {
  return html`
    <send-upload-area
      id="${archive.id}"
-      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full dark:bg-grey-90"
+      class="flex flex-col items-start rounded-default shadow-light bg-white p-4 w-full dark:bg-grey-90"
    >
      ${archiveInfo(archive)}
      <div class="text-xs opacity-75 w-full mt-2 mb-2">
@ -448,12 +448,12 @@ module.exports.uploading = function(state, emit) {
          expiresAt: Date.now() + 500 + state.archive.timeLimit * 1000
        })}
      </div>
-      <div class="link-blue text-sm font-medium mt-2">
+      <div class="link-primary text-sm font-medium mt-2">
        ${progressPercent}
      </div>
      <progress class="my-3" value="${progress}">${progressPercent}</progress>
      <button
-        class="link-blue self-end font-medium"
+        class="link-primary self-end font-medium"
        onclick=${cancel}
        title="${state.translate('deletePopupCancel')}"
      >
@ -475,7 +475,7 @@ module.exports.empty = function(state, emit) {
      ? ''
      : html`
          <button
-            class="center font-medium text-sm link-blue mt-4 mb-2"
+            class="center font-medium text-sm link-primary mt-4 mb-2"
            onclick="${event => {
              event.stopPropagation();
              emit('signup-cta', 'drop');
@ -488,14 +488,14 @@ module.exports.empty = function(state, emit) {
        `;
  return html`
    <send-upload-area
-      class="flex flex-col items-center justify-center border-2 border-dashed border-grey-transparent rounded px-6 py-16 h-full w-full dark:border-grey-60"
+      class="flex flex-col items-center justify-center border-2 border-dashed border-grey-transparent rounded-default px-6 py-16 h-full w-full dark:border-grey-60"
      onclick="${e => {
        if (e.target.tagName !== 'LABEL') {
          document.getElementById('file-upload').click();
        }
      }}"
    >
-      <svg class="w-10 h-10 link-blue">
+      <svg class="w-10 h-10 link-primary">
        <use xlink:href="/${assets.get('addfiles.svg')}#plus" />
      </svg>
      <div class="pt-6 pb-2 text-center text-lg font-bold tracking-wide">
@ -531,11 +531,11 @@ module.exports.empty = function(state, emit) {
  `;

  function focus(event) {
-    event.target.nextElementSibling.classList.add('bg-blue-70', 'outline');
+    event.target.nextElementSibling.classList.add('bg-primary', 'outline');
  }

  function blur(event) {
-    event.target.nextElementSibling.classList.remove('bg-blue-70', 'outline');
+    event.target.nextElementSibling.classList.remove('bg-primary', 'outline');
  }

  function add(event) {
@ -563,7 +563,7 @@ module.exports.preview = function(state, emit) {
    <send-archive
      class="flex flex-col max-h-full bg-white p-4 w-full md:w-128 dark:bg-grey-90"
    >
-      <div class="border rounded py-3 px-6 dark:border-grey-70">
+      <div class="border-default rounded-default py-3 px-6 dark:border-grey-70">
        ${archiveInfo(archive)} ${details}
      </div>
      <button
@ -590,10 +590,10 @@ module.exports.downloading = function(state) {
  const progressPercent = percent(progress);
  return html`
    <send-archive
-      class="flex flex-col bg-white rounded shadow-light p-4 w-full max-w-sm md:w-128 dark:bg-grey-90"
+      class="flex flex-col bg-white rounded-default shadow-light p-4 w-full max-w-sm md:w-128 dark:bg-grey-90"
    >
      ${archiveInfo(archive)}
-      <div class="link-blue text-sm font-medium mt-2">
+      <div class="link-primary text-sm font-medium mt-2">
        ${progressPercent}
      </div>
      <progress class="my-3" value="${progress}">${progressPercent}</progress>
--- a/app/ui/copyDialog.js
+++ b/app/ui/copyDialog.js
@ -21,7 +21,7 @@ module.exports = function(name, url) {
          <input
            type="text"
            id="share-url"
-            class="block w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
+            class="block w-full my-4 border-default rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
            value="${url}"
            readonly="true"
          />
@ -42,7 +42,7 @@ module.exports = function(name, url) {
          ${state.translate('copyLinkButton')}
        </button>
        <button
-          class="link-blue my-4 font-medium cursor-pointer focus:outline"
+          class="link-primary my-4 font-medium cursor-pointer focus:outline"
          onclick="${close}"
          title="${state.translate('okButton')}"
        >
--- a/app/ui/downloadCompleted.js
+++ b/app/ui/downloadCompleted.js
@ -11,7 +11,9 @@ module.exports = function(state) {
      <h1 class="text-center text-3xl font-bold my-2">
        ${state.translate('downloadFinish')}
      </h1>
-      <img src="${assets.get('completed.svg')}" class="my-8 h-48" />
+      <svg class="my-8 h-48 text-primary">
+        <use xlink:href="${assets.get('completed.svg')}#Page-1" />
+      </svg>
      <p
        class="text-grey-80 leading-normal dark:text-grey-40 ${state.user
          .loggedIn
--- a/app/ui/downloadPassword.js
+++ b/app/ui/downloadPassword.js
@ -17,7 +17,7 @@ module.exports = function(state, emit) {
        ${state.translate('downloadDescription')}
      </p>
      <form
-        class="flex flex-row flex-no-wrap w-full md:w-4/5"
+        class="flex flex-row flex-nowrap w-full md:w-4/5"
        onsubmit="${checkPassword}"
        data-no-csrf
      >
@ -32,7 +32,7 @@ module.exports = function(state, emit) {
          class="w-full border-l border-t border-b rounded-l-lg rounded-r-none ${invalid
            ? 'border-red dark:border-red-40'
            : 'border-grey'} leading-loose px-2 py-1 dark:bg-grey-80"
-          maxlength="32"
+          maxlength="4096"
          autocomplete="off"
          placeholder="${state.translate('unlockInputPlaceholder')}"
          oninput="${inputChanged}"
--- a/app/ui/error.js
+++ b/app/ui/error.js
@ -13,7 +13,9 @@ module.exports = function(state, emit) {
        <h1 class="text-center text-3xl font-bold my-2">
          ${state.translate('errorPageHeader')}
        </h1>
-        <img class="my-12 h-48" src="${assets.get('error.svg')}" />
+        <svg class="text-primary my-12 h-48">
+          <use xlink:href="${assets.get('error.svg')}#svg114" />
+        </svg>
        <p
          class="max-w-md text-center text-grey-80 leading-normal dark:text-grey-40 ${state
            .user.loggedIn
--- a/app/ui/faviconProgressbar.js
+++ b/app/ui/faviconProgressbar.js
@ -1,9 +1,11 @@
+/*global WEB_UI*/
+
 const { platform } = require('../utils');
 const assets = require('../../common/assets');

 const size = 32;
 const loaderWidth = 5;
-const loaderColor = '#0090ed';
+const loaderColor = WEB_UI.COLORS.PRIMARY;

 function drawCircle(canvas, context, color, lineWidth, outerWidth, percent) {
  canvas.width = canvas.height = outerWidth;
@ -32,7 +34,10 @@ module.exports.updateFavicon = function(progressRatio) {
    const progress = progressRatio * 100;
    if (progress === 0 || progress === 100) {
      link.type = 'image/png';
-      link.href = assets.get('favicon-32x32.png');
+      link.href =
+        WEB_UI.CUSTOM_ASSETS.favicon_32px !== ''
+          ? WEB_UI.CUSTOM_ASSETS.favicon_32px
+          : assets.get('favicon-32x32.png');
      return;
    }

--- a/app/ui/footer.js
+++ b/app/ui/footer.js
@ -1,5 +1,7 @@
 const html = require('choo/html');
 const Component = require('choo/component');
+const version = require('../../package.json').version;
+/*const { browserName } = require('../utils');*/

 class Footer extends Component {
  constructor(name, state) {
@ -12,73 +14,18 @@ class Footer extends Component {
  }

  createElement() {
-    const translate = this.state.translate;
-
-    // Add additional links from configuration if available
-    var links = [];
-    if (this.state != undefined && this.state.WEB_UI != undefined) {
-      const WEB_UI = this.state.WEB_UI;
-
-      if (WEB_UI.FOOTER_DONATE_URL != '') {
-        links.push(html`
-          <li class="m-2">
-            <a href="${WEB_UI.FOOTER_DONATE_URL}" target="_blank">
-              ${translate('footerLinkDonate')}
-            </a>
-          </li>
-        `);
-      }
-      if (WEB_UI.FOOTER_CLI_URL != '') {
-        links.push(html`
-          <li class="m-2">
-            <a href="${WEB_UI.FOOTER_CLI_URL}" target="_blank">
-              ${translate('footerLinkCli')}
-            </a>
-          </li>
-        `);
-      }
-      if (WEB_UI.FOOTER_DMCA_URL != '') {
-        links.push(html`
-          <li class="m-2">
-            <a href="${WEB_UI.FOOTER_DMCA_URL}" target="_blank">
-              ${translate('footerLinkDmca')}
-            </a>
-          </li>
-        `);
-      }
-      if (WEB_UI.FOOTER_SOURCE_URL != '') {
-        links.push(html`
-          <li class="m-2">
-            <a href="${WEB_UI.FOOTER_SOURCE_URL}" target="_blank">
-              ${translate('footerLinkSource')}
-            </a>
-          </li>
-        `);
-      }
-    } else {
-      links.push(html`
-        <li class="m-2">
-          <a href="https://gitlab.com/timvisee/send" target="_blank">
-            ${translate('footerLinkSource')}
-          </a>
-        </li>
-      `);
-    }
-
    return html`
      <footer
-        class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 md:p-8 font-medium text-xs text-grey-60 dark:text-grey-40 md:items-center justify-between"
+        class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 md:p-8 font-medium text-xs text-grey-60 dark:text-grey-40 md:justify-end justify-between"
      >
-        <ul
-          class="flex flex-col md:flex-row items-start md:items-center md:justify-start"
+        <a
+          href="https://admin.chapril.org/doku.php?id=admin:chatons:drop.chapril.org#personnalisation"
+          rel="noreferrer noopener"
+          alt="Version"
+          target="_blank"
        >
-          <li class="m-2">${translate('footerText')}</li>
-        </ul>
-        <ul
-          class="flex flex-col md:flex-row items-start md:items-center md:justify-end"
-        >
-          ${links}
-        </ul>
+          FirefoxSend chapril-${version}
+        </a>
      </footer>
    `;
  }
--- a/app/ui/header.js
+++ b/app/ui/header.js
@ -1,8 +1,8 @@
 const html = require('choo/html');
 const Component = require('choo/component');
 const Account = require('./account');
-const assets = require('../../common/assets');
-const { platform } = require('../utils');
+/*const assets = require('../../common/assets');*/
+/*const { platform } = require('../utils');*/

 class Header extends Component {
  constructor(name, state, emit) {
@ -18,32 +18,66 @@ class Header extends Component {
  }

  createElement() {
-    const title =
-      platform() === 'android'
-        ? html`
-            <a class="flex flex-row items-center">
-              <img src="${assets.get('icon.svg')}" />
-              <svg class="w-48">
-                <use xlink:href="${assets.get('wordmark.svg')}#logo" />
-              </svg>
-            </a>
-          `
-        : html`
-            <a class="flex flex-row items-center" href="/">
-              <img
-                alt="${this.state.translate('title')}"
-                src="${assets.get('icon.svg')}"
-              />
-              <svg viewBox="66 0 340 64" class="w-48 md:w-64">
-                <use xlink:href="${assets.get('wordmark.svg')}#logo" />
-              </svg>
-            </a>
-          `;
    return html`
      <header
-        class="main-header relative flex-none flex flex-row items-center justify-between w-full px-6 md:px-8 h-16 md:h-24 z-20 bg-transparent"
+        class="main-header relative flex-none flex flex-row items-center justify-between px-6 md:px-8 z-20 bg-transparent"
      >
-        ${title} ${this.account.render()}
+        <!-- Chapril banner code: starting… -->
+        <nav class="chapril-banniere-Nav">
+          <div class="chapril-banniere-Logo" aria-hidden="true">
+            <a href="https://www.chapril.org"
+              ><img alt="" src="/Chapril-banner/v2/chapril-banner-logo.png"
+            /></a>
+          </div>
+          <div class="chapril-banniere-Menu" aria-hidden="true">
+            <details>
+              <summary>
+                <span></span>
+                <span></span>
+                <span></span>
+              </summary>
+              <div><a href="https://www.chapril.org/">Accueil Chapril</a></div>
+              <div>
+                <a href="https://www.chapril.org/services.html"
+                  >Services libres</a
+                >
+              </div>
+              <div>
+                <a href="https://pouet.april.org/@aprilorg">Nous suivre</a>
+              </div>
+              <div><a href="https://www.chapril.org/cgu.html">CGU</a></div>
+              <div>
+                <a href="https://www.chapril.org/a-propos.html"
+                  >Mentions légales</a
+                >
+              </div>
+              <div>
+                <a href="https://www.chapril.org/contact.html"
+                  >Nous contacter</a
+                >
+              </div>
+            </details>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/">Accueil Chapril</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/services.html">Services libres</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://pouet.april.org/@aprilorg">Nous suivre</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/cgu.html">CGU</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/a-propos.html">Mentions légales</a>
+          </div>
+          <div class="chapril-banniere-Entree">
+            <a href="https://www.chapril.org/contact.html">Nous contacter</a>
+          </div>
+        </nav>
+        <!-- Chapril banner code: done. -->
      </header>
    `;
  }
--- a/app/ui/noStreams.js
+++ b/app/ui/noStreams.js
@ -12,14 +12,14 @@ module.exports = function(state, emit) {
        'downloadTitle'
      )}</h1>
      <p
-        class="w-full p-2 border border-yellow-50 rounded md:w-4/5 text-orange-60 bg-yellow-40 text-center leading-normal"
+        class="w-full p-2 border-default border-yellow-50 rounded-default md:w-4/5 text-orange-60 bg-yellow-40 text-center leading-normal"
      >
        ⚠️ ${state.translate('noStreamsWarning')} ⚠️
      </p>
      <form class="md:w-128" onsubmit=${submit}>
-        <fieldset class="border rounded p-4 my-4" onchange=${optionChanged}>
+        <fieldset class="border-default rounded-default p-4 my-4" onchange=${optionChanged}>
          <div class="flex items-center mb-2">
-            <svg class="h-8 w-6 mr-3 flex-shrink-0 text-white dark:text-grey-90">
+            <svg class="h-8 w-6 mr-3 flex-shrink-0 text-primary">
              <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
            </svg>
            <p class="flex-grow">
--- a/app/ui/notFound.js
+++ b/app/ui/notFound.js
@ -13,7 +13,9 @@ module.exports = function(state, emit) {
        <h1 class="text-center text-3xl font-bold my-2">
          ${state.translate('expiredTitle')}
        </h1>
-        <img src="${assets.get('notFound.svg')}" class="my-12" />
+        <svg class="text-primary my-12">
+          <use xlink:href="${assets.get('notFound.svg')}#svg124" />
+        </svg>
        <p
          class="max-w-md text-center text-grey-80 leading-normal dark:text-grey-40 ${state
            .user.loggedIn
--- a/app/ui/selectbox.js
+++ b/app/ui/selectbox.js
@ -3,15 +3,22 @@ const html = require('choo/html');
 module.exports = function(selected, options, translate, changed, htmlId) {
  function choose(event) {
    if (event.target.value != selected) {
-      console.log('Selected new value from dropdown', htmlId, ':', selected, '->', event.target.value)
+      console.log(
+        'Selected new value from dropdown',
+        htmlId,
+        ':',
+        selected,
+        '->',
+        event.target.value
+      );
      changed(event.target.value);
    }
  }
-  
+
  return html`
    <select
      id="${htmlId}"
-      class="appearance-none cursor-pointer border rounded bg-grey-10 hover:border-blue-50 focus:border-blue-50 pl-1 pr-8 py-1 my-1 h-8 dark:bg-grey-80"
+      class="appearance-none cursor-pointer border-default rounded-default bg-grey-10 hover:border-primary focus:border-primary pl-1 pr-8 py-1 my-1 h-8 dark:bg-grey-80"
      data-selected="${selected}"
      onchange="${choose}"
    >
--- a/app/ui/shareDialog.js
+++ b/app/ui/shareDialog.js
@ -18,7 +18,7 @@ module.exports = function(name, url) {
        <input
          type="text"
          id="share-url"
-          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
+          class="w-full my-4 border-default rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
          value="${url}"
          readonly="true"
        />
@ -30,7 +30,7 @@ module.exports = function(name, url) {
          ${state.translate('shareLinkButton')}
        </button>
        <button
-          class="link-blue my-4 font-medium cursor-pointer focus:outline"
+          class="link-primary my-4 font-medium cursor-pointer focus:outline"
          onclick="${close}"
          title="${state.translate('okButton')}"
        >
--- a/app/ui/signupDialog.js
+++ b/app/ui/signupDialog.js
@ -35,7 +35,7 @@ module.exports = function() {
            <input
              id="email-input"
              type="email"
-              class="hidden border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-70 leading-loose dark:bg-grey-80 dark:text-white"
+              class="hidden border-default rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-70 leading-loose dark:bg-grey-80 dark:text-white"
              placeholder=${state.translate('emailPlaceholder')}
            />
            <input
@ -50,7 +50,7 @@ module.exports = function() {
            ? ''
            : html`
                <button
-                  class="my-3 link-blue font-medium"
+                  class="my-3 link-primary font-medium"
                  title="${state.translate('deletePopupCancel')}"
                  onclick=${cancel}
                >
--- a/app/ui/surveyDialog.js
+++ b/app/ui/surveyDialog.js
@ -30,7 +30,7 @@ module.exports = function() {
          Give feedback
        </a>
        <button
-          class="link-blue font-medium cursor-pointer focus:outline"
+          class="link-primary font-medium cursor-pointer focus:outline"
          onclick="${close}"
          title="Skip"
        >
--- a/app/ui/unsupported.js
+++ b/app/ui/unsupported.js
@ -10,7 +10,7 @@ module.exports = function(state, emit) {
    strings = unsupportedStrings(state);
    why = html`
      <a
-        class="text-blue"
+        class="text-primary"
        href="https://github.com/timvisee/send/blob/master/docs/faq.md#why-is-my-browser-not-supported"
      >
        ${state.translate('notSupportedLink')}
@ -27,7 +27,7 @@ module.exports = function(state, emit) {
    <main class="main">
      ${state.modal && modal(state, emit)}
      <section
-        class="flex flex-col items-center justify-center text-center bg-white m-6 px-6 py-8 border border-grey-30 md:border-none md:px-12 md:py-16 shadow w-full md:h-full dark:bg-grey-90"
+        class="flex flex-col items-center justify-center text-center bg-white m-6 px-6 py-8 border-default border-grey-30 md:border-none md:px-12 md:py-16 shadow-default w-full md:h-full dark:bg-grey-90"
      >
        <h1 class="text-3xl font-bold">${strings.header}</h1>
        <p class="mt-4 mb-8 max-w-md leading-normal">${strings.description}</p>
--- a/assets/blue_file.svg
+++ b/assets/blue_file.svg
@ -1,26 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+    <!--
+      This would be the elegant way, but chrome cannot handle masks in external SVGs.
+      See https://bugs.chromium.org/p/chromium/issues/detail?id=109212
+    -->
+    <!--
    <symbol id="icon" viewBox="0 0 26 32">
-    <defs>
-        <path d="M21.848475,31.6653183 L2.89005487,31.6653183 C1.32717435,31.6653183 0.104050469,30.3742431 0.104050469,28.8793139 L0.104050469,2.7860044 C0.104050469,1.22312388 1.39512568,0 2.89005487,0 L14.7135857,0 C15.4610503,0 16.2085149,0.271805307 16.6841742,0.815415921 L23.8190635,7.95030523 C24.3626741,8.49391584 24.6344794,9.17342911 24.6344794,9.9208937 L24.6344794,28.8793139 C24.6344794,30.3742431 23.4113555,31.6653183 21.848475,31.6653183 Z" id="path-1"></path>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Send_Ready_to_Send-Spec" transform="translate(-277.000000, -206.000000)">
-            <g id="List-Item-1" transform="translate(253.000000, 192.000000)">
-                <g id="Locked-File-Icon" transform="translate(24.000000, 14.000000)">
-                    <g id="File-Icon">
-                        <mask id="mask-2" fill="white">
-                            <use xlink:href="#path-1"></use>
-                        </mask>
-                        <use id="Mask" fill="#45a1ff" xlink:href="#path-1"></use>
-                        <path d="M24.3031318,10.6474633 L16.7826187,10.6474633 C15.2742552,10.6474633 14.051485,9.42469306 14.051485,7.91632957 L14.051485,0.395816478" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,8.93885547 L8.91906464,8.93885547" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,15.7798836 L17.5412669,15.7798836" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,22.6209117 L17.5412669,22.6209117" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                    </g>
-                </g>
-            </g>
+        <g id="Fire-Icon">
+            <mask id="mask">
+                <rect x="0" y="0" width="100" height="100" fill="white"/>
+                <path d="M7.2830232,8.93885547 L8.91906464,8.93885547" stroke="black" stroke-width="2" stroke-linecap="round"/>
+                <path d="M7.2830232,15.7798836 L17.5412669,15.7798836" stroke="black" stroke-width="2" stroke-linecap="round"/>
+                <path d="M7.2830232,22.6209117 L17.5412669,22.6209117" stroke="black" stroke-width="2" stroke-linecap="round"/>
+                <path d="M24.3031318,10.6474633 L16.7826187,10.6474633 C15.2742552,10.6474633 14.051485,9.42469306 14.051485,7.91632957 L14.051485,0.395816478" id="Path" stroke-linecap="square" stroke="black" stroke-width="2" fill="none"/>
+            </mask>
+            <path d="M21.848475,31.6653183 L2.89005487,31.6653183 C1.32717435,31.6653183 0.104050469,30.3742431 0.104050469,28.8793139 L0.104050469,2.7860044 C0.104050469,1.22312388 1.39512568,0 2.89005487,0 L14.7135857,0 C15.4610503,0 16.2085149,0.271805307 16.6841742,0.815415921 L23.8190635,7.95030523 C24.3626741,8.49391584 24.6344794,9.17342911 24.6344794,9.9208937 L24.6344794,28.8793139 C24.6344794,30.3742431 23.4113555,31.6653183 21.848475,31.6653183 Z" id="path-1" fill="currentColor" mask="url(#mask)" />
        </g>
-    </g>
    </symbol>
-</svg>
+    -->
+    <symbol id="icon" viewBox="0 0 26 32">
+        <path d="m 15 0 c 0.7 0.1 1.233 0.331 1.7 0.8 l 7.1 7.1 c 0.5 0.5 0.8 1.1 0.8 1.8 h -7.9 c -1 0 -1.7 -0.8 -1.7 -1.7 V 0.4 z M 24.65 11.647 v 17.23 c 0 1.5 -1.2 2.8 -2.8 2.8 h -19 c -1.234 -0.017 -2.694 -1.094 -2.7 -2.8 V 2.8 C 0.1 1.2 1.4 0 2.9 0 h 10.15 v 7.5 c -0.135 2.533 1.669 4.119 3.7 4.15 h 7.9 z M 6.3 8.9 c 0 0.6 0.4 1 1 1 h 1.6 c 0.5 0 1 -0.4 1 -1 c 0 -0.5 -0.5 -1 -1 -1 H 7.3 C 6.7 7.9 6.3 8.4 6.3 8.9 z M 18.5 22.6 c 0 -0.5 -0.4 -1 -1 -1 H 7.3 c -0.6 0 -1 0.5 -1 1 s 0.4 1 1 1 h 10.3 C 18.1 23.6 18.5 23.2 18.5 22.6 z M 18.5 15.8 c 0 -0.6 -0.4 -1 -1 -1 H 7.3 c -0.6 0 -1 0.4 -1 1 s 0.4 1 1 1 h 10.3 C 18.1 16.8 18.5 16.3 18.5 15.8 z" fill="currentColor" />
+    </symbol>
+</svg>
--- a/assets/completed.svg
+++ b/assets/completed.svg
@ -253,7 +253,7 @@
        <path
           id="cloud-check"
           d="m 240.12048,110.31165 a 39.582604,39.582604 0 0 1 -10.23938,26.55813 33.935974,33.935974 0 0 1 -20.28366,10.27635 39.949372,39.949372 0 0 0 0.80301,-16.48404 16.944722,16.944722 0 0 0 7.65405,-4.47239 23.665469,23.665469 0 0 0 6.1311,-15.87805 26.589359,26.589359 0 0 0 -26.55812,-26.558123 c -0.87568,0 -5.3742,0.56186 -8.11085,0.91445 a 2.6398778,2.6398778 0 0 1 -2.83769,-1.77451 l -1.08155,-3.155106 A 32.772357,32.772357 0 0 0 158.37085,57.356128 31.757517,31.757517 0 0 0 124.14114,96.347867 l 1.13419,4.851433 a 2.6558127,2.6558127 0 0 1 -1.8179,3.14687 l -4.77313,1.44232 a 15.788381,15.788381 0 0 0 -11.35445,15.14642 10.699791,10.699791 0 0 0 2.19933,6.52543 12.871343,12.871343 0 0 0 9.50281,4.09782 h 7.25749 a 40.137987,40.137987 0 0 0 1.02966,15.93487 h -8.28715 A 28.433555,28.433555 0 0 1 96.535402,136.68302 26.739094,26.739094 0 0 1 91.39497,120.93491 31.54075,31.54075 0 0 1 107.53217,93.318597 c -0.13492,-1.42644 -0.20238,-2.84772 -0.20238,-4.25345 a 47.786197,47.786197 0 0 1 90.59848,-21.246498 42.542454,42.542454 0 0 1 42.19216,42.493001 z m -39.83719,26.55813 a 31.869752,31.869752 0 1 1 -31.86975,-31.86975 31.869752,31.869752 0 0 1 31.86975,31.86975 z m -15.15067,-11.86394 -2.71673,-2.01199 a 1.5763311,1.5763311 0 0 0 -2.00127,0.14182 l -16.73162,15.72576 -9.38033,-4.48657 a 1.7144864,1.7144864 0 0 0 -2.00221,0.5062 l -2.30275,2.94497 a 1.576756,1.576756 0 0 0 0.14182,2.00158 l 11.86234,11.8768 a 4.410933,4.410933 0 0 0 6.89242,-0.53116 l 16.51629,-24.2992 a 1.346922,1.346922 0 0 0 -0.27833,-1.86831 z"
-           style="fill:#45a1ff;fill-opacity:1;stroke-width:5.31163" />
+           style="fill-opacity:1;stroke-width:5.31163" fill="currentColor" />
      </g>
    </g>
  </g>
--- a/assets/error.svg
+++ b/assets/error.svg
@ -5,8 +5,6 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   width="356px"
-   height="210px"
   viewBox="0 0 356 210"
   version="1.1"
   id="svg114">
@ -256,5 +254,5 @@
  <path
     id="cloud-alert"
     d="m 254.54362,110.61709 a 41.858804,41.858804 0 0 1 -10.8282,28.08534 35.887465,35.887465 0 0 1 -21.45007,10.8673 42.246663,42.246663 0 0 0 0.84918,-17.43196 17.919131,17.919131 0 0 0 8.09421,-4.72957 25.026353,25.026353 0 0 0 6.48366,-16.79111 28.118382,28.118382 0 0 0 -28.08535,-28.085359 c -0.92602,0 -5.68324,0.594174 -8.57727,0.967035 a 2.7916842,2.7916842 0 0 1 -3.0008,-1.876551 l -1.14369,-3.336147 A 34.656989,34.656989 0 0 0 168.09302,54.616462 33.58368,33.58368 0 0 0 131.89488,95.850311 l 1.19942,5.130409 a 2.8085354,2.8085354 0 0 1 -1.92244,3.32783 l -5.04762,1.52526 a 16.696293,16.696293 0 0 0 -12.00739,16.01742 11.315083,11.315083 0 0 0 2.32581,6.90069 13.611511,13.611511 0 0 0 10.04928,4.33345 h 7.67482 a 42.446125,42.446125 0 0 0 1.08887,16.85122 h -8.76369 A 30.06863,30.06863 0 0 1 102.70166,138.50495 28.276728,28.276728 0 0 1 97.265633,121.85123 33.354503,33.354503 0 0 1 114.33081,92.64684 c -0.14268,-1.508465 -0.21401,-3.01148 -0.21401,-4.498037 a 50.534146,50.534146 0 0 1 95.80834,-22.468284 44.988861,44.988861 0 0 1 44.61843,44.936571 z m -42.12804,28.08534 a 33.702425,33.702425 0 1 1 -33.70241,-33.70242 33.702425,33.702425 0 0 1 33.70241,33.70242 z m -28.08535,14.04269 a 2.8085354,2.8085354 0 0 0 -2.80853,-2.80853 h -5.61707 a 2.8085354,2.8085354 0 0 0 -2.80853,2.80853 v 5.61706 a 2.8085354,2.8085354 0 0 0 2.80853,2.80855 h 5.61707 a 2.8085354,2.8085354 0 0 0 2.80853,-2.80855 z m 0,-33.70243 a 2.8166239,2.8166239 0 0 0 -2.80853,-2.80853 h -5.61707 a 2.8166239,2.8166239 0 0 0 -2.80853,2.80853 v 11.23415 a 22.144684,22.144684 0 0 0 0.83447,5.49022 l 2.24351,7.21126 a 2.0333796,2.0333796 0 0 0 1.82117,1.34118 h 1.43583 a 2.0333796,2.0333796 0 0 0 1.82118,-1.34118 l 2.2435,-7.21126 a 22.144684,22.144684 0 0 0 0.83447,-5.49022 z"
-     style="stroke-width:5.61707;fill:#45a1ff;fill-opacity:1" />
+     style="stroke-width:5.61707;fill:currentColor;fill-opacity:1" />
 </svg>
--- a/assets/favicon-16x16.png
+++ b/assets/favicon-16x16.png
--- a/assets/favicon-32x32.png
+++ b/assets/favicon-32x32.png
--- a/assets/notFound.svg
+++ b/assets/notFound.svg
@ -5,8 +5,6 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   width="348px"
-   height="210px"
   viewBox="0 0 348 210"
   version="1.1"
   id="svg124">
@ -272,5 +270,5 @@
  <path
     id="cloud-off"
     d="M 232.66609,50.155807 A 8.2118103,8.2118103 0 0 0 221.05286,38.54253 l -24.58739,24.587284 a 49.087021,49.087021 0 0 0 -82.69072,35.970548 c 0,1.448998 0.0696,2.914018 0.20861,4.384368 a 32.511588,32.511588 0 0 0 -16.633903,28.46635 27.562135,27.562135 0 0 0 5.298643,16.23286 22.799931,22.799931 0 0 0 4.2838,4.4793 l -7.176402,7.17673 a 8.2118072,8.2118072 0 1 0 11.613272,11.61322 z M 118.72657,140.86955 a 8.5946237,8.5946237 0 0 1 -2.68479,-2.19217 11.029135,11.029135 0 0 1 -2.26703,-6.7263 16.274355,16.274355 0 0 1 11.70415,-15.61263 l 4.92005,-1.48644 a 2.738162,2.738162 0 0 0 1.8737,-3.24418 l -1.16893,-5.00059 a 32.735029,32.735029 0 0 1 35.28314,-40.191861 31.860268,31.860268 0 0 1 18.36694,8.426592 z m 131.92616,-19.86871 a 40.800975,40.800975 0 0 1 -10.55455,27.3756 35.587128,35.587128 0 0 1 -25.2904,10.95024 h -71.10166 l 16.42536,-16.42536 h 54.6763 a 19.17354,19.17354 0 0 0 13.09966,-5.53393 24.393903,24.393903 0 0 0 6.31993,-16.36655 27.319807,27.319807 0 0 0 -25.05414,-27.140158 l 13.61114,-13.61313 a 43.833807,43.833807 0 0 1 27.86836,40.753288 z"
-     style="fill:#45a1ff;fill-opacity:1;stroke-width:5.47512" />
+     style="fill:currentColor;fill-opacity:1;stroke-width:5.47512" />
 </svg>
--- a/docs/docker.md
+++ b/docs/docker.md
@ -77,6 +77,31 @@ Redis is used as the metadata database for the backend and is required no matter

 *Note: more options can be found here: https://github.com/timvisee/send/blob/master/server/config.js*

+## Branding
+
+To change the look the colors aswell as some graphics can be changed via environment variables.  
+See the table below for the variables and their default values.
+
+| Name | Default | Description |
+|---|---|---|
+| UI_COLOR_PRIMARY | #0a84ff | The primary color |
+| UI_COLOR_ACCENT | #003eaa | The accent color (eg. for hover-effects) |
+| UI_CUSTOM_ASSETS_ANDROID_CHROME_192PX | | A custom icon for Android (192x192px) |
+| UI_CUSTOM_ASSETS_ANDROID_CHROME_512PX | | A custom icon for Android (512x512px) |
+| UI_CUSTOM_ASSETS_APPLE_TOUCH_ICON | | A custom icon for Apple |
+| UI_CUSTOM_ASSETS_FAVICON_16PX | | A custom favicon (16x16px) |
+| UI_CUSTOM_ASSETS_FAVICON_32PX | | A custom favicon (32x32px) |
+| UI_CUSTOM_ASSETS_ICON | | A custom icon (Logo on the top-left of the UI) |
+| UI_CUSTOM_ASSETS_SAFARI_PINNED_TAB | | A custom icon for Safari |
+| UI_CUSTOM_ASSETS_FACEBOOK | | A custom header image for Facebook |
+| UI_CUSTOM_ASSETS_TWITTER | | A custom header image for Twitter |
+| UI_CUSTOM_ASSETS_WORDMARK | | A custom wordmark (Text next to the logo) |
+| UI_CUSTOM_CSS | | Allows you to define a custom CSS file for custom styling |
+| CUSTOM_FOOTER_TEXT | | Allows you to define a custom footer |
+| CUSTOM_FOOTER_URL | | Allows you to define a custom URL in your footer |
+
+Side note: If you define a custom URL and a custom footer, only the footer text will display, but will be hyperlinked to the URL.
+
 ## Examples

 **Run using an Amazon Elasticache for the Redis DB, Amazon S3 for the storage backend, and Sentry for error reporting.**
@ -115,6 +140,18 @@ Then open http://localhost:1443 to view the UI. (change the `localhost` to your

 To run with HTTPS, you will need to set up a reverse proxy with SSL termination in front of the backend. See Docker Compose below for an example setup.

+
+**Run with custom branding.**
+
+```bash
+$ docker run -p 1443:1443 \
+    -v $PWD/custom_assets:/app/dist/custom_assets \
+    -e 'UI_COLOR_PRIMARY=#f00' \
+    -e 'UI_COLOR_ACCENT=#a00' \
+    -e 'UI_CUSTOM_ASSETS_ICON=custom_assets/logo.svg' \
+    registry.gitlab.com/timvisee/send:latest
+```
+
 ## Docker Compose

 For a Docker compose configuration example, see:
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "send",
  "description": "File Sharing Experiment",
-  "version": "3.4.18",
+  "version": "3.4.23",
  "author": "Mozilla (https://mozilla.org)",
  "contributors": [
    "Tim Visee <3a4fb3964f@sinenomine.email> (https://timvisee.com)"
@ -62,12 +62,12 @@
    "node": "^16.13.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.17.9",
    "@babel/plugin-proposal-class-properties": "^7.16.7",
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
    "@babel/preset-env": "^7.16.11",
    "@dannycoates/webcrypto-liner": "^0.1.37",
-    "@fullhuman/postcss-purgecss": "^1.3.0",
+    "@fullhuman/postcss-purgecss": "^4.1.3",
    "@mattiasbuelens/web-streams-polyfill": "0.2.1",
    "@sentry/browser": "^5.30.0",
    "asmcrypto.js": "^0.22.0",
@ -75,13 +75,13 @@
    "babel-plugin-istanbul": "^5.2.0",
    "base64-js": "^1.5.1",
    "content-disposition": "^0.5.4",
-    "copy-webpack-plugin": "^5.1.2",
+    "copy-webpack-plugin": "^6.4.0",
    "core-js": "^3.21.1",
    "crc": "^3.8.0",
    "cross-env": "^6.0.3",
-    "css-loader": "^3.6.0",
+    "css-loader": "^5.2.7",
    "css-mqpacker": "^7.0.0",
-    "cssnano": "^4.1.11",
+    "cssnano": "^5.1.12",
    "eslint": "^6.6.0",
    "eslint-config-prettier": "^6.15.0",
    "eslint-plugin-mocha": "^6.2.1",
@ -91,22 +91,23 @@
    "extract-loader": "^3.2.0",
    "extract-text-webpack-plugin": "^4.0.0-beta.0",
    "fast-text-encoding": "^1.0.3",
-    "file-loader": "^4.2.0",
-    "git-rev-sync": "^1.12.0",
+    "file-loader": "^6.2.0",
+    "git-rev-sync": "^3.0.2",
    "html-loader": "^0.5.5",
    "http_ece": "^1.1.0",
    "husky": "^3.0.9",
    "intl-pluralrules": "^1.3.1",
    "lint-staged": "^9.4.2",
-    "mocha": "^6.2.2",
+    "mocha": "^10.1.0",
    "morgan": "^1.9.1",
    "nanobus": "^4.5.0",
    "nanohtml": "^1.9.0",
    "nanotiming": "^7.3.1",
    "npm-run-all": "^4.1.5",
    "nyc": "^14.1.1",
-    "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "^6.7.1",
+    "postcss": "^8.4.14",
+    "postcss-loader": "^4.2.0",
+    "postcss-preset-env": "^7.7.2",
    "prettier": "^1.19.1",
    "proxyquire": "^2.1.3",
    "puppeteer": "^2.0.0",
@ -115,13 +116,13 @@
    "script-loader": "^0.7.2",
    "sinon": "^7.5.0",
    "string-hash": "^1.1.3",
-    "stylelint": "^13.13.1",
-    "stylelint-config-standard": "^19.0.0",
-    "stylelint-no-unsupported-browser-features": "^4.1.4",
-    "svgo": "^1.3.2",
-    "svgo-loader": "^2.2.2",
-    "tailwindcss": "^1.9.6",
-    "val-loader": "^1.1.1",
+    "stylelint": "^14.9.1",
+    "stylelint-config-standard": "^26.0.0",
+    "stylelint-no-unsupported-browser-features": "^5.0.3",
+    "svgo": "^2.8.0",
+    "svgo-loader": "^3.0.1",
+    "tailwindcss": "^2",
+    "val-loader": "^2.1.2",
    "webpack": "4.38.0",
    "webpack-cli": "^3.3.12",
    "webpack-dev-middleware": "^3.7.3",
@ -131,21 +132,21 @@
  },
  "dependencies": {
    "@dannycoates/express-ws": "^5.0.3",
-    "@fluent/bundle": "^0.13.0",
-    "@fluent/langneg": "^0.3.0",
-    "@google-cloud/storage": "^5.18.3",
-    "@sentry/node": "^5.30.0",
-    "aws-sdk": "^2.1102.0",
-    "body-parser": "^1.19.2",
+    "@fluent/bundle": "^0.17.1",
+    "@fluent/langneg": "^0.6.2",
+    "@google-cloud/storage": "^6.2.3",
+    "@sentry/node": "^7.7.0",
+    "aws-sdk": "^2.1109.0",
+    "body-parser": "^1.20.0",
    "choo": "^7.0.0",
    "cldr-core": "^35.1.0",
    "configstore": "github:dannycoates/configstore#master",
-    "convict": "^5.2.1",
+    "convict": "^6.2.4",
+    "convict-format-with-validator": "^6.2.0",
    "double-ended-queue": "^2.1.0-0",
    "express": "^4.17.3",
    "helmet": "^3.23.3",
-    "mkdirp": "^0.5.6",
-    "mozlog": "^2.2.0",
+    "mozlog": "^3.0.1",
    "node-fetch": "^2.6.7",
    "redis": "^3.1.1",
    "redis-mock": "^0.47.0",
--- a/postcss.config.js
+++ b/postcss.config.js
@ -1,8 +1,6 @@
-class TailwindExtractor {
-  static extract(content) {
-    return content.match(/[A-Za-z0-9-_:/]+/g) || [];
-  }
-}
+const TailwindExtractor = content => {
+  return content.match(/[A-Za-z0-9-_:/]+/g) || [];
+};

 const options = {
  plugins: [
--- a/public/chapril.css
+++ b/public/chapril.css
@ -0,0 +1,76 @@
+#chapril-banner {
+  /* position: fixed; */
+
+  /* top: 0; */
+  height: 42px !important;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  background-color: #fafafa;
+  text-align: center;
+  border-bottom: 1px solid #bdbdbd;
+}
+
+#chapril-banner-zone {
+  width: 100%;
+
+  /* max-width: 950px; */
+  margin: 0 auto;
+  padding: 0;
+  text-align: left;
+
+  /* border: solid 1px red; */
+}
+
+#chapril-banner-zone > div {
+  float: left;
+  margin: 0 15px;
+}
+
+#chapril-banner-menu > ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  text-align: justify;
+  box-sizing: border-box;
+}
+
+#chapril-banner-menu > ul > li {
+  float: left;
+  margin: 0 10px 0 0;
+  padding: 0;
+  display: block;
+  box-sizing: border-box;
+  font-family: 'DejaVu Sans', Verdana, Geneva, sans-serif !important;
+  height: 42px;
+}
+
+#chapril-banner-menu > ul > li:hover {
+  background-color: #dadada;
+}
+
+#chapril-banner-menu > ul > li > a {
+  height: 42px;
+  color: #555000;
+  font-size: 12px;
+  text-decoration: none !important;
+  line-height: 42px;
+  border: none !important;
+  padding: 10px 15px;
+}
+
+#chapril-banner-aprillogo {
+  float: right !important;
+}
+
+#chapril-banner-aprillogo > a > img {
+  padding-top: 2px;
+}
+
+#chapril-banner-zone > div > a > img {
+  height: auto !important;
+}
+
+.send-promo {
+  display: none;
+}
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/locales/fr/send.ftl
+++ b/public/locales/fr/send.ftl
@ -48,7 +48,7 @@ passwordSetError = Ce mot de passe n’a pas pu être défini
 -firefox = Firefox
 -mozilla = Mozilla
 introTitle = Partage de fichiers simple et privé
-introDescription = { -send-brand } vous permet de partager des fichiers chiffrés de bout en bout ainsi qu’un lien qui expire automatiquement. Ainsi, vous pouvez garder ce que vous partagez en privé et vous assurer que vos contenus ne restent pas en ligne pour toujours.
+introDescription = DropChaprilOrg vous permet de partager des fichiers chiffrés de bout en bout ainsi qu’un lien qui expire automatiquement. Ainsi, vous pouvez garder ce que vous partagez en privé et vous assurer que vos contenus ne restent pas en ligne pour toujours.
 notifyUploadEncryptDone = Votre fichier est chiffré et prêt à l’envoi
 # downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
 archiveExpiryInfo = Expire après { $downloadCount } ou { $timespan }
--- a/server/clientConstants.js
+++ b/server/clientConstants.js
@ -12,7 +12,14 @@ module.exports = {
    FOOTER_DONATE_URL: config.footer_donate_url,
    FOOTER_CLI_URL: config.footer_cli_url,
    FOOTER_DMCA_URL: config.footer_dmca_url,
-    FOOTER_SOURCE_URL: config.footer_source_url
+    FOOTER_SOURCE_URL: config.footer_source_url,
+    CUSTOM_FOOTER_TEXT: config.custom_footer_text,
+    CUSTOM_FOOTER_URL: config.custom_footer_url,
+    COLORS: {
+      PRIMARY: config.ui_color_primary,
+      ACCENT: config.ui_color_accent
+    },
+    CUSTOM_ASSETS: config.ui_custom_assets
  },
  DEFAULTS: {
    DOWNLOADS: config.default_downloads,
--- a/server/config.js
+++ b/server/config.js
@ -1,8 +1,11 @@
 const convict = require('convict');
+const convict_format_with_validator = require('convict-format-with-validator');
 const { tmpdir } = require('os');
 const path = require('path');
 const { randomBytes } = require('crypto');

+convict.addFormats(convict_format_with_validator);
+
 convict.addFormat({
  name: 'positive-int-array',
  coerce: ints => {
@ -46,7 +49,7 @@ const conf = convict({
  },
  expire_times_seconds: {
    format: 'positive-int-array',
-    default: [300, 3600, 86400, 604800],
+    default: [300, 3600, 86400, 172800, 432000, 604800],
    env: 'EXPIRE_TIMES_SECONDS'
  },
  default_expire_seconds: {
@ -56,7 +59,7 @@ const conf = convict({
  },
  max_expire_seconds: {
    format: Number,
-    default: 86400 * 7,
+    default: 432000,
    env: 'MAX_EXPIRE_SECONDS'
  },
  download_counts: {
@ -162,9 +165,19 @@ const conf = convict({
  },
  base_url: {
    format: 'url',
-    default: 'https://send.firefox.com',
+    default: 'https://send.example.com',
    env: 'BASE_URL'
  },
+  custom_title: {
+    format: String,
+    default: 'Send',
+    env: 'CUSTOM_TITLE'
+  },
+  custom_description: {
+    format: String,
+    default: 'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
+    env: 'CUSTOM_DESCRIPTION'
+  },
  detect_base_url: {
    format: Boolean,
    default: false,
@ -239,6 +252,88 @@ const conf = convict({
    format: String,
    default: 'https://github.com/timvisee/send',
    env: 'SEND_FOOTER_SOURCE_URL'
+  },
+  custom_footer_text: {
+    format: String,
+    default: '',
+    env: 'CUSTOM_FOOTER_TEXT'
+  },
+  custom_footer_url: {
+    format: String,
+    default: '',
+    env: 'CUSTOM_FOOTER_URL'
+  },
+  ui_color_primary: {
+    format: String,
+    default: '#0a84ff',
+    env: 'UI_COLOR_PRIMARY'
+  },
+  ui_color_accent: {
+    format: String,
+    default: '#003eaa',
+    env: 'UI_COLOR_ACCENT'
+  },
+  custom_locale: {
+    format: String,
+    default: '',
+    env: 'CUSTOM_LOCALE'
+  },
+  ui_custom_assets: {
+    android_chrome_192px: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_ANDROID_CHROME_192PX'
+    },
+    android_chrome_512px: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_ANDROID_CHROME_512PX'
+    },
+    apple_touch_icon: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_APPLE_TOUCH_ICON'
+    },
+    favicon_16px: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_FAVICON_16PX'
+    },
+    favicon_32px: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_FAVICON_32PX'
+    },
+    icon: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_ICON'
+    },
+    safari_pinned_tab: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_SAFARI_PINNED_TAB'
+    },
+    facebook: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_FACEBOOK'
+    },
+    twitter: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_TWITTER'
+    },
+    wordmark: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_ASSETS_WORDMARK'
+    },
+    custom_css: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_CSS'
+    }
  }
 });

--- a/server/layout.js
+++ b/server/layout.js
@ -3,6 +3,10 @@ const assets = require('../common/assets');
 const initScript = require('./initScript');

 module.exports = function(state, body = '') {
+  const custom_css = state.ui.assets.custom_css !== ''
+    ? html`<link rel="stylesheet" type="text/css" href="${state.ui.assets.custom_css}" />`
+    : ''
+
  return html`
    <!DOCTYPE html>
    <html lang="${state.locale}">
@ -21,45 +25,51 @@ module.exports = function(state, body = '') {
        <meta property="og:description" content="${state.description}" />
        <meta name="twitter:description" content="${state.description}" />
        <meta name="twitter:card" content="summary" />
-        <meta
-          property="og:image"
-          content="${state.baseUrl}/${assets.get('send-fb.jpg')}"
-        />
-        <meta
-          name="twitter:image"
-          content="${state.baseUrl}/${assets.get('send-twitter.jpg')}"
-        />
+        <meta property="og:image" content="${state.ui.assets.facebook}" />
+        <meta name="twitter:image" content="${state.ui.assets.twitter}" />
        <meta property="og:url" content="${state.baseUrl}" />
        <meta name="theme-color" content="#220033" />
        <meta name="msapplication-TileColor" content="#220033" />

        <link rel="manifest" href="/app.webmanifest" />
        <link rel="stylesheet" type="text/css" href="/inter.css" />
+        <style nonce=${state.cspNonce}>
+          :root {
+            --color-primary: ${state.ui.colors.primary};
+            --color-primary-accent: ${state.ui.colors.accent};
+          }
+        </style>
+        <link
+          rel="stylesheet"
+          type="text/css"
+          href="/Chapril-banner/v2/chapril-banner.css"
+        />
        <link
          rel="stylesheet"
          type="text/css"
          href="${assets.get('app.css')}"
        />
+        ${custom_css}
        <link
          rel="apple-touch-icon"
          sizes="180x180"
-          href="${assets.get('apple-touch-icon.png')}"
+          href="${state.ui.assets.apple_touch_icon}"
        />
        <link
          rel="icon"
          type="image/png"
          sizes="32x32"
-          href="${assets.get('favicon-32x32.png')}"
+          href="${state.ui.assets.favicon_32px}"
        />
        <link
          rel="icon"
          type="image/png"
          sizes="16x16"
-          href="${assets.get('favicon-16x16.png')}"
+          href="${state.ui.assets.favicon_16px}"
        />
        <link
          rel="mask-icon"
-          href="${assets.get('safari-pinned-tab.svg')}"
+          href="${state.ui.assets.safari_pinned_tab}"
          color="#838383"
        />
        <script defer src="${assets.get('app.js')}"></script>
--- a/server/locale.js
+++ b/server/locale.js
@ -1,13 +1,15 @@
 const fs = require('fs');
 const path = require('path');
-const { FluentBundle } = require('@fluent/bundle');
+const { FluentBundle, FluentResource } = require('@fluent/bundle');
 const localesPath = path.resolve(__dirname, '../public/locales');
 const locales = fs.readdirSync(localesPath);

 function makeBundle(locale) {
  const bundle = new FluentBundle(locale, { useIsolating: false });
-  bundle.addMessages(
-    fs.readFileSync(path.resolve(localesPath, locale, 'send.ftl'), 'utf8')
+  bundle.addResource(
+    new FluentResource(
+      fs.readFileSync(path.resolve(localesPath, locale, 'send.ftl'), 'utf8')
+    )
  );
  return [locale, bundle];
 }
@ -19,8 +21,11 @@ module.exports = function getTranslator(locale) {
  const bundle = bundles.get(locale) || defaultBundle;
  return function(id, data) {
    if (bundle.hasMessage(id)) {
-      return bundle.format(bundle.getMessage(id), data);
+      return bundle.formatPattern(bundle.getMessage(id).value, data);
    }
-    return defaultBundle.format(defaultBundle.getMessage(id), data);
+    return defaultBundle.formatPattern(
+      defaultBundle.getMessage(id).value,
+      data
+    );
  };
 };
--- a/server/middleware/auth.js
+++ b/server/middleware/auth.js
@ -1,6 +1,7 @@
 const assert = require('assert');
 const crypto = require('crypto');
 const storage = require('../storage');
+const config = require('../config');
 const fxa = require('../fxa');

 module.exports = {
@ -70,10 +71,11 @@ module.exports = {
      const token = authHeader.split(' ')[1];
      req.user = await fxa.verify(token);
    }
-    if (req.user) {
-      next();
-    } else {
+
+    if (config.fxa_required && !req.user) {
      res.sendStatus(401);
+    } else {
+      next();
    }
  }
 };
--- a/server/routes/index.js
+++ b/server/routes/index.js
@ -50,6 +50,12 @@ module.exports = function(app) {
            return `'nonce-${req.cspNonce}'`;
          }
        ],
+        styleSrc: [
+          "'self'",
+          function(req) {
+            return `'nonce-${req.cspNonce}'`;
+          }
+        ],
        formAction: ["'none'"],
        frameAncestors: ["'none'"],
        objectSrc: ["'none'"],
--- a/server/routes/webmanifest.js
+++ b/server/routes/webmanifest.js
@ -1,18 +1,20 @@
-const assets = require('../../common/assets');
+const state = require('../state');
+
+module.exports = async function(req, res) {
+  const appState = await state(req);

-module.exports = function(req, res) {
  const manifest = {
    name: 'Send',
    short_name: 'Send',
    lang: req.language,
    icons: [
      {
-        src: assets.get('android-chrome-192x192.png'),
+        src: appState.ui.assets.android_chrome_192px,
        type: 'image/png',
        sizes: '192x192'
      },
      {
-        src: assets.get('android-chrome-512x512.png'),
+        src: appState.ui.assets.android_chrome_512px,
        type: 'image/png',
        sizes: '512x512'
      }
--- a/server/state.js
+++ b/server/state.js
@ -3,9 +3,18 @@ const layout = require('./layout');
 const assets = require('../common/assets');
 const getTranslator = require('./locale');
 const { getFxaConfig } = require('./fxa');
+const fs = require('fs');
+const path = require('path');

 module.exports = async function(req) {
-  const locale = req.language || 'en-US';
+  const locale = (() => {
+    if (config.custom_locale != '' && fs.existsSync(path.join(__dirname,'../public/locales',config.custom_locale))) {
+        return config.custom_locale;
+    }
+    else {
+      return req.language || 'en-US';
+    }
+  })();
  let authConfig = null;
  let robots = 'none';
  if (req.route && req.route.path === '/') {
@ -24,6 +33,23 @@ module.exports = async function(req) {
    prefs.surveyUrl = config.survey_url;
  }
  const baseUrl = config.deriveBaseUrl(req);
+  const uiAssets = {
+    android_chrome_192px: assets.get('android-chrome-192x192.png'),
+    android_chrome_512px: assets.get('android-chrome-512x512.png'),
+    apple_touch_icon: assets.get('apple-touch-icon.png'),
+    favicon_16px: assets.get('favicon-16x16.png'),
+    favicon_32px: assets.get('favicon-32x32.png'),
+    icon: assets.get('icon.svg'),
+    safari_pinned_tab: assets.get('safari-pinned-tab.svg'),
+    facebook: baseUrl + '/' + assets.get('send-fb.jpg'),
+    twitter: baseUrl + '/' + assets.get('send-twitter.jpg'),
+    wordmark: assets.get('wordmark.svg') + '#logo',
+    custom_css: ''
+  };
+  Object.keys(uiAssets).forEach(index => {
+    if (config.ui_custom_assets[index] !== '')
+      uiAssets[index] = config.ui_custom_assets[index];
+  });
  return {
    archive: {
      numFiles: 0
@ -31,11 +57,17 @@ module.exports = async function(req) {
    locale,
    capabilities: { account: false },
    translate: getTranslator(locale),
-    title: 'Send',
+    title: 'DropChaprilOrg',
    description:
      'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
    baseUrl,
-    ui: {},
+    ui: {
+      colors: {
+        primary: config.ui_color_primary,
+        accent: config.ui_color_accent
+      },
+      assets: uiAssets
+    },
    storage: {
      files: []
    },
--- a/server/storage/fs.js
+++ b/server/storage/fs.js
@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 const promisify = require('util').promisify;
-const mkdirp = require('mkdirp');

 const stat = promisify(fs.stat);

@ -9,7 +8,9 @@ class FSStorage {
  constructor(config, log) {
    this.log = log;
    this.dir = config.file_dir;
-    mkdirp.sync(this.dir);
+    fs.mkdirSync(this.dir, {
+      recursive: true
+    });
  }

  async length(id) {
--- a/tailwind.config.js
+++ b/tailwind.config.js
@ -1,5 +1,7 @@
 const colors = {
  transparent: 'transparent',
+  primary: 'var(--color-primary)',
+  primary_accent: 'var(--color-primary-accent)',

  black: '#000000',
  'grey-90': '#0c0c0d',
@ -16,93 +18,12 @@ const colors = {
  'grey-10': '#f9f9fa',
  white: '#ffffff',

-  'red-90': '#3e0200',
-  'red-80': '#5a0002',
-  'red-70': '#a4000f',
-  'red-60': '#d70022',
-  red: '#d70022',
-  'red-50': '#ff0039',
-  // unspec
-  'red-40': '#ff3363',
-  'red-30': '#ff99aa',
-
-  'orange-90': '#3e1300',
-  'orange-80': '#712b00',
-  'orange-70': '#a44900',
-  'orange-60': '#d76e00',
-  'orange-50': '#ff9400',
-  // unspec
-  'orange-40': '#ffb24c',
-  'orange-30': '#ffd399',
-
-  'yellow-90': '#3e2800',
-  'yellow-80': '#715100',
-  'yellow-70': '#a47f00',
-  'yellow-60': '#d7b600',
-  yellow: '#d7b600',
-  'yellow-50': '#ffe900',
-  'yellow-40': '#ffed4c',
-  'yellow-30': '#fff599',
-
-  // 'green-darkest': '#003706',
-  // 'green-darker': '#006504',
-  // 'green-dark': '#058b00',
-  // green: '#12bc00',
-  // 'green-light': '#51d88a',
-  // 'green-lighter': '#a2f5bf',
-  // 'green-lightest': '#e3fcec',
-
-  // 'teal-darkest': '#0d3331',
-  // 'teal-darker': '#20504f',
-  // 'teal-dark': '#38a89d',
-  // teal: '#4dc0b5',
-  // 'teal-light': '#64d5ca',
-  // 'teal-lighter': '#a0f0ed',
-  // 'teal-lightest': '#e8fffe',
-
-  'blue-90': '#000f40',
-  'blue-80': '#002275',
-  'blue-70': '#003eaa',
-  'blue-60': '#0060df',
-  'blue-50': '#0a84ff',
-  blue: '#0a84ff',
-  'blue-40': '#45a1ff',
-  'blue-30': '#99ccff',
-  'blue-20': '#cce6ff',
-
-  'ink-90': '#0f1126',
-  'ink-80': '#202340',
-  'ink-70': '#363959',
-
-  // 'indigo-darkest': '#191e38',
-  // 'indigo-darker': '#2f365f',
-  // 'indigo-dark': '#5661b3',
-  // indigo: '#6574cd',
-  // 'indigo-light': '#7886d7',
-  // 'indigo-lighter': '#b2b7ff',
-  // 'indigo-lightest': '#e6e8ff',
-
-  'purple-90': '#25003e',
-  'purple-80': '#440071',
-  'purple-70': '#6200a4',
-  'purple-60': '#8000d7',
-  'purple-50': '#9400ff',
-  'purple-40': '#ad3bff',
-  'purple-30': '#c069ff',
-  'purple-20': '#d7a3ff',
-
-  // 'pink-darkest': '#451225',
-  // 'pink-darker': '#6f213f',
-  // 'pink-dark': '#eb5286',
-  // pink: '#f66d9b',
-  // 'pink-light': '#fa7ea8',
-  // 'pink-lighter': '#ffbbca',
-  // 'pink-lightest': '#ffebef',
  cloud: 'rgba(255, 255, 255, 0.8)',
  violet: 'hsl(258, 57%, 35%)'
 };

 module.exports = {
+  purge: false,
  theme: {
    colors: colors,
    screens: {
--- a/test/frontend/runner.js
+++ b/test/frontend/runner.js
@ -1,7 +1,6 @@
 /* eslint-disable no-undef, no-process-exit */
 const fs = require('fs');
 const path = require('path');
-const mkdirp = require('mkdirp');
 const puppeteer = require('puppeteer');
 const webpack = require('webpack');
 const config = require('../../webpack.config');
@ -44,7 +43,9 @@ const server = app.listen(async function() {
    const coverage = await page.evaluate(() => __coverage__);
    if (coverage) {
      const dir = path.resolve(__dirname, '../../.nyc_output');
-      mkdirp.sync(dir);
+      fs.mkdirSync(dir, {
+        recursive: true
+      });
      fs.writeFileSync(
        path.resolve(dir, 'frontend.json'),
        JSON.stringify(coverage)
--- a/test/wdio.common.conf.js
+++ b/test/wdio.common.conf.js
@ -1,9 +1,11 @@
 const path = require('path');
-const mkdirp = require('mkdirp');
+const fs = require('fs');
 const rimraf = require('rimraf');
 const dir = path.join(__dirname, 'integration', 'downloads');

-mkdirp.sync(dir);
+fs.mkdirSync(dir, {
+  recursive: true
+});
 rimraf.sync(`${dir}${path.sep}*`);

 exports.config = {
--- a/webpack.config.js
+++ b/webpack.config.js
@ -42,7 +42,8 @@ const serviceWorker = {
        test: /\.(png|jpg)$/,
        loader: 'file-loader',
        options: {
-          name: '[name].[contenthash:8].[ext]'
+          name: '[name].[contenthash:8].[ext]',
+          esModule: false
        }
      },
      {
@ -51,16 +52,26 @@ const serviceWorker = {
          {
            loader: 'file-loader',
            options: {
-              name: '[name].[contenthash:8].[ext]'
+              name: '[name].[contenthash:8].[ext]',
+              esModule: false
            }
          },
          {
            loader: 'svgo-loader',
            options: {
              plugins: [
-                { removeViewBox: false }, // true causes stretched images
-                { convertStyleToAttrs: true }, // for CSP, no unsafe-eval
-                { removeTitle: true } // for smallness
+                {
+                  name: 'removeViewBox',
+                  active: false // true causes stretched images
+                },
+                {
+                  name: 'convertStyleToAttrs',
+                  active: true // for CSP, no unsafe-eval
+                },
+                {
+                  name: 'removeTitle',
+                  active: true // for smallness
+                }
              ]
            }
          }
@ -127,7 +138,8 @@ const web = {
        test: /\.(png|jpg)$/,
        loader: 'file-loader',
        options: {
-          name: '[name].[contenthash:8].[ext]'
+          name: '[name].[contenthash:8].[ext]',
+          esModule: false
        }
      },
      {
@ -136,17 +148,30 @@ const web = {
          {
            loader: 'file-loader',
            options: {
-              name: '[name].[contenthash:8].[ext]'
+              name: '[name].[contenthash:8].[ext]',
+              esModule: false
            }
          },
          {
            loader: 'svgo-loader',
            options: {
              plugins: [
-                { cleanupIDs: false },
-                { removeViewBox: false }, // true causes stretched images
-                { convertStyleToAttrs: true }, // for CSP, no unsafe-eval
-                { removeTitle: true } // for smallness
+                {
+                  name: 'cleanupIDs',
+                  active: false
+                },
+                {
+                  name: 'removeViewBox',
+                  active: false // true causes stretched images
+                },
+                {
+                  name: 'convertStyleToAttrs',
+                  active: true // for CSP, no unsafe-eval
+                },
+                {
+                  name: 'removeTitle',
+                  active: true // for smallness
+                }
              ]
            }
          }
@ -160,7 +185,8 @@ const web = {
            {
              loader: 'css-loader',
              options: {
-                importLoaders: 1
+                importLoaders: 1,
+                esModule: false
              }
            },
            'postcss-loader'
@ -184,12 +210,14 @@ const web = {
    ]
  },
  plugins: [
-    new CopyPlugin([
-      {
-        context: 'public',
-        from: '*.*'
-      }
-    ]),
+    new CopyPlugin({
+      patterns: [
+        {
+          context: 'public',
+          from: '*.*'
+        }
+      ]
+    }),
    new webpack.EnvironmentPlugin(['NODE_ENV']),
    new webpack.IgnorePlugin(/\.\.\/dist/), // used in common/*.js
    new ExtractTextPlugin({
Author	SHA1	Message	Date
Romain H	8f8f2b9909	update chapril banner to v2	2023-04-03 22:05:47 +02:00
Romain H	669eedbf03	hardcode default dlimits to 100	2023-04-03 22:05:27 +02:00
Romain H	59a0c99142	add expiration time 2 days	2023-04-03 22:04:37 +02:00
Christian P. MOMON	55afcd2ce7	Extend max values (#4229 ).	2023-04-03 22:04:37 +02:00
Christian P. MOMON	83e0ae6303	Fixed chapril.css.	2023-04-03 22:04:37 +02:00
Christian P. MOMON	d948e8efc7	Fixed title page (#4137 ).	2023-04-03 22:04:37 +02:00
Christian P. MOMON	deb795625c	Customized introduction text in welcome page.	2023-04-03 22:04:37 +02:00
Christian P. MOMON	898e9742c9	Customized header, footer and promo boxes (#4042 ).	2023-04-03 22:04:37 +02:00
Christian P. MOMON	9cb706fa73	Customized favicon (#4069 ).	2023-04-03 22:04:37 +02:00
timvisee	6fff664947	Bump version to 3.4.23	2023-02-14 13:42:39 +01:00
timvisee	439ac0ab7c	Update dependencies	2023-02-14 13:41:10 +01:00
timvisee	dee6b3e9cc	Merge branch 'tdulcet-passphrase' into master See https://github.com/timvisee/send/pull/147	2023-02-14 13:38:30 +01:00
Teal Dulcet	dc9d072472	Increased password length limit to support passphrases.	2023-02-14 04:36:19 -08:00
timvisee	65730db0db	Bump version to 3.4.22	2023-01-16 17:23:07 +01:00
timvisee	a86221b1cc	Update dependencies	2023-01-16 17:00:14 +01:00
dependabot[bot]	bcc53f73c6	Bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-11 11:27:01 +00:00
dependabot[bot]	b0444f488b	Bump convict from 6.2.3 to 6.2.4 Bumps [convict](https://github.com/mozilla/node-convict) from 6.2.3 to 6.2.4. - [Release notes](https://github.com/mozilla/node-convict/releases) - [Changelog](https://github.com/mozilla/node-convict/blob/master/CHANGELOG.md) - [Commits](https://github.com/mozilla/node-convict/commits) --- updated-dependencies: - dependency-name: convict dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-10 22:22:09 +00:00
Tim Visée	70a11e5300	Merge branch 'reset-dlimit-to-default' into 'master' Reset download limit to default after uploading files See merge request timvisee/send!30	2023-01-10 20:50:13 +00:00
Jun Omae	f62a99882d	Reset download limit to default after uplaoding files	2023-01-06 17:42:45 +09:00
timvisee	309c7d63ac	Change GitLab CI test image to node 16, add missing packages for testing	2022-12-20 20:04:45 +01:00
dependabot[bot]	1d75366f66	Bump loader-utils from 1.4.1 to 1.4.2 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-18 00:43:28 +00:00
timvisee	0a849fb7c6	Revert "Bump node-forge and webpack-dev-server" This reverts commit `88725df09d`.	2022-11-14 19:43:09 +01:00
dependabot[bot]	88725df09d	Bump node-forge and webpack-dev-server Bumps [node-forge](https://github.com/digitalbazaar/forge) to 1.3.1 and updates ancestor dependency [webpack-dev-server](https://github.com/webpack/webpack-dev-server). These dependencies need to be updated together. Updates `node-forge` from 0.10.0 to 1.3.1 - [Release notes](https://github.com/digitalbazaar/forge/releases) - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](https://github.com/digitalbazaar/forge/compare/0.10.0...v1.3.1) Updates `webpack-dev-server` from 3.11.3 to 4.11.1 - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.11.3...v4.11.1) --- updated-dependencies: - dependency-name: node-forge dependency-type: indirect - dependency-name: webpack-dev-server dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 18:35:44 +00:00
dependabot[bot]	5a92e7e5e7	Bump minimatch and mocha Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.2 and updates ancestor dependency [mocha](https://github.com/mochajs/mocha). These dependencies need to be updated together. Updates `minimatch` from 3.0.4 to 3.1.2 - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) Updates `mocha` from 6.2.3 to 10.1.0 - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v6.2.3...v10.1.0) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect - dependency-name: mocha dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-14 18:32:13 +00:00
dependabot[bot]	71541fc2b6	Bump loader-utils from 1.4.0 to 1.4.1 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-09 03:16:30 +00:00
timvisee	5b4c0d2540	Merge branch 'JoshAtticus-patch-1' into master See https://github.com/timvisee/send/pull/115	2022-10-05 16:05:01 +02:00
Josh	e7f3c91d0b	Update config.js	2022-09-19 15:46:47 +08:00
Josh	8bb198b73e	Remove firefox link	2022-09-17 12:33:03 +08:00
Tim Visée	9e188bc76c	Merge branch 'registry-credentials' into 'master' Refactor CI See merge request timvisee/send!26	2022-09-14 14:37:33 +00:00
Marian Hähnlein	1353a54c49	Refactor CI	2022-09-12 13:53:00 +02:00
Tim Visée	4ae007167d	Merge branch 'custom-css-undefined' into 'master' Change default value for custom css to empty string See merge request timvisee/send!25	2022-09-09 12:34:16 +00:00
Marian Hähnlein	660f36e584	Change default value for custom css to empty string	2022-09-08 14:16:00 +02:00
timvisee	3dede083cd	Bump version to 3.4.21	2022-09-04 12:48:04 +02:00
timvisee	26e81455ff	Update dependencies	2022-09-04 12:47:40 +02:00
timvisee	4ceac20623	Revert "Remove some polyfills" This reverts commit `64644b57e3`.	2022-09-04 12:26:12 +02:00
timvisee	073accfe65	Revert "Update eslint & plugins" This reverts commit `38746b86fd`.	2022-09-04 12:26:10 +02:00
timvisee	6306a433e8	Revert "More dependency cleanups" This reverts commit `e1d6224570`.	2022-09-04 12:26:09 +02:00
timvisee	1da317bcc1	Revert "Further dependency cleanup" This reverts commit `1725ff434e`.	2022-09-04 12:26:07 +02:00
timvisee	08f597405c	Revert "Remove double-ended-queue" This reverts commit `9b8b11ffc3`.	2022-09-04 12:26:05 +02:00
timvisee	c624766edc	Revert "Remove asmcrypto.js" This reverts commit `c619be58ae`.	2022-09-04 12:26:03 +02:00
Tim Visée	e030c46a9c	Merge branch 'fix-csp' into 'master' Fix CSP Closes #29 See merge request timvisee/send!24	2022-08-22 15:27:03 +00:00
Marian Hähnlein	d081affa38	Move injection of custom CSS from client to server	2022-08-19 13:17:59 +02:00
Marian Hähnlein	71372fcbc1	Replace tabs with spaces to maintain consistency	2022-08-19 13:11:30 +02:00
HrBingR	671390ca24	Added the ability for a user to define and set a custom locale New environment variable CUSTOM_LOCALE allows a user to define a locale per the /public/locales directory (this should be listed in the docs, will create a pull request for that too). If the environment variable is blank or invalid it reverts to previous behaviour of system + default locale. Fully tested the above as follows: CUSTOM_LOCALE = 'nl' < This works correctly, translating to nl. CUSTOM_LOCALE = 'HelloThere' < This reverts to previous behavior CUSTOM_LOCALE = '' < Also reverts #CUSTOM_LOCALE = < Also reverts	2022-08-13 02:25:19 +02:00
HrBingR	9221b86660	Merge branch 'timvisee:master' into master	2022-08-13 02:20:33 +02:00
HrBingR	fd2e954b3e	Updated docs to include custom CSS and custom footer.	2022-08-12 21:57:14 +02:00
timvisee	c528ad3147	Merge branch 'HrBingR-master' into master See https://github.com/timvisee/send/pull/103	2022-08-12 12:35:56 +02:00
HrBingR	df9c7ea734	Merge branch 'timvisee:master' into master	2022-08-11 23:06:47 +02:00
HrBingR	e32ea7d0aa	Added the ability to define a custom footer via environment variables Added the CUSTOM_FOOTER_TEXT and CUSTOM_FOOTER_URL environment variables. If undefined, the default translated footer will display. If only CUSTOM_FOOTER_TEXT is defined, only this defined text will display in place of the normal footer text. If only CUSTOM_FOOTER_URL is defined then the defined URL will display. If both variables are defined, the defined text will display as a link to the defined URL.	2022-08-11 23:04:45 +02:00
timvisee	55ad08fd96	Merge branch 'HrBingR-master' into master See https://github.com/timvisee/send/pull/100	2022-08-11 10:07:14 +02:00
timvisee	96d53e4118	Merge branch 'master' of github.com:HrBingR/send into HrBingR-master	2022-08-11 10:06:45 +02:00
HrBingR	bce861bcaf	Added if check to see if user is using custom CSS	2022-08-10 22:55:51 +02:00
timvisee	643287e235	Merge branch 'AaronDewes-chore/cleanup-dependencies' into master See https://github.com/timvisee/send/pull/101	2022-08-10 19:04:33 +02:00
AaronDewes	c619be58ae	Remove asmcrypto.js	2022-08-09 16:18:16 +00:00
AaronDewes	9b8b11ffc3	Remove double-ended-queue Not required anymore since node-redis 3.0	2022-08-09 15:39:41 +00:00
AaronDewes	1725ff434e	Further dependency cleanup	2022-08-09 15:37:16 +00:00
AaronDewes	e1d6224570	More dependency cleanups	2022-08-09 15:29:54 +00:00
AaronDewes	38746b86fd	Update eslint & plugins Also replace eslint-plugin-node with the maintained eslint-plugin-n	2022-08-09 15:26:25 +00:00
AaronDewes	64644b57e3	Remove some polyfills This should reduce the runtime size & load times somewhat by removing polyfills for older browsers which are not used much	2022-08-09 15:17:38 +00:00
timvisee	625fdf5bca	Merge branch 'AaronDewes-update-deps' into master See https://github.com/timvisee/send/pull/98	2022-08-09 16:20:33 +02:00
AaronDewes	951c613095	Fix stylelint errors	2022-08-09 09:12:32 +00:00
AaronDewes	16e78847a2	Fix style problems	2022-08-09 09:00:43 +00:00
HrBingR	310271c10f	Added new environment variables for custom css, custom title, and custom description. Fully tested using the Dockerfile, example can be found on https://fileshare.thenextweb.co.za	2022-08-08 00:37:17 +02:00
AaronDewes	55344f8a9d	Drop mkdirp	2022-07-26 17:23:19 +00:00
AaronDewes	2b22e8cd05	Update more dependencies	2022-07-26 17:21:12 +00:00
AaronDewes	47ff32fc9f	Modernize CSS	2022-07-26 16:52:29 +00:00
AaronDewes	b598a1c090	Update svgo	2022-07-26 11:56:20 +00:00
AaronDewes	3ae9e6adeb	Update git-rev-sync	2022-07-26 11:18:17 +00:00
AaronDewes	33e7e0f5ba	npm audit fix	2022-07-26 11:15:12 +00:00
AaronDewes	ca3b5cf7ca	Update more packages	2022-07-26 11:05:53 +00:00
AaronDewes	44a25e4156	Update fluent	2022-07-26 11:03:10 +00:00
timvisee	000854104f	Merge branch 'NamPNQ-master' into master See https://github.com/timvisee/send/pull/94	2022-07-04 18:40:45 +02:00
Nam PHAM	1a0ddf9a05	Disable check user when fxa is not enabled	2022-07-02 23:48:04 +02:00
dependabot[bot]	0ac1eeed2c	Bump got from 11.8.3 to 11.8.5 Bumps [got](https://github.com/sindresorhus/got) from 11.8.3 to 11.8.5. - [Release notes](https://github.com/sindresorhus/got/releases) - [Commits](https://github.com/sindresorhus/got/compare/v11.8.3...v11.8.5) --- updated-dependencies: - dependency-name: got dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-24 05:02:22 +00:00
dependabot[bot]	2457545502	Bump eventsource from 1.1.0 to 1.1.1 Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/EventSource/eventsource/releases) - [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md) - [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: eventsource dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-01 20:39:30 +00:00
dependabot[bot]	75637807eb	Bump convict from 6.2.2 to 6.2.3 Bumps [convict](https://github.com/mozilla/node-convict) from 6.2.2 to 6.2.3. - [Release notes](https://github.com/mozilla/node-convict/releases) - [Changelog](https://github.com/mozilla/node-convict/blob/master/CHANGELOG.md) - [Commits](https://github.com/mozilla/node-convict/compare/v6.2.2...v6.2.3) --- updated-dependencies: - dependency-name: convict dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-05-26 02:57:43 +00:00
timvisee	3b0ef1c0d6	Bump version to 3.4.20	2022-05-12 21:57:02 +02:00
timvisee	22c9560855	Update package-lock.json	2022-05-12 21:56:10 +02:00
Tim Visée	dda964ebf9	Merge branch 'feature/branding' into 'master' Add ability to change the branding See merge request timvisee/send!23	2022-05-12 19:52:46 +00:00
Marian Hähnlein	560747106b	Add ability to change the branding	2022-05-02 13:38:16 +02:00
timvisee	81741dcc76	Bump version to 3.4.19	2022-04-25 10:33:18 +02:00
timvisee	58a0800384	Add package for extracted ipaddress format from convic	2022-04-25 10:30:48 +02:00
timvisee	7323f584c1	Merge branch 'dependabot/npm_and_yarn/convict-6.2.2' into master See https://github.com/timvisee/send/pull/83	2022-04-25 10:04:58 +02:00
dependabot[bot]	c616412449	Bump convict from 5.2.1 to 6.2.2 Bumps [convict](https://github.com/mozilla/node-convict) from 5.2.1 to 6.2.2. - [Release notes](https://github.com/mozilla/node-convict/releases) - [Changelog](https://github.com/mozilla/node-convict/blob/master/CHANGELOG.md) - [Commits](https://github.com/mozilla/node-convict/compare/v5.2.1...v6.2.2) --- updated-dependencies: - dependency-name: convict dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-20 21:04:28 +00:00
timvisee	b9faece68e	Merge branch 'dependabot/npm_and_yarn/minimist-1.2.6' into master See https://github.com/timvisee/send/pull/80	2022-04-07 14:10:40 +02:00
dependabot[bot]	097bdf8853	Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-07 11:27:32 +00:00
timvisee	e96e09f664	Update dependencies	2022-04-07 13:22:46 +02:00