true if the write limit was reached,
+ * false otherwise
+ * @since Apache Tika 2.0
+ */
+ public static boolean isWriteLimitReached(Throwable t) {
+ return isWriteLimitReached(t, 0);
+ }
+
+ private static boolean isWriteLimitReached(Throwable t, int depth) {
+ if (t == null) {
+ return false;
+ }
+ if (depth > MAX_DEPTH) {
+ return false;
+ }
+ if (t instanceof WriteLimitReachedException) {
+ return true;
+ } else {
+ return t.getCause() != null && isWriteLimitReached(t.getCause(), depth + 1);
+ }
+ }
+
+ public static void throwIfWriteLimitReached(Exception ex) throws SAXException {
+ throwIfWriteLimitReached(ex, 0);
+ }
+
+ private static void throwIfWriteLimitReached(Exception ex, int depth) throws SAXException {
+ if (ex == null) {
+ return;
+ }
+ if (depth > MAX_DEPTH) {
+ return;
+ }
+ if (ex instanceof WriteLimitReachedException) {
+ throw (SAXException) ex;
+ } else {
+ isWriteLimitReached(ex.getCause(), depth + 1);
+ }
+ }
+}
diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
new file mode 100644
index 00000000..416be0fc
--- /dev/null
+++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.parser.odf;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+
+import org.apache.tika.extractor.EmbeddedDocumentExtractor;
+import org.apache.tika.extractor.EmbeddedDocumentUtil;
+import org.apache.tika.io.TikaInputStream;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.sax.ContentHandlerDecorator;
+import org.apache.tika.utils.XMLReaderUtils;
+
+/**
+ * Handler for macros in flat open documents
+ */
+class FlatOpenDocumentMacroHandler extends ContentHandlerDecorator {
+
+ static String MODULE = "module";
+ static String NAME = "name";
+ private static String SOURCE_CODE = "source-code";
+ private final ContentHandler contentHandler;
+ private final ParseContext parseContext;
+ private final StringBuilder macroBuffer = new StringBuilder();
+ String macroName = null;
+ boolean inMacro = false;
+ private EmbeddedDocumentExtractor embeddedDocumentExtractor;
+
+ FlatOpenDocumentMacroHandler(ContentHandler contentHandler, ParseContext parseContext) {
+ super(contentHandler);
+ this.contentHandler = contentHandler;
+ this.parseContext = parseContext;
+ }
+
+ @Override
+ public void startElement(String namespaceURI, String localName, String qName, Attributes attrs)
+ throws SAXException {
+ if (MODULE.equals(localName)) {
+ macroName = XMLReaderUtils.getAttrValue(NAME, attrs);
+ } else if (SOURCE_CODE.equals(localName)) {
+ inMacro = true;
+ }
+ }
+
+ @Override
+ public void characters(char[] ch, int start, int length) throws SAXException {
+ if (inMacro) {
+ macroBuffer.append(ch, start, length);
+ }
+ }
+
+ @Override
+ public void endElement(String namespaceURI, String localName, String qName)
+ throws SAXException {
+ if (SOURCE_CODE.equals(localName)) {
+ try {
+ handleMacro();
+ } catch (IOException e) {
+ throw new SAXException(e);
+ } finally {
+ resetMacroState();
+ }
+ }
+ }
+
+ protected void resetMacroState() {
+ macroBuffer.setLength(0);
+ macroName = null;
+ inMacro = false;
+ }
+
+ protected void handleMacro() throws IOException, SAXException {
+
+ byte[] bytes = macroBuffer.toString().getBytes(StandardCharsets.UTF_8);
+
+ if (embeddedDocumentExtractor == null) {
+ embeddedDocumentExtractor =
+ EmbeddedDocumentUtil.getEmbeddedDocumentExtractor(parseContext);
+ }
+ Metadata embeddedMetadata = new Metadata();
+ if (!isBlank(macroName)) {
+ embeddedMetadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, macroName);
+ }
+ embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE,
+ TikaCoreProperties.EmbeddedResourceType.MACRO.toString());
+
+ if (embeddedDocumentExtractor.shouldParseEmbedded(embeddedMetadata)) {
+ try (InputStream is = TikaInputStream.get(bytes)) {
+ embeddedDocumentExtractor
+ .parseEmbedded(is, contentHandler, embeddedMetadata, false);
+ }
+ }
+ }
+
+ private static boolean isBlank(String s) {
+ return s == null || s.trim().isEmpty();
+ }
+}
diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java
index 80b2301c..2193e83b 100644
--- a/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java
+++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java
@@ -1,31 +1,32 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tika.parser.odf;
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package org.apache.tika.parser.odf;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Locale;
-import org.apache.tika.sax.ContentHandlerDecorator;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Locale;
+import org.apache.tika.sax.ContentHandlerDecorator;
/**
* Content handler decorator that:can appear inside comments and other things that are already inside
+ //we need to track our pDepth and only output
if we're at the main level
+
+ // map the heading level to can appear inside comments and other things that are already inside
- //we need to track our pDepth and only output if we're at the main level
-
-
- private OpenDocumentElementMappingContentHandler(ContentHandler handler,
- Map Left pad a String with a specified String. Pad to a size of {@code size}. Returns padding using the specified delimiter repeated
+ * to a given length. Note: this method does not support padding with
+ * Unicode Supplementary Characters
+ * as they require a pair of {@code char}s to be represented.
+ * If you are needing to support full I18N of your applications
+ * consider using {@link #repeat(String, int)} instead.
+ * Repeat a String {@code repeat} times to form a
+ * new String.
{{ title }}
content.xml files.
*/
public class OpenDocumentContentParser extends AbstractParser {
- private interface Style {
- }
-
- private static class TextStyle implements Style {
- public boolean italic;
- public boolean bold;
- public boolean underlined;
-
- @Override
- public String toString() {
- return "TextStyle{" +
- "italic=" + italic +
- ", bold=" + bold +
- ", underlined=" + underlined +
- '}';
- }
- }
-
- private static class ListStyle implements Style {
- public boolean ordered;
-
- public String getTag() {
- return ordered ? "ol" : "ul";
- }
- }
-
- private static final class OpenDocumentElementMappingContentHandler extends
- ElementMappingContentHandler {
- private static final char[] SPACE = new char[]{ ' '};
- private static final String CLASS = "class";
- private static final Attributes ANNOTATION_ATTRIBUTES = buildAttributes(CLASS, "annotation");
- private static final Attributes NOTE_ATTRIBUTES = buildAttributes(CLASS, "note");
- private static final Attributes NOTES_ATTRIBUTES = buildAttributes(CLASS, "notes");
-
- private static Attributes buildAttributes(String key, String value) {
- AttributesImpl attrs = new AttributesImpl();
- attrs.addAttribute("", key, key, "CDATA", value);
- return attrs;
- }
-
- private final ContentHandler handler;
- private final BitSet textNodeStack = new BitSet();
- private int nodeDepth = 0;
- private int completelyFiltered = 0;
- private Stackmeta.xml files.
@@ -54,68 +58,54 @@ public class OpenDocumentMetaParser extends XMLParser {
private static final String META_NS = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0";
private static final XPathParser META_XPATH = new XPathParser("meta", META_NS);
- /**
- * @see OfficeOpenXMLCore#SUBJECT
- * @deprecated use OfficeOpenXMLCore#SUBJECT
- */
- @Deprecated
- private static final Property TRANSITION_INITIAL_CREATOR_TO_INITIAL_AUTHOR =
- Property.composite(Office.INITIAL_AUTHOR,
- new Property[]{Property.externalText("initial-creator")});
-
- private static ContentHandler getDublinCoreHandler(
- Metadata metadata, Property property, String element) {
- return new ElementMetadataHandler(
- DublinCore.NAMESPACE_URI_DC, element,
- metadata, property);
+ private static ContentHandler getDublinCoreHandler(Metadata metadata, Property property,
+ String element) {
+ return new ElementMetadataHandler(DublinCore.NAMESPACE_URI_DC, element, metadata, property);
}
- private static ContentHandler getMeta(
- ContentHandler ch, Metadata md, Property property, String element) {
- Matcher matcher = new CompositeMatcher(
- META_XPATH.parse("//meta:" + element),
- META_XPATH.parse("//meta:" + element + "//text()"));
+ private static ContentHandler getMeta(ContentHandler ch, Metadata md, Property property,
+ String element) {
+ Matcher matcher = new CompositeMatcher(META_XPATH.parse("//meta:" + element),
+ META_XPATH.parse("//meta:" + element + "//text()"));
ContentHandler branch =
- new MatchingContentHandler(new MetadataHandler(md, property), matcher);
+ new MatchingContentHandler(new MetadataHandler(md, property), matcher);
return new TeeContentHandler(ch, branch);
}
- private static ContentHandler getUserDefined(
- ContentHandler ch, Metadata md) {
- Matcher matcher = new CompositeMatcher(
- META_XPATH.parse("//meta:user-defined/@meta:name"),
- META_XPATH.parse("//meta:user-defined//text()"));
- // eg
+ * StringUtils.leftPad(null, *, *) = null
+ * StringUtils.leftPad("", 3, "z") = "zzz"
+ * StringUtils.leftPad("bat", 3, "yz") = "bat"
+ * StringUtils.leftPad("bat", 5, "yz") = "yzbat"
+ * StringUtils.leftPad("bat", 8, "yz") = "yzyzybat"
+ * StringUtils.leftPad("bat", 1, "yz") = "bat"
+ * StringUtils.leftPad("bat", -1, "yz") = "bat"
+ * StringUtils.leftPad("bat", 5, null) = " bat"
+ * StringUtils.leftPad("bat", 5, "") = " bat"
+ *
+ *
+ * @param str the String to pad out, may be null
+ * @param size the size to pad to
+ * @param padStr the String to pad with, null or empty treated as single space
+ * @return left padded String or original String if no padding is necessary,
+ * {@code null} if null String input
+ */
+ public static String leftPad(final String str, final int size, String padStr) {
+ if (str == null) {
+ return null;
+ }
+ if (isEmpty(padStr)) {
+ padStr = SPACE;
+ }
+ final int padLen = padStr.length();
+ final int strLen = str.length();
+ final int pads = size - strLen;
+ if (pads <= 0) {
+ return str; // returns original String when possible
+ }
+ if (padLen == 1 && pads <= PAD_LIMIT) {
+ return leftPad(str, size, padStr.charAt(0));
+ }
+
+ if (pads == padLen) {
+ return padStr.concat(str);
+ } else if (pads < padLen) {
+ return padStr.substring(0, pads).concat(str);
+ } else {
+ final char[] padding = new char[pads];
+ final char[] padChars = padStr.toCharArray();
+ for (int i = 0; i < pads; i++) {
+ padding[i] = padChars[i % padLen];
+ }
+ return new String(padding).concat(str);
+ }
+ }
+
+
+ public static String leftPad(final String str, final int size, final char padChar) {
+ if (str == null) {
+ return null;
+ }
+ final int pads = size - str.length();
+ if (pads <= 0) {
+ return str; // returns original String when possible
+ }
+ if (pads > PAD_LIMIT) {
+ return leftPad(str, size, String.valueOf(padChar));
+ }
+ return repeat(padChar, pads).concat(str);
+ }
+
+ /**
+ *
+ * StringUtils.repeat('e', 0) = ""
+ * StringUtils.repeat('e', 3) = "eee"
+ * StringUtils.repeat('e', -2) = ""
+ *
+ *
+ *
+ * StringUtils.repeat(null, 2) = null
+ * StringUtils.repeat("", 0) = ""
+ * StringUtils.repeat("", 2) = ""
+ * StringUtils.repeat("a", 3) = "aaa"
+ * StringUtils.repeat("ab", 2) = "abab"
+ * StringUtils.repeat("a", -2) = ""
+ *
+ *
+ * @param str the String to repeat, may be null
+ * @param repeat number of times to repeat str, negative treated as zero
+ * @return a new String consisting of the original String repeated,
+ * {@code null} if null String input
+ */
+ public static String repeat(final String str, final int repeat) {
+ // Performance tuned for 2.0 (JDK1.4)
+
+ if (str == null) {
+ return null;
+ }
+ if (repeat <= 0) {
+ return EMPTY;
+ }
+ final int inputLength = str.length();
+ if (repeat == 1 || inputLength == 0) {
+ return str;
+ }
+ if (inputLength == 1 && repeat <= PAD_LIMIT) {
+ return repeat(str.charAt(0), repeat);
+ }
+
+ final int outputLength = inputLength * repeat;
+ switch (inputLength) {
+ case 1:
+ return repeat(str.charAt(0), repeat);
+ case 2:
+ final char ch0 = str.charAt(0);
+ final char ch1 = str.charAt(1);
+ final char[] output2 = new char[outputLength];
+ for (int i = repeat * 2 - 2; i >= 0; i--, i--) {
+ output2[i] = ch0;
+ output2[i + 1] = ch1;
+ }
+ return new String(output2);
+ default:
+ final StringBuilder buf = new StringBuilder(outputLength);
+ for (int i = 0; i < repeat; i++) {
+ buf.append(str);
+ }
+ return buf.toString();
+ }
+ }
+}
diff --git a/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
index 3a260fcc..3fae1e1f 100644
--- a/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
+++ b/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala
@@ -16,7 +16,7 @@ import munit._
class OdfExtractTest extends FunSuite {
val files = List(
- ExampleFiles.examples_sample_odt -> 6372,
+ ExampleFiles.examples_sample_odt -> 6367,
ExampleFiles.examples_sample_ods -> 717
)
diff --git a/modules/files/src/main/scala/docspell/files/TikaMimetype.scala b/modules/files/src/main/scala/docspell/files/TikaMimetype.scala
index 588d37cc..f9bd0912 100644
--- a/modules/files/src/main/scala/docspell/files/TikaMimetype.scala
+++ b/modules/files/src/main/scala/docspell/files/TikaMimetype.scala
@@ -20,7 +20,7 @@ import fs2.Stream
import docspell.common._
import org.apache.tika.config.TikaConfig
-import org.apache.tika.metadata.{HttpHeaders, Metadata, TikaMetadataKeys}
+import org.apache.tika.metadata.{HttpHeaders, Metadata, TikaCoreProperties}
import org.apache.tika.mime.MediaType
import org.apache.tika.parser.txt.Icu4jEncodingDetector
@@ -40,7 +40,7 @@ object TikaMimetype {
private def makeMetadata(hint: MimeTypeHint): Metadata = {
val md = new Metadata
- hint.filename.foreach(md.set(TikaMetadataKeys.RESOURCE_NAME_KEY, _))
+ hint.filename.foreach(md.set(TikaCoreProperties.RESOURCE_NAME_KEY, _))
hint.advertised.foreach(md.set(HttpHeaders.CONTENT_TYPE, _))
md
}
diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala
index 0bd16487..8349e443 100644
--- a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala
+++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala
@@ -108,7 +108,13 @@ object SolrSetup {
"Add latvian content field",
addContentField(Language.Latvian)
),
- SolrMigration.reIndexAll(13, "Re-Index after adding latvian content field")
+ SolrMigration.reIndexAll(13, "Re-Index after adding latvian content field"),
+ SolrMigration[F](
+ 14,
+ "Add japanese content field",
+ addContentField(Language.Japanese)
+ ),
+ SolrMigration.reIndexAll(15, "Re-Index after adding japanese content field")
)
def addFolderField: F[Unit] =
diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml
index 5f443047..df3fd5b7 100644
--- a/modules/joexapi/src/main/resources/joex-openapi.yml
+++ b/modules/joexapi/src/main/resources/joex-openapi.yml
@@ -2,7 +2,7 @@ openapi: 3.0.0
info:
title: Docspell JOEX
- version: 0.25.0-SNAPSHOT
+ version: 0.26.0-SNAPSHOT
description: |
This is the remote API to the job executor component of Docspell.
Docspell is a free document management system focused on small
diff --git a/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala b/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala
index 918b6d33..082b6f44 100644
--- a/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala
+++ b/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala
@@ -53,6 +53,7 @@ object ItemQuery {
case object ItemId extends StringAttr
case object Date extends DateAttr
case object DueDate extends DateAttr
+ case object CreatedDate extends DateAttr
case object AttachCount extends IntAttr
object Correspondent {
diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala b/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala
index 25b92f5a..c229702e 100644
--- a/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala
+++ b/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala
@@ -31,6 +31,9 @@ object AttrParser {
val dueDate: P[Attr.DateAttr] =
P.ignoreCase(C.due).as(Attr.DueDate)
+ val created: P[Attr.DateAttr] =
+ P.ignoreCase(C.created).as(Attr.CreatedDate)
+
val corrOrgId: P[Attr.StringAttr] =
P.ignoreCase(C.corrOrgId)
.as(Attr.Correspondent.OrgId)
@@ -78,7 +81,7 @@ object AttrParser {
attachCountAttr
val dateAttr: P[Attr.DateAttr] =
- P.oneOf(List(date, dueDate))
+ P.oneOf(List(date, dueDate, created))
val stringAttr: P[Attr.StringAttr] =
P.oneOf(
diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala b/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala
index 157cd9f8..d809b152 100644
--- a/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala
+++ b/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala
@@ -23,6 +23,8 @@ object Constants {
val corrOrgName = "corr.org.name"
val corrPersId = "corr.pers.id"
val corrPersName = "corr.pers.name"
+ val created = "created"
+ val createdIn = "createdIn"
val customField = "f"
val customFieldId = "f.id"
val date = "date"
diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala b/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala
index d9c8290e..77a2a7b8 100644
--- a/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala
+++ b/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala
@@ -35,6 +35,9 @@ object MacroParser {
val dueDateRangeMacro: P[Expr.DateRangeMacro] =
dateRangeMacroImpl(C.dueIn, Attr.DueDate)
+ val createdDateRangeMacro: P[Expr.DateRangeMacro] =
+ dateRangeMacroImpl(C.createdIn, Attr.CreatedDate)
+
val yearDateMacro: P[Expr.YearMacro] =
yearMacroImpl(C.year, Attr.Date)
@@ -52,6 +55,7 @@ object MacroParser {
namesMacro,
dateRangeMacro,
dueDateRangeMacro,
+ createdDateRangeMacro,
yearDateMacro,
corrMacro,
concMacro
diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
index 00c7dd7f..bc18949a 100644
--- a/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
+++ b/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala
@@ -56,6 +56,14 @@ class SimpleExprParserTest extends FunSuite with ValueHelper {
p.parseAll("due<2021-03-14"),
Right(dateExpr(Operator.Lt, Attr.DueDate, ld(2021, 3, 14)))
)
+ assertEquals(
+ p.parseAll("created:2021-03-14"),
+ Right(dateExpr(Operator.Like, Attr.CreatedDate, ld(2021, 3, 14)))
+ )
+ assertEquals(
+ p.parseAll("created<2021-03-14"),
+ Right(dateExpr(Operator.Lt, Attr.CreatedDate, ld(2021, 3, 14)))
+ )
assertEquals(
p.parseAll("due~=2021-03-14,2021-03-13"),
Right(Expr.InDateExpr(Attr.DueDate, Nel.of(ld(2021, 3, 14), ld(2021, 3, 13))))
diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml
index f4013210..e0d683bc 100644
--- a/modules/restapi/src/main/resources/docspell-openapi.yml
+++ b/modules/restapi/src/main/resources/docspell-openapi.yml
@@ -2,7 +2,7 @@ openapi: 3.0.0
info:
title: Docspell
- version: 0.25.0-SNAPSHOT
+ version: 0.26.0-SNAPSHOT
description: |
This is the remote API to Docspell. Docspell is a free document
management system focused on small groups or families.
@@ -1350,6 +1350,37 @@ paths:
schema:
$ref: "#/components/schemas/BasicResult"
+ /admin/attachments/convertallpdfs:
+ post:
+ operationId: "admin-attachments-convertallpdf"
+ tags: [Attachment, Admin]
+ summary: Convert all PDF files not yet converted
+ description: |
+ Docspell converts PDF files into PDF/A files by default, if
+ the OcrMyPDF tool is configured.
+
+ This endpoint can be used to submit a task that runs this on
+ all files that have not been converted yet in this way.
+
+ This conversion tool has been added in version 0.9.0 and so
+ older files can be "migrated" this way, or maybe after
+ enabling the tool (it is optional).
+
+ The task finds all files collective and submits a task for
+ each file to convert. These tasks are submitted with a low
+ priority so that normal processing can still proceed.
+
+ The body of the request should be empty.
+ security:
+ - adminHeader: []
+ responses:
+ 200:
+ description: Ok
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/BasicResult"
+
/sec/source:
get:
operationId: "sec-source-get-all"
@@ -1428,33 +1459,6 @@ paths:
schema:
$ref: "#/components/schemas/BasicResult"
- /sec/item/convertallpdfs:
- post:
- operationId: "sec-item-convert-all-pdfs"
- tags: [ Item ]
- summary: Convert all non-converted pdfs.
- description: |
- Submits a job that will find all pdf files that have not been
- converted and converts them using the ocrmypdf tool (if
- enabled). This tool has been added in version 0.9.0 and so
- older files can be "migrated" this way, or maybe after
- enabling the tool.
-
- The task finds all files of the current collective and submits
- task for each file to convert. These tasks are submitted with
- a low priority so that normal processing can still proceed.
-
- The body of the request should be empty.
- security:
- - authTokenHeader: []
- responses:
- 200:
- description: Ok
- content:
- application/json:
- schema:
- $ref: "#/components/schemas/BasicResult"
-
/sec/item/search:
get:
operationId: "sec-item-search-by-get"
@@ -1624,6 +1628,8 @@ paths:
Update the tags associated to an item. This will remove all
existing ones and sets the given tags, such that after this
returns, the item has exactly the tags as given.
+
+ Tags may be specified as names or ids.
security:
- authTokenHeader: []
parameters:
@@ -1632,7 +1638,7 @@ paths:
content:
application/json:
schema:
- $ref: "#/components/schemas/ReferenceList"
+ $ref: "#/components/schemas/StringList"
responses:
200:
description: Ok
@@ -1668,7 +1674,7 @@ paths:
$ref: "#/components/schemas/BasicResult"
/sec/item/{id}/taglink:
- post:
+ put:
operationId: "sec-item-link-tags"
tags: [Item]
summary: Link existing tags to an item.
@@ -1721,6 +1727,31 @@ paths:
schema:
$ref: "#/components/schemas/BasicResult"
+ /sec/item/{id}/tagsremove:
+ post:
+ operationId: "sec-item-remove-tags"
+ tags: [ Item ]
+ summary: Remove tags from an item
+ description: |
+ Remove the given tags from the item. The tags can be specified
+ via ids or names.
+ security:
+ - authTokenHeader: []
+ parameters:
+ - $ref: "#/components/parameters/id"
+ requestBody:
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/StringList"
+ responses:
+ 200:
+ description: Ok
+ content:
+ application/json:
+ schema:
+ $ref: "#/components/schemas/BasicResult"
+
/sec/item/{id}/direction:
put:
operationId: "sec-item-set-direction"
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala
index 85b02b42..2d115380 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala
@@ -194,13 +194,21 @@ object AttachmentRoutes {
val dsl = Http4sDsl[F]
import dsl._
- HttpRoutes.of { case POST -> Root / "generatePreviews" =>
- for {
- res <- backend.item.generateAllPreviews(MakePreviewArgs.StoreMode.Replace, true)
- resp <- Ok(
- Conversions.basicResult(res, "Generate all previews task submitted.")
- )
- } yield resp
+ HttpRoutes.of {
+ case POST -> Root / "generatePreviews" =>
+ for {
+ res <- backend.item.generateAllPreviews(MakePreviewArgs.StoreMode.Replace, true)
+ resp <- Ok(
+ Conversions.basicResult(res, "Generate all previews task submitted.")
+ )
+ } yield resp
+
+ case POST -> Root / "convertallpdfs" =>
+ for {
+ res <-
+ backend.item.convertAllPdf(None, None, true)
+ resp <- Ok(Conversions.basicResult(res, "Convert all PDFs task submitted"))
+ } yield resp
}
}
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
index a7422c9e..bbda6df0 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala
@@ -59,9 +59,12 @@ object ItemMultiRoutes extends MultiIdSupport {
for {
json <- req.as[ItemsAndRefs]
items <- readIds[F](json.items)
- tags <- json.refs.traverse(readId[F])
- res <- backend.item.setTagsMultipleItems(items, tags, user.account.collective)
- resp <- Ok(Conversions.basicResult(res, "Tags updated"))
+ res <- backend.item.setTagsMultipleItems(
+ items,
+ json.refs,
+ user.account.collective
+ )
+ resp <- Ok(Conversions.basicResult(res, "Tags updated"))
} yield resp
case req @ POST -> Root / "tags" =>
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
index 6635550a..f2bec1fc 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
@@ -47,13 +47,6 @@ object ItemRoutes {
import dsl._
HttpRoutes.of {
- case POST -> Root / "convertallpdfs" =>
- for {
- res <-
- backend.item.convertAllPdf(user.account.collective.some, user.account, true)
- resp <- Ok(Conversions.basicResult(res, "Task submitted"))
- } yield resp
-
case GET -> Root / "search" :? QP.Query(q) :? QP.Limit(limit) :? QP.Offset(
offset
) :? QP.WithDetails(detailFlag) =>
@@ -153,8 +146,8 @@ object ItemRoutes {
case req @ PUT -> Root / Ident(id) / "tags" =>
for {
- tags <- req.as[ReferenceList].map(_.items)
- res <- backend.item.setTags(id, tags.map(_.id), user.account.collective)
+ tags <- req.as[StringList].map(_.items)
+ res <- backend.item.setTags(id, tags, user.account.collective)
resp <- Ok(Conversions.basicResult(res, "Tags updated"))
} yield resp
@@ -180,6 +173,17 @@ object ItemRoutes {
resp <- Ok(Conversions.basicResult(res, "Tags linked"))
} yield resp
+ case req @ POST -> Root / Ident(id) / "tagsremove" =>
+ for {
+ json <- req.as[StringList]
+ res <- backend.item.removeTagsMultipleItems(
+ NonEmptyList.of(id),
+ json.items,
+ user.account.collective
+ )
+ resp <- Ok(Conversions.basicResult(res, "Tags removed"))
+ } yield resp
+
case req @ PUT -> Root / Ident(id) / "direction" =>
for {
dir <- req.as[DirectionValue]
diff --git a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
index 4e356ae2..24fed950 100644
--- a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
+++ b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
@@ -171,12 +171,16 @@ object ItemQueryGenerator {
tables.item.id.in(select.withSelect(Nel.of(RItem.as("i").id.s)))
case Expr.AttachId(id) =>
- tables.item.id.in(
- Select(
- select(RAttachment.T.itemId),
- from(RAttachment.T),
+ val idWildcard = QueryWildcard(id)
+ val query =
+ if (id == idWildcard) {
RAttachment.T.id.cast[String] === id
- ).distinct
+ } else {
+ RAttachment.T.id.cast[String].like(idWildcard)
+ }
+
+ tables.item.id.in(
+ Select(select(RAttachment.T.itemId), from(RAttachment.T), query).distinct
)
case Expr.Fulltext(_) =>
@@ -228,6 +232,8 @@ object ItemQueryGenerator {
coalesce(tables.item.itemDate.s, tables.item.created.s).s
case Attr.DueDate =>
tables.item.dueDate.s
+ case Attr.CreatedDate =>
+ tables.item.created.s
}
private def stringColumn(tables: Tables)(attr: Attr.StringAttr): Column[String] =
diff --git a/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala b/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
index db49f5cd..503cbc5a 100644
--- a/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
+++ b/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala
@@ -11,6 +11,7 @@ import java.time.LocalDate
import docspell.common._
import docspell.query.ItemQueryParser
import docspell.store.qb.DSL._
+import docspell.store.qb.Select
import docspell.store.qb.generator.{ItemQueryGenerator, Tables}
import docspell.store.queries.AttachCountTable
import docspell.store.records._
@@ -56,4 +57,31 @@ class ItemQueryGeneratorTest extends FunSuite {
assertEquals(cond, expect)
}
+ test("attach.id with wildcard") {
+ val q = ItemQueryParser.parseUnsafe("attach.id=abcde*")
+ val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
+ val expect = tables.item.id.in(
+ Select(
+ select(RAttachment.T.itemId),
+ from(RAttachment.T),
+ RAttachment.T.id.cast[String].like("abcde%")
+ ).distinct
+ )
+
+ assertEquals(cond, expect)
+ }
+
+ test("attach.id with equals") {
+ val q = ItemQueryParser.parseUnsafe("attach.id=abcde")
+ val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q)
+ val expect = tables.item.id.in(
+ Select(
+ select(RAttachment.T.itemId),
+ from(RAttachment.T),
+ RAttachment.T.id.cast[String] === "abcde"
+ ).distinct
+ )
+
+ assertEquals(cond, expect)
+ }
}
diff --git a/modules/webapp/src/main/elm/Api.elm b/modules/webapp/src/main/elm/Api.elm
index 3f5e447c..abba1ebc 100644
--- a/modules/webapp/src/main/elm/Api.elm
+++ b/modules/webapp/src/main/elm/Api.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Api exposing
( addConcEquip
, addConcPerson
@@ -1782,12 +1783,12 @@ itemDetail flags id receive =
}
-setTags : Flags -> String -> ReferenceList -> (Result Http.Error BasicResult -> msg) -> Cmd msg
+setTags : Flags -> String -> StringList -> (Result Http.Error BasicResult -> msg) -> Cmd msg
setTags flags item tags receive =
Http2.authPut
{ url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/tags"
, account = getAccount flags
- , body = Http.jsonBody (Api.Model.ReferenceList.encode tags)
+ , body = Http.jsonBody (Api.Model.StringList.encode tags)
, expect = Http.expectJson receive Api.Model.BasicResult.decoder
}
diff --git a/modules/webapp/src/main/elm/App/Data.elm b/modules/webapp/src/main/elm/App/Data.elm
index d61ba672..fe44da24 100644
--- a/modules/webapp/src/main/elm/App/Data.elm
+++ b/modules/webapp/src/main/elm/App/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module App.Data exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm
index b718c1a0..b5381433 100644
--- a/modules/webapp/src/main/elm/App/Update.elm
+++ b/modules/webapp/src/main/elm/App/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module App.Update exposing
( initPage
, update
@@ -330,10 +331,18 @@ updateItemDetail lmsg model =
( hm, hc, hs ) =
updateHome (Page.Home.Data.SetLinkTarget result.linkTarget) model_
+
+ ( hm1, hc1, hs1 ) =
+ case result.removedItem of
+ Just removedId ->
+ updateHome (Page.Home.Data.RemoveItem removedId) hm
+
+ Nothing ->
+ ( hm, hc, hs )
in
- ( hm
- , Cmd.batch [ Cmd.map ItemDetailMsg result.cmd, hc ]
- , Sub.batch [ Sub.map ItemDetailMsg result.sub, hs ]
+ ( hm1
+ , Cmd.batch [ Cmd.map ItemDetailMsg result.cmd, hc, hc1 ]
+ , Sub.batch [ Sub.map ItemDetailMsg result.sub, hs, hs1 ]
)
diff --git a/modules/webapp/src/main/elm/App/View2.elm b/modules/webapp/src/main/elm/App/View2.elm
index 0a57c3d6..88c56407 100644
--- a/modules/webapp/src/main/elm/App/View2.elm
+++ b/modules/webapp/src/main/elm/App/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module App.View2 exposing (view)
import Api.Model.AuthResult exposing (AuthResult)
diff --git a/modules/webapp/src/main/elm/Comp/AddressForm.elm b/modules/webapp/src/main/elm/Comp/AddressForm.elm
index b294b60d..835c18e6 100644
--- a/modules/webapp/src/main/elm/Comp/AddressForm.elm
+++ b/modules/webapp/src/main/elm/Comp/AddressForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.AddressForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm b/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm
index 3e4901df..a3cc710b 100644
--- a/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm
+++ b/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.AttachmentMeta exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/Basic.elm b/modules/webapp/src/main/elm/Comp/Basic.elm
index c0b7c314..75f88803 100644
--- a/modules/webapp/src/main/elm/Comp/Basic.elm
+++ b/modules/webapp/src/main/elm/Comp/Basic.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.Basic exposing
( editLinkLabel
, editLinkTableCell
diff --git a/modules/webapp/src/main/elm/Comp/BasicSizeField.elm b/modules/webapp/src/main/elm/Comp/BasicSizeField.elm
index a1675682..5be47420 100644
--- a/modules/webapp/src/main/elm/Comp/BasicSizeField.elm
+++ b/modules/webapp/src/main/elm/Comp/BasicSizeField.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.BasicSizeField exposing
( Msg
, update
diff --git a/modules/webapp/src/main/elm/Comp/CalEventInput.elm b/modules/webapp/src/main/elm/Comp/CalEventInput.elm
index 0855b617..b7701f5e 100644
--- a/modules/webapp/src/main/elm/Comp/CalEventInput.elm
+++ b/modules/webapp/src/main/elm/Comp/CalEventInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CalEventInput exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
index 1821b684..06577d20 100644
--- a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ChangePasswordForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm b/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm
index 1fc3e3c4..119e9dcd 100644
--- a/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ClassifierSettingsForm exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm b/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm
index ea0404a9..4d24d817 100644
--- a/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CollectiveSettingsForm exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ColorTagger.elm b/modules/webapp/src/main/elm/Comp/ColorTagger.elm
index 16645e6a..60df1d1c 100644
--- a/modules/webapp/src/main/elm/Comp/ColorTagger.elm
+++ b/modules/webapp/src/main/elm/Comp/ColorTagger.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ColorTagger exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ConfirmModal.elm b/modules/webapp/src/main/elm/Comp/ConfirmModal.elm
index 9254d171..c267e151 100644
--- a/modules/webapp/src/main/elm/Comp/ConfirmModal.elm
+++ b/modules/webapp/src/main/elm/Comp/ConfirmModal.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ConfirmModal exposing
( Settings
, defaultSettings
diff --git a/modules/webapp/src/main/elm/Comp/ContactField.elm b/modules/webapp/src/main/elm/Comp/ContactField.elm
index 5c1106e2..f6732c22 100644
--- a/modules/webapp/src/main/elm/Comp/ContactField.elm
+++ b/modules/webapp/src/main/elm/Comp/ContactField.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ContactField exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
index 08243b16..49b9bf4d 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CustomFieldForm exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm b/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
index 36d5750b..5a30c023 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CustomFieldInput exposing
( FieldResult(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm b/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm
index f84c51ab..e8ba37a7 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CustomFieldManage exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm b/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm
index b74e3b12..b9ca6282 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CustomFieldMultiInput exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm b/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
index bcd33b64..1075a30e 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.CustomFieldTable exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/DatePicker.elm b/modules/webapp/src/main/elm/Comp/DatePicker.elm
index 1a401c99..eb2d0474 100644
--- a/modules/webapp/src/main/elm/Comp/DatePicker.elm
+++ b/modules/webapp/src/main/elm/Comp/DatePicker.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.DatePicker exposing
( Msg
, defaultSettings
diff --git a/modules/webapp/src/main/elm/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Comp/DetailEdit.elm
index 0d6ec46a..96cbd2f9 100644
--- a/modules/webapp/src/main/elm/Comp/DetailEdit.elm
+++ b/modules/webapp/src/main/elm/Comp/DetailEdit.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.DetailEdit exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/Dropdown.elm b/modules/webapp/src/main/elm/Comp/Dropdown.elm
index eb792c8f..76d46b3c 100644
--- a/modules/webapp/src/main/elm/Comp/Dropdown.elm
+++ b/modules/webapp/src/main/elm/Comp/Dropdown.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.Dropdown exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/Dropzone.elm b/modules/webapp/src/main/elm/Comp/Dropzone.elm
index e3e99807..c8c5cd57 100644
--- a/modules/webapp/src/main/elm/Comp/Dropzone.elm
+++ b/modules/webapp/src/main/elm/Comp/Dropzone.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
-- inspired from here: https://ellie-app.com/3T5mNms7SwKa1
diff --git a/modules/webapp/src/main/elm/Comp/EmailInput.elm b/modules/webapp/src/main/elm/Comp/EmailInput.elm
index 7525b9f3..218297ba 100644
--- a/modules/webapp/src/main/elm/Comp/EmailInput.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EmailInput exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm
index 427acbe7..36ec4fb8 100644
--- a/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EmailSettingsForm exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
index 54acfea5..95221f17 100644
--- a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EmailSettingsManage exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm
index dc54ec5f..52177d18 100644
--- a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EmailSettingsTable exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm
index 4d91a575..61f8e30f 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EquipmentForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
index 09ab1bf6..1d771639 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EquipmentManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm
index b9bc351b..116c96af 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.EquipmentTable exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm b/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm
index 58dda86b..c90f3e67 100644
--- a/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm
+++ b/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ExpandCollapse exposing
( collapseToggle
, expandToggle
diff --git a/modules/webapp/src/main/elm/Comp/FieldListSelect.elm b/modules/webapp/src/main/elm/Comp/FieldListSelect.elm
index fcd724c0..c35d1d17 100644
--- a/modules/webapp/src/main/elm/Comp/FieldListSelect.elm
+++ b/modules/webapp/src/main/elm/Comp/FieldListSelect.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.FieldListSelect exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/FixedDropdown.elm b/modules/webapp/src/main/elm/Comp/FixedDropdown.elm
index 9ca59bb9..199413cd 100644
--- a/modules/webapp/src/main/elm/Comp/FixedDropdown.elm
+++ b/modules/webapp/src/main/elm/Comp/FixedDropdown.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.FixedDropdown exposing
( Item
, Model
diff --git a/modules/webapp/src/main/elm/Comp/FolderDetail.elm b/modules/webapp/src/main/elm/Comp/FolderDetail.elm
index 87da6fdc..3e5f5b68 100644
--- a/modules/webapp/src/main/elm/Comp/FolderDetail.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderDetail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.FolderDetail exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/FolderManage.elm b/modules/webapp/src/main/elm/Comp/FolderManage.elm
index e581d2cd..9917d7bd 100644
--- a/modules/webapp/src/main/elm/Comp/FolderManage.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.FolderManage exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/FolderSelect.elm b/modules/webapp/src/main/elm/Comp/FolderSelect.elm
index 19a5d28d..6bc6cf9f 100644
--- a/modules/webapp/src/main/elm/Comp/FolderSelect.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderSelect.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.FolderSelect exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/FolderTable.elm b/modules/webapp/src/main/elm/Comp/FolderTable.elm
index 9745b97f..1c9fea1d 100644
--- a/modules/webapp/src/main/elm/Comp/FolderTable.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.FolderTable exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm
index 693a2f70..1004dbfb 100644
--- a/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ImapSettingsForm exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
index 2301a9d5..27cf26d1 100644
--- a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ImapSettingsManage exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm
index 9c535ff2..3fb48497 100644
--- a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm
+++ b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ImapSettingsTable exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/IntField.elm b/modules/webapp/src/main/elm/Comp/IntField.elm
index 9a082034..783cdf9a 100644
--- a/modules/webapp/src/main/elm/Comp/IntField.elm
+++ b/modules/webapp/src/main/elm/Comp/IntField.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.IntField exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ItemCard.elm b/modules/webapp/src/main/elm/Comp/ItemCard.elm
index ddb299f7..23c54701 100644
--- a/modules/webapp/src/main/elm/Comp/ItemCard.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemCard.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemCard exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm
index d0125eee..7c7cc19d 100644
--- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemCardList exposing
( Model
, Msg(..)
@@ -45,6 +46,7 @@ type Msg
= SetResults ItemLightList
| AddResults ItemLightList
| ItemCardMsg ItemLight Comp.ItemCard.Msg
+ | RemoveItem String
init : Model
@@ -144,6 +146,13 @@ updateDrag dm _ msg model =
result.selection
result.linkTarget
+ RemoveItem id ->
+ UpdateResult { model | results = removeItemById id model.results }
+ Cmd.none
+ dm
+ Data.ItemSelection.Inactive
+ Comp.LinkTarget.LinkNone
+
--- View2
@@ -170,13 +179,13 @@ viewGroup2 : Texts -> Model -> ViewConfig -> UiSettings -> ItemLightGroup -> Htm
viewGroup2 texts model cfg settings group =
div [ class "ds-item-group" ]
[ div
- [ class "flex py-0 mt-2 flex flex-row items-center"
- , class "bg-white dark:bg-bluegray-800 text-lg z-35"
+ [ class "flex py-1 mt-2 mb-2 flex flex-row items-center"
+ , class "bg-white dark:bg-bluegray-800 text-xl font-bold z-35"
, class "relative sticky top-10"
]
[ hr
- [ class S.border
- , class "flex-grow"
+ [ class S.border2
+ , class "w-16"
]
[]
, div [ class "px-6" ]
@@ -186,7 +195,7 @@ viewGroup2 texts model cfg settings group =
]
]
, hr
- [ class S.border
+ [ class S.border2
, class "flex-grow"
]
[]
@@ -231,3 +240,15 @@ isMultiSelectMode cfg =
Data.ItemSelection.Inactive ->
False
+
+
+removeItemById : String -> ItemLightList -> ItemLightList
+removeItemById id list =
+ let
+ filterItem item =
+ item.id /= id
+
+ filterGroup group =
+ { group | items = List.filter filterItem group.items }
+ in
+ { list | groups = List.map filterGroup list.groups }
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
index a649813c..ec9917f2 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail exposing
( Model
, emptyModel
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm
index 0f74f532..7ce99ca7 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.AddFilesForm exposing (view)
import Comp.Dropzone
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm
index 3334e941..bd5ad03c 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.ConfirmModalView exposing (view)
import Comp.ConfirmModal
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
index aa872abe..e9247c0c 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.EditForm exposing (formTabs, view2)
import Comp.CustomFieldMultiInput
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm
index 97e75a8d..ca11e29e 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.FieldTabState exposing (EditTab(..), allTabs, findTab, tabName, tabState)
import Comp.CustomFieldMultiInput
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm
index bf332bc9..14d7b0e2 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.FormChange exposing
( FormChange(..)
, multiUpdate
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm
index f7e51f66..568dcac3 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.ItemInfoHeader exposing (view)
import Api.Model.IdName exposing (IdName)
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm
index b0dddc19..65246daf 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.Model exposing
( AttachmentRename
, ConfirmModalValue(..)
@@ -275,7 +276,7 @@ type Msg
| ItemModalCancelled
| RequestDelete
| SaveResp (Result Http.Error BasicResult)
- | DeleteResp (Result Http.Error BasicResult)
+ | DeleteResp String (Result Http.Error BasicResult)
| GetItemResp (Result Http.Error ItemDetail)
| GetProposalResp (Result Http.Error ItemProposals)
| RemoveDueDate
@@ -351,22 +352,23 @@ type alias UpdateResult =
, cmd : Cmd Msg
, sub : Sub Msg
, linkTarget : LinkTarget
+ , removedItem : Maybe String
}
resultModel : Model -> UpdateResult
resultModel model =
- UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone
+ UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone Nothing
resultModelCmd : ( Model, Cmd Msg ) -> UpdateResult
resultModelCmd ( model, cmd ) =
- UpdateResult model cmd Sub.none Comp.LinkTarget.LinkNone
+ UpdateResult model cmd Sub.none Comp.LinkTarget.LinkNone Nothing
resultModelCmdSub : ( Model, Cmd Msg, Sub Msg ) -> UpdateResult
resultModelCmdSub ( model, cmd, sub ) =
- UpdateResult model cmd sub Comp.LinkTarget.LinkNone
+ UpdateResult model cmd sub Comp.LinkTarget.LinkNone Nothing
personMatchesOrg : Model -> Bool
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
index a0aad0c6..a9231590 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.MultiEditMenu exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm
index a92742b7..6f7f55a1 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.Notes exposing (view)
import Comp.ItemDetail.Model
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
index 0a39c76c..0838a985 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.SingleAttachment exposing (view)
import Api
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm
index cb560040..5697907b 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.Update exposing (update)
import Api
@@ -18,11 +19,9 @@ import Api.Model.MoveAttachment exposing (MoveAttachment)
import Api.Model.OptionalDate exposing (OptionalDate)
import Api.Model.OptionalId exposing (OptionalId)
import Api.Model.OptionalText exposing (OptionalText)
-import Api.Model.ReferenceList exposing (ReferenceList)
-import Api.Model.Tag exposing (Tag)
+import Api.Model.StringList exposing (StringList)
import Browser.Navigation as Nav
import Comp.AttachmentMeta
-import Comp.ConfirmModal
import Comp.CustomFieldMultiInput
import Comp.DatePicker
import Comp.DetailEdit
@@ -278,6 +277,7 @@ update key flags inav settings msg model =
, res9.sub
]
, linkTarget = Comp.LinkTarget.LinkNone
+ , removedItem = Nothing
}
SetActiveAttachment pos ->
@@ -559,7 +559,7 @@ update key flags inav settings msg model =
DeleteItemConfirmed ->
let
cmd =
- Api.deleteItem flags model.item.id DeleteResp
+ Api.deleteItem flags model.item.id (DeleteResp model.item.id)
in
resultModelCmd ( { model | itemModal = Nothing }, cmd )
@@ -676,6 +676,7 @@ update key flags inav settings msg model =
, cmd = Cmd.batch [ res1.cmd, res2.cmd ]
, sub = Sub.batch [ res1.sub, res2.sub ]
, linkTarget = Comp.LinkTarget.LinkNone
+ , removedItem = Nothing
}
GetPersonResp (Err _) ->
@@ -719,19 +720,23 @@ update key flags inav settings msg model =
SaveNameResp (Err _) ->
resultModel { model | nameState = SaveFailed }
- DeleteResp (Ok res) ->
+ DeleteResp removedId (Ok res) ->
if res.success then
- case inav.next of
- Just id ->
- resultModelCmd ( model, Page.set key (ItemDetailPage id) )
+ let
+ result_ =
+ case inav.next of
+ Just id ->
+ resultModelCmd ( model, Page.set key (ItemDetailPage id) )
- Nothing ->
- resultModelCmd ( model, Page.set key HomePage )
+ Nothing ->
+ resultModelCmd ( model, Page.set key HomePage )
+ in
+ { result_ | removedItem = Just removedId }
else
resultModel model
- DeleteResp (Err _) ->
+ DeleteResp _ (Err _) ->
resultModel model
GetItemResp (Ok item) ->
@@ -1420,6 +1425,7 @@ update key flags inav settings msg model =
, cmd = Cmd.none
, sub = Sub.none
, linkTarget = lt
+ , removedItem = Nothing
}
CustomFieldMsg lm ->
@@ -1620,8 +1626,8 @@ saveTags flags model =
tags =
Comp.Dropdown.getSelected model.tagModel
|> Util.List.distinct
- |> List.map (\t -> IdName t.id t.name)
- |> ReferenceList
+ |> List.map (\t -> t.id)
+ |> StringList
in
Api.setTags flags model.item.id tags SaveResp
@@ -1746,6 +1752,7 @@ withSub ( m, c ) =
m.customFieldThrottle
]
, linkTarget = Comp.LinkTarget.LinkNone
+ , removedItem = Nothing
}
@@ -1753,7 +1760,7 @@ resetField : Flags -> String -> (Field -> Result Http.Error BasicResult -> msg)
resetField flags item tagger field =
case field of
Data.Fields.Tag ->
- Api.setTags flags item Api.Model.ReferenceList.empty (tagger Data.Fields.Tag)
+ Api.setTags flags item Api.Model.StringList.empty (tagger Data.Fields.Tag)
Data.Fields.Folder ->
Api.setFolder flags item Api.Model.OptionalId.empty (tagger Data.Fields.Folder)
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm
index a90a4537..0770eb41 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemDetail.View2 exposing (view)
import Comp.Basic as B
diff --git a/modules/webapp/src/main/elm/Comp/ItemMail.elm b/modules/webapp/src/main/elm/Comp/ItemMail.elm
index 5467280c..bfe90193 100644
--- a/modules/webapp/src/main/elm/Comp/ItemMail.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemMail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ItemMail exposing
( FormAction(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/KeyInput.elm b/modules/webapp/src/main/elm/Comp/KeyInput.elm
index 8b92c99c..31704cc4 100644
--- a/modules/webapp/src/main/elm/Comp/KeyInput.elm
+++ b/modules/webapp/src/main/elm/Comp/KeyInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.KeyInput exposing
( KeyInput
, Model
diff --git a/modules/webapp/src/main/elm/Comp/LinkTarget.elm b/modules/webapp/src/main/elm/Comp/LinkTarget.elm
index 1163a888..1412155c 100644
--- a/modules/webapp/src/main/elm/Comp/LinkTarget.elm
+++ b/modules/webapp/src/main/elm/Comp/LinkTarget.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.LinkTarget exposing
( LinkTarget(..)
, makeConcLink
diff --git a/modules/webapp/src/main/elm/Comp/MarkdownInput.elm b/modules/webapp/src/main/elm/Comp/MarkdownInput.elm
index 3f9f8160..1c3b10ef 100644
--- a/modules/webapp/src/main/elm/Comp/MarkdownInput.elm
+++ b/modules/webapp/src/main/elm/Comp/MarkdownInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.MarkdownInput exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/MenuBar.elm b/modules/webapp/src/main/elm/Comp/MenuBar.elm
index f7a19e5d..7fa61324 100644
--- a/modules/webapp/src/main/elm/Comp/MenuBar.elm
+++ b/modules/webapp/src/main/elm/Comp/MenuBar.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.MenuBar exposing
( ButtonData
, CheckboxData
diff --git a/modules/webapp/src/main/elm/Comp/NotificationForm.elm b/modules/webapp/src/main/elm/Comp/NotificationForm.elm
index f895371b..32ea132e 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationForm.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.NotificationForm exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/NotificationList.elm b/modules/webapp/src/main/elm/Comp/NotificationList.elm
index 7825d200..31f6104c 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationList.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationList.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.NotificationList exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/NotificationManage.elm b/modules/webapp/src/main/elm/Comp/NotificationManage.elm
index 8b993c08..f57af511 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationManage.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.NotificationManage exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/OrgForm.elm b/modules/webapp/src/main/elm/Comp/OrgForm.elm
index 860fa288..e0eea71c 100644
--- a/modules/webapp/src/main/elm/Comp/OrgForm.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.OrgForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Comp/OrgManage.elm
index 5035a9db..0e46d760 100644
--- a/modules/webapp/src/main/elm/Comp/OrgManage.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.OrgManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/OrgTable.elm b/modules/webapp/src/main/elm/Comp/OrgTable.elm
index bec9603c..fd75b0b1 100644
--- a/modules/webapp/src/main/elm/Comp/OrgTable.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.OrgTable exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/PasswordInput.elm b/modules/webapp/src/main/elm/Comp/PasswordInput.elm
index 4d911f6e..00a69c20 100644
--- a/modules/webapp/src/main/elm/Comp/PasswordInput.elm
+++ b/modules/webapp/src/main/elm/Comp/PasswordInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.PasswordInput exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/PersonForm.elm b/modules/webapp/src/main/elm/Comp/PersonForm.elm
index a881bf11..4278f895 100644
--- a/modules/webapp/src/main/elm/Comp/PersonForm.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.PersonForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Comp/PersonManage.elm
index 46ba7047..a58e18fa 100644
--- a/modules/webapp/src/main/elm/Comp/PersonManage.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.PersonManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/PersonTable.elm b/modules/webapp/src/main/elm/Comp/PersonTable.elm
index 28b46411..bd2eb177 100644
--- a/modules/webapp/src/main/elm/Comp/PersonTable.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.PersonTable exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm b/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm
index 2ba79200..39b5f185 100644
--- a/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm
+++ b/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.PowerSearchInput exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/Progress.elm b/modules/webapp/src/main/elm/Comp/Progress.elm
index 871aa178..341d36a3 100644
--- a/modules/webapp/src/main/elm/Comp/Progress.elm
+++ b/modules/webapp/src/main/elm/Comp/Progress.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.Progress exposing
( progress2
, smallIndicating
diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
index 6c5caca9..e6c69809 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ScanMailboxForm exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm
index 66d16e9e..4a8c810e 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ScanMailboxList exposing
( Action(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm
index cefc2f2f..5f51a518 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.ScanMailboxManage exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Comp/SearchMenu.elm
index 21eb4094..627d4b64 100644
--- a/modules/webapp/src/main/elm/Comp/SearchMenu.elm
+++ b/modules/webapp/src/main/elm/Comp/SearchMenu.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.SearchMenu exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/SearchStatsView.elm b/modules/webapp/src/main/elm/Comp/SearchStatsView.elm
index 93939a18..01a9335d 100644
--- a/modules/webapp/src/main/elm/Comp/SearchStatsView.elm
+++ b/modules/webapp/src/main/elm/Comp/SearchStatsView.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.SearchStatsView exposing
( nameOrLabel
, sortFields
diff --git a/modules/webapp/src/main/elm/Comp/SentMails.elm b/modules/webapp/src/main/elm/Comp/SentMails.elm
index f460e75c..9eb40942 100644
--- a/modules/webapp/src/main/elm/Comp/SentMails.elm
+++ b/modules/webapp/src/main/elm/Comp/SentMails.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.SentMails exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/SourceForm.elm b/modules/webapp/src/main/elm/Comp/SourceForm.elm
index 5fed0bfc..b483c88f 100644
--- a/modules/webapp/src/main/elm/Comp/SourceForm.elm
+++ b/modules/webapp/src/main/elm/Comp/SourceForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.SourceForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/SourceManage.elm b/modules/webapp/src/main/elm/Comp/SourceManage.elm
index 6de92a90..1753eb31 100644
--- a/modules/webapp/src/main/elm/Comp/SourceManage.elm
+++ b/modules/webapp/src/main/elm/Comp/SourceManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.SourceManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/SourceTable.elm b/modules/webapp/src/main/elm/Comp/SourceTable.elm
index 0a9967e0..5bcdff0a 100644
--- a/modules/webapp/src/main/elm/Comp/SourceTable.elm
+++ b/modules/webapp/src/main/elm/Comp/SourceTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.SourceTable exposing
( Msg
, SelectMode(..)
diff --git a/modules/webapp/src/main/elm/Comp/StringListInput.elm b/modules/webapp/src/main/elm/Comp/StringListInput.elm
index bc07f83c..49196e14 100644
--- a/modules/webapp/src/main/elm/Comp/StringListInput.elm
+++ b/modules/webapp/src/main/elm/Comp/StringListInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.StringListInput exposing
( ItemAction(..)
, Model
diff --git a/modules/webapp/src/main/elm/Comp/Tabs.elm b/modules/webapp/src/main/elm/Comp/Tabs.elm
index 268a505d..18f54d0c 100644
--- a/modules/webapp/src/main/elm/Comp/Tabs.elm
+++ b/modules/webapp/src/main/elm/Comp/Tabs.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.Tabs exposing
( State(..)
, Style
diff --git a/modules/webapp/src/main/elm/Comp/TagForm.elm b/modules/webapp/src/main/elm/Comp/TagForm.elm
index 06e9bc79..010e8c7b 100644
--- a/modules/webapp/src/main/elm/Comp/TagForm.elm
+++ b/modules/webapp/src/main/elm/Comp/TagForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.TagForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/TagManage.elm b/modules/webapp/src/main/elm/Comp/TagManage.elm
index bfc3062f..3ac89f82 100644
--- a/modules/webapp/src/main/elm/Comp/TagManage.elm
+++ b/modules/webapp/src/main/elm/Comp/TagManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.TagManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/TagSelect.elm b/modules/webapp/src/main/elm/Comp/TagSelect.elm
index f4baf86b..cc600ffe 100644
--- a/modules/webapp/src/main/elm/Comp/TagSelect.elm
+++ b/modules/webapp/src/main/elm/Comp/TagSelect.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.TagSelect exposing
( CategoryCount
, Model
diff --git a/modules/webapp/src/main/elm/Comp/TagTable.elm b/modules/webapp/src/main/elm/Comp/TagTable.elm
index be9f1c2d..6cab6c31 100644
--- a/modules/webapp/src/main/elm/Comp/TagTable.elm
+++ b/modules/webapp/src/main/elm/Comp/TagTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.TagTable exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
index bf4ee798..29202295 100644
--- a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.UiSettingsForm exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
index f3014e33..1c3685ae 100644
--- a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.UiSettingsManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm b/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm
index 2e1e127d..c84645d7 100644
--- a/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm
+++ b/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.UiSettingsMigrate exposing
( Model
, Msg
diff --git a/modules/webapp/src/main/elm/Comp/UserForm.elm b/modules/webapp/src/main/elm/Comp/UserForm.elm
index dd0ffb74..046e5996 100644
--- a/modules/webapp/src/main/elm/Comp/UserForm.elm
+++ b/modules/webapp/src/main/elm/Comp/UserForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.UserForm exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/UserManage.elm b/modules/webapp/src/main/elm/Comp/UserManage.elm
index 27a61365..e894612a 100644
--- a/modules/webapp/src/main/elm/Comp/UserManage.elm
+++ b/modules/webapp/src/main/elm/Comp/UserManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.UserManage exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/UserTable.elm b/modules/webapp/src/main/elm/Comp/UserTable.elm
index c7e9f49a..169d294f 100644
--- a/modules/webapp/src/main/elm/Comp/UserTable.elm
+++ b/modules/webapp/src/main/elm/Comp/UserTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.UserTable exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm b/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm
index 223337b3..43987085 100644
--- a/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm
+++ b/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Comp.YesNoDimmer exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Data/BasicSize.elm b/modules/webapp/src/main/elm/Data/BasicSize.elm
index 268c9531..d67305f9 100644
--- a/modules/webapp/src/main/elm/Data/BasicSize.elm
+++ b/modules/webapp/src/main/elm/Data/BasicSize.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.BasicSize exposing
( BasicSize(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/CalEvent.elm b/modules/webapp/src/main/elm/Data/CalEvent.elm
index df11db62..764a7bc6 100644
--- a/modules/webapp/src/main/elm/Data/CalEvent.elm
+++ b/modules/webapp/src/main/elm/Data/CalEvent.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.CalEvent exposing
( CalEvent
, everyMonth
diff --git a/modules/webapp/src/main/elm/Data/Color.elm b/modules/webapp/src/main/elm/Data/Color.elm
index 777a1050..b63aa656 100644
--- a/modules/webapp/src/main/elm/Data/Color.elm
+++ b/modules/webapp/src/main/elm/Data/Color.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Color exposing
( Color(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/ContactType.elm b/modules/webapp/src/main/elm/Data/ContactType.elm
index da3219bb..cc23f073 100644
--- a/modules/webapp/src/main/elm/Data/ContactType.elm
+++ b/modules/webapp/src/main/elm/Data/ContactType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.ContactType exposing
( ContactType(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/CustomFieldChange.elm b/modules/webapp/src/main/elm/Data/CustomFieldChange.elm
index 5d6db0ce..124d0ec4 100644
--- a/modules/webapp/src/main/elm/Data/CustomFieldChange.elm
+++ b/modules/webapp/src/main/elm/Data/CustomFieldChange.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.CustomFieldChange exposing
( CustomFieldChange(..)
, CustomFieldValueCollect
diff --git a/modules/webapp/src/main/elm/Data/CustomFieldType.elm b/modules/webapp/src/main/elm/Data/CustomFieldType.elm
index 6ef3ed84..331efafb 100644
--- a/modules/webapp/src/main/elm/Data/CustomFieldType.elm
+++ b/modules/webapp/src/main/elm/Data/CustomFieldType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.CustomFieldType exposing
( CustomFieldType(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/Direction.elm b/modules/webapp/src/main/elm/Data/Direction.elm
index 6945d57f..7805ae0c 100644
--- a/modules/webapp/src/main/elm/Data/Direction.elm
+++ b/modules/webapp/src/main/elm/Data/Direction.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Direction exposing
( Direction(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/DropdownStyle.elm b/modules/webapp/src/main/elm/Data/DropdownStyle.elm
index 3b6e4072..5b1919cf 100644
--- a/modules/webapp/src/main/elm/Data/DropdownStyle.elm
+++ b/modules/webapp/src/main/elm/Data/DropdownStyle.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.DropdownStyle exposing
( DropdownStyle
, mainStyle
diff --git a/modules/webapp/src/main/elm/Data/EquipmentUse.elm b/modules/webapp/src/main/elm/Data/EquipmentUse.elm
index e1fb4a99..3dac0c84 100644
--- a/modules/webapp/src/main/elm/Data/EquipmentUse.elm
+++ b/modules/webapp/src/main/elm/Data/EquipmentUse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.EquipmentUse exposing
( EquipmentUse(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/Fields.elm b/modules/webapp/src/main/elm/Data/Fields.elm
index 440a70ae..306ad630 100644
--- a/modules/webapp/src/main/elm/Data/Fields.elm
+++ b/modules/webapp/src/main/elm/Data/Fields.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Fields exposing
( Field(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/Flags.elm b/modules/webapp/src/main/elm/Data/Flags.elm
index c945bb5d..df841b51 100644
--- a/modules/webapp/src/main/elm/Data/Flags.elm
+++ b/modules/webapp/src/main/elm/Data/Flags.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Flags exposing
( Config
, Flags
diff --git a/modules/webapp/src/main/elm/Data/Icons.elm b/modules/webapp/src/main/elm/Data/Icons.elm
index 3abb33b1..f0fd4976 100644
--- a/modules/webapp/src/main/elm/Data/Icons.elm
+++ b/modules/webapp/src/main/elm/Data/Icons.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Icons exposing
( addFiles
, addFiles2
diff --git a/modules/webapp/src/main/elm/Data/ItemNav.elm b/modules/webapp/src/main/elm/Data/ItemNav.elm
index b0b37942..eb57c887 100644
--- a/modules/webapp/src/main/elm/Data/ItemNav.elm
+++ b/modules/webapp/src/main/elm/Data/ItemNav.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.ItemNav exposing (ItemNav, fromList)
import Api.Model.ItemLight exposing (ItemLight)
diff --git a/modules/webapp/src/main/elm/Data/ItemQuery.elm b/modules/webapp/src/main/elm/Data/ItemQuery.elm
index 2c48e845..72ab54ca 100644
--- a/modules/webapp/src/main/elm/Data/ItemQuery.elm
+++ b/modules/webapp/src/main/elm/Data/ItemQuery.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.ItemQuery exposing
( AttrMatch(..)
, ItemQuery(..)
diff --git a/modules/webapp/src/main/elm/Data/ItemSelection.elm b/modules/webapp/src/main/elm/Data/ItemSelection.elm
index 31002e36..b2b4daac 100644
--- a/modules/webapp/src/main/elm/Data/ItemSelection.elm
+++ b/modules/webapp/src/main/elm/Data/ItemSelection.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.ItemSelection exposing
( ItemSelection(..)
, isActive
diff --git a/modules/webapp/src/main/elm/Data/ItemTemplate.elm b/modules/webapp/src/main/elm/Data/ItemTemplate.elm
index df97162a..e2d81f9f 100644
--- a/modules/webapp/src/main/elm/Data/ItemTemplate.elm
+++ b/modules/webapp/src/main/elm/Data/ItemTemplate.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.ItemTemplate exposing
( ItemTemplate
, TemplateContext
diff --git a/modules/webapp/src/main/elm/Data/Items.elm b/modules/webapp/src/main/elm/Data/Items.elm
index ebc61622..36a0cab9 100644
--- a/modules/webapp/src/main/elm/Data/Items.elm
+++ b/modules/webapp/src/main/elm/Data/Items.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Items exposing
( concat
, first
diff --git a/modules/webapp/src/main/elm/Data/Language.elm b/modules/webapp/src/main/elm/Data/Language.elm
index d67bd2d1..41522878 100644
--- a/modules/webapp/src/main/elm/Data/Language.elm
+++ b/modules/webapp/src/main/elm/Data/Language.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Language exposing
( Language(..)
, all
@@ -28,6 +29,7 @@ type Language
| Romanian
| Dutch
| Latvian
+ | Japanese
fromString : String -> Maybe Language
@@ -77,6 +79,9 @@ fromString str =
else if str == "lav" || str == "lv" || str == "latvian" then
Just Latvian
+ else if str == "jpn" || str == "ja" || str == "japanese" then
+ Just Japanese
+
else
Nothing
@@ -129,6 +134,9 @@ toIso3 lang =
Latvian ->
"lav"
+ Japanese ->
+ "jpn"
+
all : List Language
all =
@@ -147,4 +155,5 @@ all =
, Russian
, Romanian
, Latvian
+ , Japanese
]
diff --git a/modules/webapp/src/main/elm/Data/ListType.elm b/modules/webapp/src/main/elm/Data/ListType.elm
index 4dd7a5be..d80e6a24 100644
--- a/modules/webapp/src/main/elm/Data/ListType.elm
+++ b/modules/webapp/src/main/elm/Data/ListType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.ListType exposing
( ListType(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/Money.elm b/modules/webapp/src/main/elm/Data/Money.elm
index 932d4df5..90968bef 100644
--- a/modules/webapp/src/main/elm/Data/Money.elm
+++ b/modules/webapp/src/main/elm/Data/Money.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Money exposing
( Money
, MoneyParseError(..)
diff --git a/modules/webapp/src/main/elm/Data/OrgUse.elm b/modules/webapp/src/main/elm/Data/OrgUse.elm
index 9783b2d7..f5ff59cd 100644
--- a/modules/webapp/src/main/elm/Data/OrgUse.elm
+++ b/modules/webapp/src/main/elm/Data/OrgUse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.OrgUse exposing
( OrgUse(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/PersonUse.elm b/modules/webapp/src/main/elm/Data/PersonUse.elm
index f2b2fabc..c6cfc1f8 100644
--- a/modules/webapp/src/main/elm/Data/PersonUse.elm
+++ b/modules/webapp/src/main/elm/Data/PersonUse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.PersonUse exposing
( PersonUse(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/Priority.elm b/modules/webapp/src/main/elm/Data/Priority.elm
index ed898fb3..afaf7b25 100644
--- a/modules/webapp/src/main/elm/Data/Priority.elm
+++ b/modules/webapp/src/main/elm/Data/Priority.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Priority exposing
( Priority(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/QueryParseResult.elm b/modules/webapp/src/main/elm/Data/QueryParseResult.elm
index dfd0e2a2..4314e601 100644
--- a/modules/webapp/src/main/elm/Data/QueryParseResult.elm
+++ b/modules/webapp/src/main/elm/Data/QueryParseResult.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.QueryParseResult exposing (QueryParseResult, success)
diff --git a/modules/webapp/src/main/elm/Data/SSLType.elm b/modules/webapp/src/main/elm/Data/SSLType.elm
index dbeeee9c..a63b2402 100644
--- a/modules/webapp/src/main/elm/Data/SSLType.elm
+++ b/modules/webapp/src/main/elm/Data/SSLType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.SSLType exposing
( SSLType(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/SourceState.elm b/modules/webapp/src/main/elm/Data/SourceState.elm
index f77963f0..74accd48 100644
--- a/modules/webapp/src/main/elm/Data/SourceState.elm
+++ b/modules/webapp/src/main/elm/Data/SourceState.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.SourceState exposing
( SourceState(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/UiSettings.elm b/modules/webapp/src/main/elm/Data/UiSettings.elm
index ca5cf32a..93b1903b 100644
--- a/modules/webapp/src/main/elm/Data/UiSettings.elm
+++ b/modules/webapp/src/main/elm/Data/UiSettings.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.UiSettings exposing
( ItemPattern
, Pos(..)
diff --git a/modules/webapp/src/main/elm/Data/UiTheme.elm b/modules/webapp/src/main/elm/Data/UiTheme.elm
index ed1b1506..88268112 100644
--- a/modules/webapp/src/main/elm/Data/UiTheme.elm
+++ b/modules/webapp/src/main/elm/Data/UiTheme.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.UiTheme exposing
( UiTheme(..)
, cycle
diff --git a/modules/webapp/src/main/elm/Data/UserState.elm b/modules/webapp/src/main/elm/Data/UserState.elm
index d6eed5c9..7a7054c9 100644
--- a/modules/webapp/src/main/elm/Data/UserState.elm
+++ b/modules/webapp/src/main/elm/Data/UserState.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.UserState exposing
( UserState(..)
, all
diff --git a/modules/webapp/src/main/elm/Data/Validated.elm b/modules/webapp/src/main/elm/Data/Validated.elm
index 2171298b..e92a88e9 100644
--- a/modules/webapp/src/main/elm/Data/Validated.elm
+++ b/modules/webapp/src/main/elm/Data/Validated.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Data.Validated exposing
( Validated(..)
, isInvalid
diff --git a/modules/webapp/src/main/elm/Main.elm b/modules/webapp/src/main/elm/Main.elm
index b3a20d36..72cd6638 100644
--- a/modules/webapp/src/main/elm/Main.elm
+++ b/modules/webapp/src/main/elm/Main.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Main exposing (init, main)
import Api
diff --git a/modules/webapp/src/main/elm/Messages.elm b/modules/webapp/src/main/elm/Messages.elm
index cdef8f9a..f3bff9ae 100644
--- a/modules/webapp/src/main/elm/Messages.elm
+++ b/modules/webapp/src/main/elm/Messages.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages exposing
( Messages
, fromIso2
diff --git a/modules/webapp/src/main/elm/Messages/App.elm b/modules/webapp/src/main/elm/Messages/App.elm
index b273530b..3835e3b5 100644
--- a/modules/webapp/src/main/elm/Messages/App.elm
+++ b/modules/webapp/src/main/elm/Messages/App.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.App exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Basics.elm b/modules/webapp/src/main/elm/Messages/Basics.elm
index c1f8f749..4c1b4126 100644
--- a/modules/webapp/src/main/elm/Messages/Basics.elm
+++ b/modules/webapp/src/main/elm/Messages/Basics.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Basics exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm b/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm
index c5901283..fe0ed891 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.AddressForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm b/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm
index 2d78fca9..f46684b8 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.AttachmentMeta exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm
index 6146a92d..efb10b27 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CalEventInput exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm
index 34f5e2b0..6c38805d 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ChangePasswordForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm
index 69cdc2bd..dc5781c8 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ClassifierSettingsForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm
index fcf3a1b6..d4bd8274 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CollectiveSettingsForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm
index 72689a33..7aaf66d3 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CustomFieldForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm
index 184165e9..5a9aad12 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CustomFieldInput exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm
index 50bff996..c3320463 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CustomFieldManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm
index 91c99aa9..e6ee71d8 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CustomFieldMultiInput exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm
index 37c9175b..8be17d6d 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.CustomFieldTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm
index e631538a..91ffe8a9 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.DetailEdit exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm b/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm
index 23b8edde..d38449d0 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.Dropzone exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm
index cbc999f6..8898ab34 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.EmailSettingsForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm
index 3d385230..a80b804c 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.EmailSettingsManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm
index 5d102fde..8abcc5dc 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.EmailSettingsTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm
index 144b9624..3ac1a14e 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.EquipmentForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm
index d2e4100d..67dcda36 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.EquipmentManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm
index ba71dda0..8d84dac4 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.EquipmentTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm b/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm
index eb47261f..323d2dd4 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ExpandCollapse exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm
index 99a87c31..561cf1c6 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.FolderDetail exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm
index c507ea89..1b0eadb9 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.FolderManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm
index 608c60d1..ddef9092 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.FolderSelect exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm
index 9fc93d72..8e097a60 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.FolderTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm b/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm
index 2d3c7e71..99cbaa7d 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.HttpError exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm
index 33d73bfb..11b79e5f 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ImapSettingsForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm
index 646312af..b7e77553 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ImapSettingsManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm
index 2481c553..7ae93ff5 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ImapSettingsTable exposing (Texts, de, gb)
import Messages.Basics
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm
index 21357c67..6ba44fd7 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemCard exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm
index f4d7a6f6..8c22a430 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemCardList exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm
index a7bce63d..26905f5d 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm
index cd0b9069..efbdc47b 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.AddFilesForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm
index e749b5a1..a823f890 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.ConfirmModal exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm
index 85290f8d..ed616b68 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.EditForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm
index 8a43783b..0779c924 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.ItemInfoHeader exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm
index 7ea697cc..c6e724e8 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.MultiEditMenu exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm
index d1be4a8e..d2e7ed07 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.Notes exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm
index 44147a0a..b26acff6 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemDetail.SingleAttachment exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm
index 3f07aedf..09a413a6 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ItemMail exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm
index 2be6002a..a00ef06f 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.NotificationForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm
index e7363e97..88678374 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.NotificationManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm
index 03af1fa7..761550cb 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.NotificationTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm
index d3269c27..c0fbb3bb 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.OrgForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm
index 01546807..de4f40a3 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.OrgManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm
index d7951787..d940492b 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.OrgTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm
index 8d01112c..72de7ae0 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.PersonForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm
index 0e0e8e93..14ac65a0 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.PersonManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm
index b98dd3cb..81e9c551 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.PersonTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
index 48ec65cf..85eac9b1 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ScanMailboxForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm
index 74d9a4ea..717f58d6 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ScanMailboxManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm
index 18673608..835dec50 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.ScanMailboxTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm
index 856f9c01..27be0496 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.SearchMenu exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm
index fe73f6ad..9d4f81de 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.SearchStatsView exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm b/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm
index 7146b31b..9fb9d67a 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.SentMails exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm
index ffa9f750..66886f79 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.SourceForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm
index 279648d6..b1feb946 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.SourceManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm
index 934ff771..7639acc9 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.SourceTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm b/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm
index 006b4f21..4ab42651 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.TagForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm b/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm
index a7a7437c..10ff1f39 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.TagManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm b/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm
index 574e2247..d8142c83 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.TagSelect exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm b/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm
index 80b2171a..3e7e6f91 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.TagTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm
index 3d2dfe5a..908559ec 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.UiSettingsForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm
index 91422191..6e11aa75 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.UiSettingsManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm b/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm
index b82494f0..1475ce99 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.UserForm exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm b/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm
index 99bf6000..60d5f054 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.UserManage exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm b/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm
index 40a38187..059b7181 100644
--- a/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Comp.UserTable exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Data/Color.elm b/modules/webapp/src/main/elm/Messages/Data/Color.elm
index c03ad4e2..e650f55a 100644
--- a/modules/webapp/src/main/elm/Messages/Data/Color.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Color.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.Color exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/ContactType.elm b/modules/webapp/src/main/elm/Messages/Data/ContactType.elm
index 7a4eafe0..c361f297 100644
--- a/modules/webapp/src/main/elm/Messages/Data/ContactType.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/ContactType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.ContactType exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm b/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm
index d952b91c..c8e6c109 100644
--- a/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.CustomFieldType exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/Direction.elm b/modules/webapp/src/main/elm/Messages/Data/Direction.elm
index 09351645..69897f18 100644
--- a/modules/webapp/src/main/elm/Messages/Data/Direction.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Direction.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.Direction exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm b/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm
index d79ce3dc..fcdbc50b 100644
--- a/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.EquipmentUse exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/Fields.elm b/modules/webapp/src/main/elm/Messages/Data/Fields.elm
index 1d70beaa..b713fea0 100644
--- a/modules/webapp/src/main/elm/Messages/Data/Fields.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Fields.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.Fields exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/Language.elm b/modules/webapp/src/main/elm/Messages/Data/Language.elm
index b52d1c4d..60070c56 100644
--- a/modules/webapp/src/main/elm/Messages/Data/Language.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Language.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.Language exposing
( de
, gb
@@ -60,6 +61,9 @@ gb lang =
Latvian ->
"Latvian"
+ Japanese ->
+ "Japanese"
+
de : Language -> String
de lang =
@@ -108,3 +112,6 @@ de lang =
Latvian ->
"Lettisch"
+
+ Japanese ->
+ "Japanisch"
diff --git a/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm b/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm
index 745d2a37..09abfa50 100644
--- a/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.OrgUse exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm b/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm
index 3a35057c..72d39769 100644
--- a/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.PersonUse exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/Data/SSLType.elm b/modules/webapp/src/main/elm/Messages/Data/SSLType.elm
index 41ce8afa..a78801d9 100644
--- a/modules/webapp/src/main/elm/Messages/Data/SSLType.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/SSLType.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Data.SSLType exposing
( de
, gb
diff --git a/modules/webapp/src/main/elm/Messages/DateFormat.elm b/modules/webapp/src/main/elm/Messages/DateFormat.elm
index 842ef11a..2079fa08 100644
--- a/modules/webapp/src/main/elm/Messages/DateFormat.elm
+++ b/modules/webapp/src/main/elm/Messages/DateFormat.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.DateFormat exposing
( format
, formatDateLong
diff --git a/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm b/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm
index 5c1ac26d..315349aa 100644
--- a/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.CollectiveSettings exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/Home.elm b/modules/webapp/src/main/elm/Messages/Page/Home.elm
index 632cb914..00eaae7c 100644
--- a/modules/webapp/src/main/elm/Messages/Page/Home.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Home.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.Home exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm b/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm
index a175ab0e..94e685ad 100644
--- a/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.HomeSideMenu exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm b/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm
index fd011be5..f6f0b236 100644
--- a/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.ItemDetail exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/Login.elm b/modules/webapp/src/main/elm/Messages/Page/Login.elm
index 3923df12..a9b0bdb7 100644
--- a/modules/webapp/src/main/elm/Messages/Page/Login.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Login.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.Login exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/ManageData.elm b/modules/webapp/src/main/elm/Messages/Page/ManageData.elm
index 7191b56a..8fff4892 100644
--- a/modules/webapp/src/main/elm/Messages/Page/ManageData.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/ManageData.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.ManageData exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm b/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm
index 638fe568..d2fdf62e 100644
--- a/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.NewInvite exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/Queue.elm b/modules/webapp/src/main/elm/Messages/Page/Queue.elm
index 382e0f07..d40c832a 100644
--- a/modules/webapp/src/main/elm/Messages/Page/Queue.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Queue.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.Queue exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/Register.elm b/modules/webapp/src/main/elm/Messages/Page/Register.elm
index 9f766d4e..db1be4b4 100644
--- a/modules/webapp/src/main/elm/Messages/Page/Register.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Register.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.Register exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/Upload.elm b/modules/webapp/src/main/elm/Messages/Page/Upload.elm
index b06d7c52..570fe61f 100644
--- a/modules/webapp/src/main/elm/Messages/Page/Upload.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Upload.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.Upload exposing
( Texts
, de
diff --git a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm
index f7d65f3e..0c22ac71 100644
--- a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.Page.UserSettings exposing
( Texts
, de
@@ -94,8 +95,8 @@ de =
, uiSettings = "Oberfläche"
, notifications = "Benachrichtigungen"
, scanMailbox = "E-Mail-Import"
- , emailSettingSmtp = "E-Mail-Einstellung (SMTP)"
- , emailSettingImap = "E-Mail-Einstellung (IMAP)"
+ , emailSettingSmtp = "E-Mail-Einstellungen (SMTP)"
+ , emailSettingImap = "E-Mail-Einstellungen (IMAP)"
, changePassword = "Passwort ändern"
, uiSettingsInfo =
"Diese Einstellungen sind für die Web-Oberfläche."
diff --git a/modules/webapp/src/main/elm/Messages/UiLanguage.elm b/modules/webapp/src/main/elm/Messages/UiLanguage.elm
index 7da3adfb..9f1f1ba1 100644
--- a/modules/webapp/src/main/elm/Messages/UiLanguage.elm
+++ b/modules/webapp/src/main/elm/Messages/UiLanguage.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Messages.UiLanguage exposing
( UiLanguage(..)
, all
diff --git a/modules/webapp/src/main/elm/Page.elm b/modules/webapp/src/main/elm/Page.elm
index b4de34ec..d6a4afa4 100644
--- a/modules/webapp/src/main/elm/Page.elm
+++ b/modules/webapp/src/main/elm/Page.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page exposing
( Page(..)
, fromUrl
diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm
index c34484ba..1831bf0c 100644
--- a/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm
+++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.CollectiveSettings.Data exposing
( FormState(..)
, Model
diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm
index f22cf85f..1b695289 100644
--- a/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm
+++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.CollectiveSettings.Update exposing (update)
import Api
diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm
index 54fa391c..b190ec82 100644
--- a/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm
+++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.CollectiveSettings.View2 exposing (viewContent, viewSidebar)
import Api.Model.TagCount exposing (TagCount)
diff --git a/modules/webapp/src/main/elm/Page/Home/Data.elm b/modules/webapp/src/main/elm/Page/Home/Data.elm
index 7a3005b6..8560ca9d 100644
--- a/modules/webapp/src/main/elm/Page/Home/Data.elm
+++ b/modules/webapp/src/main/elm/Page/Home/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Home.Data exposing
( ConfirmModalValue(..)
, Model
@@ -200,6 +201,7 @@ type Msg
| RequestReprocessSelected
| ReprocessSelectedConfirmed
| ClientSettingsSaveResp UiSettings (Result Http.Error BasicResult)
+ | RemoveItem String
type SearchType
diff --git a/modules/webapp/src/main/elm/Page/Home/SideMenu.elm b/modules/webapp/src/main/elm/Page/Home/SideMenu.elm
index fad0b83e..63cf16a0 100644
--- a/modules/webapp/src/main/elm/Page/Home/SideMenu.elm
+++ b/modules/webapp/src/main/elm/Page/Home/SideMenu.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Home.SideMenu exposing (view)
import Comp.Basic as B
diff --git a/modules/webapp/src/main/elm/Page/Home/Update.elm b/modules/webapp/src/main/elm/Page/Home/Update.elm
index 83029264..55a45ce7 100644
--- a/modules/webapp/src/main/elm/Page/Home/Update.elm
+++ b/modules/webapp/src/main/elm/Page/Home/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Home.Update exposing
( UpdateResult
, update
@@ -651,6 +652,9 @@ update mId key flags settings msg model =
KeyUpPowerSearchbarMsg _ ->
withSub ( model, Cmd.none )
+ RemoveItem id ->
+ update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.RemoveItem id)) model
+
--- Helpers
diff --git a/modules/webapp/src/main/elm/Page/Home/View2.elm b/modules/webapp/src/main/elm/Page/Home/View2.elm
index 48e681e2..ad464746 100644
--- a/modules/webapp/src/main/elm/Page/Home/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Home/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Home.View2 exposing (viewContent, viewSidebar)
import Comp.Basic as B
diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm
index 8bfba482..0d679da7 100644
--- a/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm
+++ b/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.ItemDetail.Data exposing
( Model
, Msg(..)
@@ -43,4 +44,5 @@ type alias UpdateResult =
, cmd : Cmd Msg
, sub : Sub Msg
, linkTarget : LinkTarget
+ , removedItem : Maybe String
}
diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm
index e22f9c4d..1ac23be2 100644
--- a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm
+++ b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.ItemDetail.Update exposing (update)
import Api
@@ -45,6 +46,7 @@ update key flags inav settings msg model =
]
, sub = Sub.map ItemDetailMsg result.sub
, linkTarget = result.linkTarget
+ , removedItem = result.removedItem
}
ItemDetailMsg lmsg ->
@@ -64,6 +66,7 @@ update key flags inav settings msg model =
, cmd = Cmd.batch [ pageSwitch, Cmd.map ItemDetailMsg result.cmd ]
, sub = Sub.map ItemDetailMsg result.sub
, linkTarget = result.linkTarget
+ , removedItem = result.removedItem
}
ItemResp (Ok item) ->
@@ -74,10 +77,10 @@ update key flags inav settings msg model =
update key flags inav settings (ItemDetailMsg lmsg) model
ItemResp (Err _) ->
- UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone
+ UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone Nothing
ScrollResult _ ->
- UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone
+ UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone Nothing
UiSettingsUpdated ->
let
diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm
index de32963b..1c0d574b 100644
--- a/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm
+++ b/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.ItemDetail.View2 exposing (viewContent, viewSidebar)
import Comp.Basic as B
diff --git a/modules/webapp/src/main/elm/Page/Login/Data.elm b/modules/webapp/src/main/elm/Page/Login/Data.elm
index 931ad97d..1d8ffd79 100644
--- a/modules/webapp/src/main/elm/Page/Login/Data.elm
+++ b/modules/webapp/src/main/elm/Page/Login/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Login.Data exposing
( FormState(..)
, Model
diff --git a/modules/webapp/src/main/elm/Page/Login/Update.elm b/modules/webapp/src/main/elm/Page/Login/Update.elm
index f8cb3766..56882fcd 100644
--- a/modules/webapp/src/main/elm/Page/Login/Update.elm
+++ b/modules/webapp/src/main/elm/Page/Login/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Login.Update exposing (update)
import Api
diff --git a/modules/webapp/src/main/elm/Page/Login/View2.elm b/modules/webapp/src/main/elm/Page/Login/View2.elm
index 57cc3d93..9ac3c8db 100644
--- a/modules/webapp/src/main/elm/Page/Login/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Login/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Login.View2 exposing (viewContent, viewSidebar)
import Api.Model.VersionInfo exposing (VersionInfo)
diff --git a/modules/webapp/src/main/elm/Page/ManageData/Data.elm b/modules/webapp/src/main/elm/Page/ManageData/Data.elm
index f67f8dbc..07f79c48 100644
--- a/modules/webapp/src/main/elm/Page/ManageData/Data.elm
+++ b/modules/webapp/src/main/elm/Page/ManageData/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.ManageData.Data exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Page/ManageData/Update.elm b/modules/webapp/src/main/elm/Page/ManageData/Update.elm
index 487ff837..8a2df98b 100644
--- a/modules/webapp/src/main/elm/Page/ManageData/Update.elm
+++ b/modules/webapp/src/main/elm/Page/ManageData/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.ManageData.Update exposing (update)
import Comp.CustomFieldManage
diff --git a/modules/webapp/src/main/elm/Page/ManageData/View2.elm b/modules/webapp/src/main/elm/Page/ManageData/View2.elm
index 22788317..f4b46695 100644
--- a/modules/webapp/src/main/elm/Page/ManageData/View2.elm
+++ b/modules/webapp/src/main/elm/Page/ManageData/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.ManageData.View2 exposing (viewContent, viewSidebar)
import Comp.CustomFieldManage
diff --git a/modules/webapp/src/main/elm/Page/NewInvite/Data.elm b/modules/webapp/src/main/elm/Page/NewInvite/Data.elm
index b05d8e86..4f716345 100644
--- a/modules/webapp/src/main/elm/Page/NewInvite/Data.elm
+++ b/modules/webapp/src/main/elm/Page/NewInvite/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.NewInvite.Data exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Page/NewInvite/Update.elm b/modules/webapp/src/main/elm/Page/NewInvite/Update.elm
index c5723937..cfff6024 100644
--- a/modules/webapp/src/main/elm/Page/NewInvite/Update.elm
+++ b/modules/webapp/src/main/elm/Page/NewInvite/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.NewInvite.Update exposing (update)
import Api
diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View2.elm b/modules/webapp/src/main/elm/Page/NewInvite/View2.elm
index 3431b39d..37f2077f 100644
--- a/modules/webapp/src/main/elm/Page/NewInvite/View2.elm
+++ b/modules/webapp/src/main/elm/Page/NewInvite/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.NewInvite.View2 exposing (viewContent, viewSidebar)
import Data.Flags exposing (Flags)
diff --git a/modules/webapp/src/main/elm/Page/Queue/Data.elm b/modules/webapp/src/main/elm/Page/Queue/Data.elm
index 89ac27db..ba0ba4a7 100644
--- a/modules/webapp/src/main/elm/Page/Queue/Data.elm
+++ b/modules/webapp/src/main/elm/Page/Queue/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Queue.Data exposing
( FormState(..)
, Model
diff --git a/modules/webapp/src/main/elm/Page/Queue/Update.elm b/modules/webapp/src/main/elm/Page/Queue/Update.elm
index 5e5754d7..d3ae08a0 100644
--- a/modules/webapp/src/main/elm/Page/Queue/Update.elm
+++ b/modules/webapp/src/main/elm/Page/Queue/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Queue.Update exposing (update)
import Api
diff --git a/modules/webapp/src/main/elm/Page/Queue/View2.elm b/modules/webapp/src/main/elm/Page/Queue/View2.elm
index 3a181f0c..00b45a7d 100644
--- a/modules/webapp/src/main/elm/Page/Queue/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Queue/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Queue.View2 exposing (viewContent, viewSidebar)
import Api.Model.JobDetail exposing (JobDetail)
diff --git a/modules/webapp/src/main/elm/Page/Register/Data.elm b/modules/webapp/src/main/elm/Page/Register/Data.elm
index e78dc244..f89d5660 100644
--- a/modules/webapp/src/main/elm/Page/Register/Data.elm
+++ b/modules/webapp/src/main/elm/Page/Register/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Register.Data exposing
( FormState(..)
, Model
diff --git a/modules/webapp/src/main/elm/Page/Register/Update.elm b/modules/webapp/src/main/elm/Page/Register/Update.elm
index 7e3a85d0..8eb22439 100644
--- a/modules/webapp/src/main/elm/Page/Register/Update.elm
+++ b/modules/webapp/src/main/elm/Page/Register/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Register.Update exposing (update)
import Api
diff --git a/modules/webapp/src/main/elm/Page/Register/View2.elm b/modules/webapp/src/main/elm/Page/Register/View2.elm
index 579bf7b0..2942c0c0 100644
--- a/modules/webapp/src/main/elm/Page/Register/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Register/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Register.View2 exposing (viewContent, viewSidebar)
import Comp.Basic as B
diff --git a/modules/webapp/src/main/elm/Page/Upload/Data.elm b/modules/webapp/src/main/elm/Page/Upload/Data.elm
index 6c9d31d6..b93c102e 100644
--- a/modules/webapp/src/main/elm/Page/Upload/Data.elm
+++ b/modules/webapp/src/main/elm/Page/Upload/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Upload.Data exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Page/Upload/Update.elm b/modules/webapp/src/main/elm/Page/Upload/Update.elm
index c494d21c..12c448a3 100644
--- a/modules/webapp/src/main/elm/Page/Upload/Update.elm
+++ b/modules/webapp/src/main/elm/Page/Upload/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Upload.Update exposing (update)
import Api
diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm
index 5d10e6c1..98f200b4 100644
--- a/modules/webapp/src/main/elm/Page/Upload/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.Upload.View2 exposing (viewContent, viewSidebar)
import Comp.Dropzone
@@ -229,19 +230,16 @@ renderUploads texts model =
[ class "mt-4"
, classList [ ( "hidden", List.isEmpty model.files || isSuccessAll model ) ]
]
- [ div [ class "sixteen wide column" ]
- [ div [ class "ui basic segment" ]
- [ h2 [ class S.header2 ]
- [ text texts.selectedFiles
- ]
- , div [ class "ui items" ] <|
- if model.singleItem then
- List.map (renderFileItem model (Just uploadAllTracker)) model.files
-
- else
- List.map (renderFileItem model Nothing) model.files
- ]
+ [ h2 [ class S.header2 ]
+ [ text texts.selectedFiles
+ , text (" (" ++ (List.length model.files |> String.fromInt) ++ ")")
]
+ , div [] <|
+ if model.singleItem then
+ List.map (renderFileItem model (Just uploadAllTracker)) model.files
+
+ else
+ List.map (renderFileItem model Nothing) model.files
]
diff --git a/modules/webapp/src/main/elm/Page/UserSettings/Data.elm b/modules/webapp/src/main/elm/Page/UserSettings/Data.elm
index 87042efc..17d4aeaf 100644
--- a/modules/webapp/src/main/elm/Page/UserSettings/Data.elm
+++ b/modules/webapp/src/main/elm/Page/UserSettings/Data.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.UserSettings.Data exposing
( Model
, Msg(..)
diff --git a/modules/webapp/src/main/elm/Page/UserSettings/Update.elm b/modules/webapp/src/main/elm/Page/UserSettings/Update.elm
index ddff1c9c..925d3b57 100644
--- a/modules/webapp/src/main/elm/Page/UserSettings/Update.elm
+++ b/modules/webapp/src/main/elm/Page/UserSettings/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.UserSettings.Update exposing (UpdateResult, update)
import Comp.ChangePasswordForm
diff --git a/modules/webapp/src/main/elm/Page/UserSettings/View2.elm b/modules/webapp/src/main/elm/Page/UserSettings/View2.elm
index 3c400fd2..1c058f4e 100644
--- a/modules/webapp/src/main/elm/Page/UserSettings/View2.elm
+++ b/modules/webapp/src/main/elm/Page/UserSettings/View2.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Page.UserSettings.View2 exposing (viewContent, viewSidebar)
import Comp.ChangePasswordForm
diff --git a/modules/webapp/src/main/elm/Ports.elm b/modules/webapp/src/main/elm/Ports.elm
index d1f696b0..7fd14f39 100644
--- a/modules/webapp/src/main/elm/Ports.elm
+++ b/modules/webapp/src/main/elm/Ports.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
port module Ports exposing
( checkSearchQueryString
, initClipboard
diff --git a/modules/webapp/src/main/elm/Styles.elm b/modules/webapp/src/main/elm/Styles.elm
index 7653e04f..f08a3d15 100644
--- a/modules/webapp/src/main/elm/Styles.elm
+++ b/modules/webapp/src/main/elm/Styles.elm
@@ -1,15 +1,16 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Styles exposing (..)
sidebar : String
sidebar =
- " flex flex-col flex-none md:w-80 w-full min-h-max px-4 dark:text-gray-200 shadow overflow-y-auto h-full transition-opacity transition-duration-200 scrollbar-thin scrollbar-light-sidebar dark:scrollbar-dark-sidebar"
+ " flex flex-col flex-none md:w-80 w-full min-h-max px-2 dark:text-gray-200 shadow overflow-y-auto h-full transition-opacity transition-duration-200 scrollbar-thin scrollbar-light-sidebar dark:scrollbar-dark-sidebar"
sidebarBg : String
@@ -297,9 +298,14 @@ border =
" border dark:border-bluegray-600 "
+border2 : String
+border2 =
+ " border-2 dark:border-bluegray-600 "
+
+
header1 : String
header1 =
- " text-3xl mt-3 mb-5 font-semibold tracking-wide "
+ " text-3xl mt-3 mb-5 font-semibold tracking-wide break-all"
header2 : String
diff --git a/modules/webapp/src/main/elm/Util/Address.elm b/modules/webapp/src/main/elm/Util/Address.elm
index a849f597..56b56868 100644
--- a/modules/webapp/src/main/elm/Util/Address.elm
+++ b/modules/webapp/src/main/elm/Util/Address.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Address exposing (toString)
import Api.Model.Address exposing (Address)
diff --git a/modules/webapp/src/main/elm/Util/Contact.elm b/modules/webapp/src/main/elm/Util/Contact.elm
index ec4a8940..2f3f3cd6 100644
--- a/modules/webapp/src/main/elm/Util/Contact.elm
+++ b/modules/webapp/src/main/elm/Util/Contact.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Contact exposing (toString)
import Api.Model.Contact exposing (Contact)
diff --git a/modules/webapp/src/main/elm/Util/CustomField.elm b/modules/webapp/src/main/elm/Util/CustomField.elm
index 1811380f..0868fefc 100644
--- a/modules/webapp/src/main/elm/Util/CustomField.elm
+++ b/modules/webapp/src/main/elm/Util/CustomField.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.CustomField exposing
( boolValue
, nameOrLabel
diff --git a/modules/webapp/src/main/elm/Util/Duration.elm b/modules/webapp/src/main/elm/Util/Duration.elm
index 2814b349..23ec1bd6 100644
--- a/modules/webapp/src/main/elm/Util/Duration.elm
+++ b/modules/webapp/src/main/elm/Util/Duration.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Duration exposing (Duration, toHuman)
-- 486ms -> 12s -> 1:05 -> 59:45 -> 1:02:12
diff --git a/modules/webapp/src/main/elm/Util/File.elm b/modules/webapp/src/main/elm/Util/File.elm
index bf79fca3..d6253cce 100644
--- a/modules/webapp/src/main/elm/Util/File.elm
+++ b/modules/webapp/src/main/elm/Util/File.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.File exposing (makeFileId)
import File exposing (File)
diff --git a/modules/webapp/src/main/elm/Util/Folder.elm b/modules/webapp/src/main/elm/Util/Folder.elm
index 93996276..d66ad9e6 100644
--- a/modules/webapp/src/main/elm/Util/Folder.elm
+++ b/modules/webapp/src/main/elm/Util/Folder.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Folder exposing
( isFolderMember
, mkFolderOption
diff --git a/modules/webapp/src/main/elm/Util/Html.elm b/modules/webapp/src/main/elm/Util/Html.elm
index ff5e7d30..761fd7fa 100644
--- a/modules/webapp/src/main/elm/Util/Html.elm
+++ b/modules/webapp/src/main/elm/Util/Html.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Html exposing
( KeyCode(..)
, checkbox2
diff --git a/modules/webapp/src/main/elm/Util/Http.elm b/modules/webapp/src/main/elm/Util/Http.elm
index 758b51e7..38ed20ce 100644
--- a/modules/webapp/src/main/elm/Util/Http.elm
+++ b/modules/webapp/src/main/elm/Util/Http.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Http exposing
( authDelete
, authGet
diff --git a/modules/webapp/src/main/elm/Util/ItemDragDrop.elm b/modules/webapp/src/main/elm/Util/ItemDragDrop.elm
index 0347f483..186aaf31 100644
--- a/modules/webapp/src/main/elm/Util/ItemDragDrop.elm
+++ b/modules/webapp/src/main/elm/Util/ItemDragDrop.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.ItemDragDrop exposing
( DragDropData
, Dropped
diff --git a/modules/webapp/src/main/elm/Util/List.elm b/modules/webapp/src/main/elm/Util/List.elm
index a3093f18..2063b538 100644
--- a/modules/webapp/src/main/elm/Util/List.elm
+++ b/modules/webapp/src/main/elm/Util/List.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.List exposing
( distinct
, dropRight
diff --git a/modules/webapp/src/main/elm/Util/Maybe.elm b/modules/webapp/src/main/elm/Util/Maybe.elm
index 8bb21d3b..3a9a0ca0 100644
--- a/modules/webapp/src/main/elm/Util/Maybe.elm
+++ b/modules/webapp/src/main/elm/Util/Maybe.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Maybe exposing
( filter
, fromString
diff --git a/modules/webapp/src/main/elm/Util/Person.elm b/modules/webapp/src/main/elm/Util/Person.elm
index 32b0e726..c16ba525 100644
--- a/modules/webapp/src/main/elm/Util/Person.elm
+++ b/modules/webapp/src/main/elm/Util/Person.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Person exposing (mkPersonOption)
import Api.Model.IdName exposing (IdName)
diff --git a/modules/webapp/src/main/elm/Util/Result.elm b/modules/webapp/src/main/elm/Util/Result.elm
index e91de07c..e8c69ed9 100644
--- a/modules/webapp/src/main/elm/Util/Result.elm
+++ b/modules/webapp/src/main/elm/Util/Result.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Result exposing (fold)
diff --git a/modules/webapp/src/main/elm/Util/Size.elm b/modules/webapp/src/main/elm/Util/Size.elm
index 29ca2fb6..bf128340 100644
--- a/modules/webapp/src/main/elm/Util/Size.elm
+++ b/modules/webapp/src/main/elm/Util/Size.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Size exposing
( SizeUnit(..)
, bytesReadable
diff --git a/modules/webapp/src/main/elm/Util/String.elm b/modules/webapp/src/main/elm/Util/String.elm
index 5569be0a..cab8a71e 100644
--- a/modules/webapp/src/main/elm/Util/String.elm
+++ b/modules/webapp/src/main/elm/Util/String.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.String exposing
( crazyEncode
, ellipsis
diff --git a/modules/webapp/src/main/elm/Util/Tag.elm b/modules/webapp/src/main/elm/Util/Tag.elm
index 8171e12e..212018dc 100644
--- a/modules/webapp/src/main/elm/Util/Tag.elm
+++ b/modules/webapp/src/main/elm/Util/Tag.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Tag exposing
( catSettings
, getCategories
diff --git a/modules/webapp/src/main/elm/Util/Time.elm b/modules/webapp/src/main/elm/Util/Time.elm
index 7d73d962..58eaee75 100644
--- a/modules/webapp/src/main/elm/Util/Time.elm
+++ b/modules/webapp/src/main/elm/Util/Time.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Time exposing (formatIsoDateTime)
import DateFormat
diff --git a/modules/webapp/src/main/elm/Util/Update.elm b/modules/webapp/src/main/elm/Util/Update.elm
index aeadc1e1..5f8d8f07 100644
--- a/modules/webapp/src/main/elm/Util/Update.elm
+++ b/modules/webapp/src/main/elm/Util/Update.elm
@@ -1,9 +1,10 @@
{-
- Copyright 2020 Docspell Contributors
+ Copyright 2020 Docspell Contributors
- SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-License-Identifier: GPL-3.0-or-later
-}
+
module Util.Update exposing
( andThen1
, andThen2
diff --git a/nix/configuration-test.nix b/nix/configuration-test.nix
index 33d3e9a3..dbdb28a1 100644
--- a/nix/configuration-test.nix
+++ b/nix/configuration-test.nix
@@ -12,7 +12,7 @@ in
i18n = {
defaultLocale = "en_US.UTF-8";
};
- console.keyMap = "neo";
+ console.keyMap = "de";
users.users.root = {
password = "root";
diff --git a/nix/release.nix b/nix/release.nix
index 21cc62da..547f479a 100644
--- a/nix/release.nix
+++ b/nix/release.nix
@@ -1,5 +1,20 @@
rec {
cfg = {
+ v0_25_1 = rec {
+ version = "0.25.1";
+ server = {
+ url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
+ sha256 = "0c6h9jh6kkqlc1ynqmagzb4ig6ci11jnm725p0mdgk1m5hqnm9dk";
+ };
+ joex = {
+ url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
+ sha256 = "0plps0mvwrx57cn8n7kl6h8mr319hf40rjyji3l7ymi2c83jf8v7";
+ };
+ tools = {
+ url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
+ sha256 = "1d7y6kjz7aqy8xiqx8592hg1pzfqmnz8jlz3770ahfj2yh3p8s3z";
+ };
+ };
v0_24_0 = rec {
version = "0.24.0";
server = {
@@ -92,7 +107,7 @@ rec {
};
};
pkg = v: import ./pkg.nix v;
- currentPkg = pkg cfg.v0_24_0;
+ currentPkg = pkg cfg.v0_25_1;
module-joex = ./module-joex.nix;
module-restserver = ./module-server.nix;
module-consumedir = ./module-consumedir.nix;
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 20f713bc..f88a76a1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -7,26 +7,26 @@ object Dependencies {
val BcryptVersion = "0.4"
val BetterMonadicForVersion = "0.3.1"
- val BitpeaceVersion = "0.9.0-M1"
+ val BitpeaceVersion = "0.9.0-M2"
val CalevVersion = "0.5.4"
val CatsParseVersion = "0.3.4"
val CirceVersion = "0.14.1"
val ClipboardJsVersion = "2.0.6"
val DoobieVersion = "1.0.0-M5"
- val EmilVersion = "0.10.0-M1"
+ val EmilVersion = "0.10.0-M2"
val FlexmarkVersion = "0.62.2"
- val FlywayVersion = "7.11.3"
+ val FlywayVersion = "7.12.0"
val Fs2Version = "3.0.6"
val Fs2CronVersion = "0.7.1"
val H2Version = "1.4.200"
- val Http4sVersion = "0.23.0-RC1"
+ val Http4sVersion = "0.23.0"
val Icu4jVersion = "69.1"
val JsoupVersion = "1.14.1"
val KindProjectorVersion = "0.10.3"
val KittensVersion = "2.3.2"
val LevigoJbig2Version = "2.0"
val Log4sVersion = "1.10.0"
- val LogbackVersion = "1.2.4"
+ val LogbackVersion = "1.2.5"
val MariaDbVersion = "2.7.3"
val MUnitVersion = "0.7.27"
val MUnitCatsEffectVersion = "1.0.5"
@@ -38,12 +38,12 @@ object Dependencies {
val ScalaJavaTimeVersion = "2.3.0"
val Slf4jVersion = "1.7.32"
val StanfordNlpVersion = "4.2.2"
- val TikaVersion = "1.27"
+ val TikaVersion = "2.0.0"
val YamuscaVersion = "0.8.1"
- val SwaggerUIVersion = "3.51.1"
+ val SwaggerUIVersion = "3.51.2"
val TwelveMonkeysVersion = "3.7.0"
val JQueryVersion = "3.5.1"
- val ViewerJSVersion = "0.5.8"
+ val ViewerJSVersion = "0.5.9"
val catsParse = Seq(
"org.typelevel" %% "cats-parse" % CatsParseVersion
diff --git a/project/change-version.sh b/project/change-version.sh
new file mode 100755
index 00000000..36cbb17b
--- /dev/null
+++ b/project/change-version.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname $0)/.."
+
+edit_version() {
+ file="$1"
+ old="$2"
+ new="$3"
+
+ sed -i "s/$old/$new/g" $file
+}
+
+current_version() {
+ cat "version.sbt" | head -n1 | cut -d'=' -f2 | xargs
+}
+
+curr="$(current_version)"
+
+if [ -z "$1" ]; then
+ echo "No new version given!"
+ exit 1
+fi
+
+edit_version "version.sbt" "$curr" "$1"
+edit_version "modules/restapi/src/main/resources/docspell-openapi.yml" "$curr" "$1"
+edit_version "modules/joexapi/src/main/resources/joex-openapi.yml" "$curr" "$1"
+edit_version "website/site/config.toml" "$curr" "$1"
diff --git a/project/dev-ui-build.sh b/project/dev-ui-build.sh
index bb1fedb1..8e153467 100755
--- a/project/dev-ui-build.sh
+++ b/project/dev-ui-build.sh
@@ -23,7 +23,7 @@ compile_css() {
echo "Building css …"
local srcs="$wdir/modules/webapp/src/main/styles/index.css"
local target="$targetbase/css/styles.css"
- cd $wdir && npx postcss "$srcs" -o "$target" --env development && cd -
+ cd $wdir/modules/webapp && npx postcss "$srcs" -o "$target" --env development && cd -
cat "$target" | gzip > "$targetbase/css/styles.css.gz"
cp "$targetbase/css/styles.css" "$resourcebase/css/"
cp "$targetbase/css/styles.css.gz" "$resourcebase/css/"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d73086f1..d7a29f3a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -9,6 +9,6 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("io.kevinlee" % "sbt-github-pages" % "0.6.0")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
diff --git a/tools/webextension/native/native.py b/tools/webextension/native/native.py
index bb3f5300..b8bd0941 100755
--- a/tools/webextension/native/native.py
+++ b/tools/webextension/native/native.py
@@ -7,13 +7,13 @@ import os
from os.path import expanduser
import subprocess
-# The path to the ds.sh tool.
+# The path to the dsc tool.
try:
home = expanduser("~")
- with open(home + '/.config/docspell/ds.cmd', 'r') as file:
- DS_SH_CMD = file.read().replace('\n', '')
+ with open(home + '/.config/docspell/dsc.cmd', 'r') as file:
+ DSC_CMD = file.read().replace('\n', '')
except:
- DS_SH_CMD="ds.sh"
+ DSC_SH_CMD="dsc"
# Read a message from stdin and decode it.
@@ -43,7 +43,7 @@ def send_message(encoded_message):
while True:
filename = get_message()
FNULL = open(os.devnull, 'w')
- rc = subprocess.call(args=[DS_SH_CMD, filename], stdout=FNULL, stderr=FNULL, close_fds=True)
+ rc = subprocess.call(args=[DSC_CMD, "upload", "--delete", filename], stdout=FNULL, stderr=FNULL, close_fds=True)
os.remove(filename)
if rc == 0:
send_message(encode_message(rc))
diff --git a/version.sbt b/version.sbt
index 814585bd..4772100d 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.25.0-SNAPSHOT"
+ThisBuild / version := "0.26.0-SNAPSHOT"
diff --git a/website/site/config.toml b/website/site/config.toml
index 40a180b3..dbb29d5b 100644
--- a/website/site/config.toml
+++ b/website/site/config.toml
@@ -26,4 +26,4 @@ skip_anchor_prefixes = [
[extra]
# Put all your custom variables here
-version = "0.25.0-SNAPSHOT"
+version = "0.26.0-SNAPSHOT"
diff --git a/website/site/content/docs/api/upload.md b/website/site/content/docs/api/upload.md
index 007b86a4..34eda0e9 100644
--- a/website/site/content/docs/api/upload.md
+++ b/website/site/content/docs/api/upload.md
@@ -94,8 +94,8 @@ specified via a JSON structure in a part with name `meta`:
# Endpoints
-Docspell needs to the collective that owns the files. There are the
-following ways for this.
+Docspell needs to know the collective that owns the files. There are
+the following ways for this.
## Authenticated User
@@ -160,5 +160,6 @@ checksum with:
/api/v1/open/integration/checkfile/[collective-name]/[sha256-checksum]
```
-See the [SMTP gateway](@/docs/tools/smtpgateway.md) or the [consumedir
-script](@/docs/tools/consumedir.md) for examples to use this endpoint.
+See the [SMTP gateway](@/docs/tools/smtpgateway.md) or the [dsc
+watch/upload](@/docs/tools/cli.md#docker) command for example can use
+this endpoint.
diff --git a/website/site/content/docs/features/_index.md b/website/site/content/docs/features/_index.md
index 5a3497d5..14202090 100644
--- a/website/site/content/docs/features/_index.md
+++ b/website/site/content/docs/features/_index.md
@@ -64,19 +64,16 @@ description = "A list of features and limitations."
- [eml](https://en.wikipedia.org/wiki/Email#Filename_extensions)
(e-mail files in plain text MIME)
- Tooling:
+ - [Command Line Interface](@/docs/tools/cli.md) allowing to upload
+ files, watch folders and many more!
- [Android App](@/docs/tools/android.md) to quickly upload files
from your android devices
- - [Watch a folder](@/docs/tools/consumedir.md): watch folders for
- changes and send files to docspell
- - [Simple CLI for uploading files](@/docs/tools/ds.md)
- [Firefox plugin](@/docs/tools/browserext.md): right click on a
link and send the file to docspell
- [SMTP Gateway](@/docs/tools/smtpgateway.md): Setup a SMTP server
that delivers mails directly to docspell.
- [Paperless Import](@/docs/tools/paperless-import.md) for importing
your data from paperless
- - [Directory Cleaner](@/docs/tools/consumedir-cleaner.md) clean
- directories with files that have been uploaded to docspell
- License: GPLv3
@@ -87,3 +84,4 @@ considering docspell at the moment.
- Documents cannot be modified.
- You can remove and add documents but there is no versioning.
+- There are no user/groups nor permission management
diff --git a/website/site/content/docs/feed/_index.md b/website/site/content/docs/feed/_index.md
index f193539a..7cc847e9 100644
--- a/website/site/content/docs/feed/_index.md
+++ b/website/site/content/docs/feed/_index.md
@@ -124,21 +124,18 @@ read more.
# Command-Line
-I like to use the command line, so there is a small script that
-accepts one or more files and uploads them to a configured Docspell
-url. It is possible to let the script delete all successfully uploaded
-files.
+I like to use the command line, and so there is a cli that can be used
+for some tasks, for example uploading files. Below is a quick demo, it
+supports many more options, see the link below for details.
-