Merge branch 'Release-3.3' into 'master'

Release 3.3

Closes nextcloud#4, nextcloud#5, nextcloud#44, nextcloud#49,  nextcloud#53, nextcloud#59, nextcloud#61

See merge request joendres/filelink-nextcloud!31

Author: joendres

.gitlab-ci.yml

@@ -0,0 +1,48 @@
+image: node:lts
+
+cache:
+  key: ${CI_COMMIT_REF_SLUG}
+  paths:
+    - node_modules/
+
+before_script:
+  - npm install node-fetch
+  - npm install web-ext
+  - npm install jshint
+
+lint:
+  stage: test
+  script:
+    # web-ext fails if parameters of different run modes are set
+    - unset WEB_EXT_API_KEY
+    - unset WEB_EXT_API_SECRET
+    - npx web-ext lint
+    - npx jshint src
+
+pages:
+  stage: deploy
+  script:
+    - node build-tools/build-pages.js
+    # web-ext fails if parameters of different run modes are set
+    - unset WEB_EXT_API_KEY
+    - unset WEB_EXT_API_SECRET
+    - npx web-ext build
+    - for z in public/*.zip; do mv -- "$z" "${z%zip}xpi"; done
+  artifacts:
+    paths:
+      - public
+  only:
+    - master
+    - tags
+
+sign:
+  stage: deploy
+  script:
+    # web-ext sign always fails (as documented), so manipulate the return code
+    - npx web-ext sign --channel=listed --api-url-prefix=https://addons.thunderbird.net/api/v3 ; true
+  environment:
+    name: production
+    url: https://addons.thunderbird.net/de/thunderbird/addon/filelink-nextcloud-owncloud/
+  only:
+    # Only sign tagged releases
+    - /^v\d+\.\d+\.\d+$/

.vscode/settings.json

@@ -1,22 +1,4 @@
 {
-    "jshint.options": {
-        "moz": true,
-        "esversion": 9,
-        "browser": true,
-        "predef": [
-            "browser",
-            "AbortController"
-        ],
-        "curly": true,
-        "eqeqeq": true,
-        "futurehostile": true,
-        "nocomma": true,
-        "strict": "implied",
-        "trailingcomma": true,
-        "undef": true,
-        "unused": true,
-        "-W098": true
-    },
     "cSpell.words": [
         "Geoff",
         "Lankow",
@@ -31,5 +13,8 @@
         "webdav"
     ],
     "cSpell.language": "de,en",
-    "cSpell.allowCompoundWords": true
+    "cSpell.allowCompoundWords": true,
+    "git.alwaysSignOff": true,
+    "git.fetchOnPull": true,
+    "git.untrackedChanges": "separate"
 }

CHANGELOG

@@ -1,3 +1,10 @@
+3.3.0 2020-01-??
+- Catalan translation by @josepmanel 
+- Spanish translation by @josepmanel (Close #3)
+- French translation by @Go-rom (Close #4)
+- Close #49: Photon style for preferences pane (kind of)
+- Internal changes to prepare for 3.4
+ 
 3.2.1 2020-01-19
 - Fix #57: Help text for expire settings missing
 - Fix #56: Expire number input field too wide

README.md

@@ -56,7 +56,7 @@ then attach a synced file from your computer to a message, __*cloud__ will
 notice that it's already uploaded. This might not work with uploads from the
 mobile clients, but I haven't tested it.
 
- * If you attach a file with the same name but different contents as a cloud file, the cloud file will not by overwritten. Instead __*cloud__ moves the existing file to a subfolder of the attachments folder; the original share link will remain valid and point to the old content.\
+ * If you attach a file with the same name but different contents as a cloud file, the cloud file will not be overwritten. Instead __*cloud__ moves the existing file to a subfolder of the attachments folder; the original share link will remain valid and point to the old content.\
  Then the new file is uploaded and shared with a new share link.
 
 __*cloud__ uses the same method as the
@@ -134,6 +134,10 @@ platforms, have a feature suggestion or any other comment, just contact
   If you are developing WebExtensions, you want to use this tool. For debugging
   just set the ```firefox``` config option to your thunderbird binary.
 
+## Contributors
+* [Johannes Endres](@joendres), initial implementation, maintainer
+* [Josep Manel Mendoza](@josepmanel), catalan and spanish translations
+
 ## References
 
 * Based on [FileLink Provider for

build-tools/.jshintrc

@@ -0,0 +1,12 @@
+{
+    "node": true,
+    "esversion": 6,
+    "curly": true,
+    "eqeqeq": true,
+    "futurehostile": true,
+    "nocomma": true,
+    "strict": "implied",
+    "trailingcomma": true,
+    "undef": true,
+    "unused": true
+}

build-tools/build-pages.js

@@ -0,0 +1,29 @@
+/* Translates README.md into an html page using gitlab's API */
+
+const fetch = require("node-fetch");
+const fs = require('fs');
+
+const url = "https://gitlab.com/api/v4/markdown";
+
+const htmlhead = `<!DOCTYPE html>
+    <html lang="en">
+    <meta charset="UTF-8">
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <link rel="stylesheet" href="style.css">
+    <title>*cloud - Filelink for Nextcloud and ownCloud</title>`;
+
+const data = {
+    text: fs.readFileSync("README.md", "utf-8"),
+    gfm: true,
+    project: "joendres/filelink-nextcloud",
+};
+
+const fetchInit = {
+    method: "POST",
+    body: JSON.stringify(data),
+    headers: { "Content-Type": "application/json", },
+};
+
+fetch(url, fetchInit)
+    .then(response => response.json())
+    .then(json => fs.writeFileSync("public/index.html", htmlhead + json.html));

jsconfig.json

@@ -0,0 +1,11 @@
+body {
+  font-family: sans-serif;
+  padding-left: 2em;
+}
+
+h1 {
+  background-image: url("logo.png");
+  background-repeat: no-repeat;
+  background-size: 2rem;
+  background-position: right;
+}