remove unused imports (#55 )

Thanks!
improving documentation on merge
2026-08-08 00:22:14 +01:00 · 2019-03-13 10:53:20 +01:00 · 2019-03-05 11:27:25 +01:00 · 2019-02-19 15:27:20 +01:00 · 2019-02-18 13:46:58 +01:00 · 2019-02-18 13:44:30 +01:00
9 changed files with 35 additions and 18 deletions
--- a/build/docs/content/02-html.md
+++ b/build/docs/content/02-html.md
@@ -186,8 +186,8 @@ You may also use *remote* paths for Google fonts, images and so on.

 > If you want to install fonts directly in the Gotenberg Docker image,
 > see to the [fonts section](#fonts).
-
-> For web fonts, there is a timeout of 500ms by default. You may update
+>
+> For web fonts (Google fonts), there is a timeout of 500ms by default. You may update
 > this value thanks to the form field `webFontsTimeout`.

 ### cURL
--- a/build/docs/content/05-office.md
+++ b/build/docs/content/05-office.md
@@ -12,6 +12,7 @@ You may send one or more Office documents. Following file extensions are accepte

 * `.txt`
 * `.rtf`
+* `.fodt`
 * `.doc`
 * `.docx`
 * `.odt`
--- a/build/docs/content/06-merge.md
+++ b/build/docs/content/06-merge.md
@@ -8,9 +8,11 @@ It accepts `POST` requests with a `multipart/form-data` Content-Type.

 ## Basic

-Nothing special here: you may send one or more PDF files and the API
+Nothing fancy here: you may send one or more PDF files and the API
 will merge them and return the resulting PDF file.

+> **Attention:** Gotenberg merges the PDF files alphabetically.
+
 ### cURL

 ```bash
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,4 +1,13 @@
 <!DOCTYPE html><html><head>
+    
+    <script async="" src="https://www.googletagmanager.com/gtag/js?id=UA-10196481-9"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-10196481-9');
+    </script>
    <meta charset="utf-8"/>
    <meta http-equiv="x-ua-compatible" content="ie=edge"/>
    <meta name="viewport" content="width=device-width, initial-scale=1"/>
@@ -364,7 +373,7 @@ are on the same level as the <code>index.html</code> file.</p>
 <p>If you want to install fonts directly in the Gotenberg Docker image,
 see to the <a href="#fonts">fonts section</a>.</p>

-<p>For web fonts, there is a timeout of 500ms by default. You may update
+<p>For web fonts (Google fonts), there is a timeout of 500ms by default. You may update
 this value thanks to the form field <code>webFontsTimeout</code>.</p>
 </blockquote>

@@ -647,6 +656,7 @@ $client-&gt;store($request, $dest);
 <ul>
 <li><code>.txt</code></li>
 <li><code>.rtf</code></li>
+<li><code>.fodt</code></li>
 <li><code>.doc</code></li>
 <li><code>.docx</code></li>
 <li><code>.odt</code></li>
@@ -777,9 +787,13 @@ $client-&gt;store($request, $dest);
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>Basic</h2>

-<p>Nothing special here: you may send one or more PDF files and the API
+<p>Nothing fancy here: you may send one or more PDF files and the API
 will merge them and return the resulting PDF file.</p>

+<blockquote>
+<p><strong>Attention:</strong> Gotenberg merges the PDF files alphabetically.</p>
+</blockquote>
+
 <h3 class="Heading"><a class="Anchor" aria-hidden="true" id="merge.basic.c_url" href="#merge.basic.c_url">
 	<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 </a>cURL</h3>
--- a/docs/theme/gotenberg/views/index.html
+++ b/docs/theme/gotenberg/views/index.html
@@ -1,6 +1,15 @@
 <!DOCTYPE html>
 <html>
  <head>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-10196481-9"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'UA-10196481-9');
+    </script>
    <meta charset="utf-8">
    <meta http-equiv="x-ua-compatible" content="ie=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,6 @@
 module github.com/thecodingmachine/gotenberg

 require (
-	github.com/derekparker/delve v1.1.0
 	github.com/google/go-cmp v0.2.0 // indirect
 	github.com/gorilla/websocket v1.4.0 // indirect
 	github.com/hhrutter/pdfcpu v0.1.19
@@ -12,10 +11,9 @@ require (
 	github.com/pkg/errors v0.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.0.1
 	github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect
-	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.2.2
 	golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect
-	golang.org/x/net v0.0.0-20181201002055-351d144fa1fc
+	golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect
 	golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
 	golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,23 +1,15 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/derekparker/delve v1.1.0 h1:icd65nMp7s2HiLz6y/6RCVXBdoED3xxYLwX09EMaRCc=
-github.com/derekparker/delve v1.1.0/go.mod h1:pMSZMfp0Nhbm8qdZJkuE/yPGOkLpGXLS1I4poXQpuJU=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/hhrutter/pdfcpu v0.1.18 h1:GX3d6tZxmQlmB5X9VUyOtx7+HZZpR+8ISLqBineP6dc=
-github.com/hhrutter/pdfcpu v0.1.18/go.mod h1:iaCmXGnOXPIvoGLELZZc4m/GpIopVsvLQ00thrbu8LU=
 github.com/hhrutter/pdfcpu v0.1.19 h1:J6GjNFDPjurQWallPW9gmz3CcNqBfvgB7Dad9T3e8Hc=
 github.com/hhrutter/pdfcpu v0.1.19/go.mod h1:iaCmXGnOXPIvoGLELZZc4m/GpIopVsvLQ00thrbu8LU=
-github.com/labstack/echo v0.0.0-20181123063703-c7eb8da9ec73 h1:oQvA3Xy8274W5Ldgo6Nogy4lX8XO5AaIBsjF5Ggk0IU=
-github.com/labstack/echo v0.0.0-20181123063703-c7eb8da9ec73/go.mod h1:rS0D1UPvC8/3sXjhSwEq+K1olh7ipbDhjDWATN2KSgA=
 github.com/labstack/echo v0.0.0-20190126223945-739700bf4ef7 h1:kFheQLunLP9dCBrmg3D7y9FD44tlk/nvZQ7JCNvvWEA=
 github.com/labstack/echo v0.0.0-20190126223945-739700bf4ef7/go.mod h1:rS0D1UPvC8/3sXjhSwEq+K1olh7ipbDhjDWATN2KSgA=
-github.com/labstack/echo v3.3.5+incompatible h1:9PfxPUmasKzeJor9uQTaXLT6WUG/r+vSTmvXxvv3JO4=
-github.com/labstack/echo v3.3.5+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.7/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
 github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0=
 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
@@ -37,8 +29,6 @@ github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY=
 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
--- a/internal/app/api/office.go
+++ b/internal/app/api/office.go
@@ -10,6 +10,7 @@ import (
 var officeExts = []string{
 	".txt",
 	".rtf",
+	".fodt",
 	".doc",
 	".docx",
 	".odt",
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -21,11 +21,13 @@ docker build -t thecodingmachine/gotenberg:base -f build/base/Dockerfile .
 docker build \
    --build-arg GOLANG_VERSION=${GOLANG_VERSION} \
    --build-arg VERSION=${VERSION} \
+    -t thecodingmachine/gotenberg:latest \
    -t thecodingmachine/gotenberg:${SEMVER[0]} \
    -t thecodingmachine/gotenberg:${SEMVER[0]}.${SEMVER[1]} \
    -t thecodingmachine/gotenberg:${SEMVER[0]}.${SEMVER[1]}.${SEMVER[2]} \
    -f build/package/Dockerfile .

+docker push "thecodingmachine/gotenberg:latest"
 docker push "thecodingmachine/gotenberg:${SEMVER[0]}"
 docker push "thecodingmachine/gotenberg:${SEMVER[0]}.${SEMVER[1]}"
 docker push "thecodingmachine/gotenberg:${SEMVER[0]}.${SEMVER[1]}.${SEMVER[2]}"
Author	SHA1	Message	Date
Alexander Joseph Trelore	ab78559710	remove unused imports (#55 ) Thanks!	2019-03-13 10:53:20 +01:00
Julien Neuhart	0d75bb1d3e	improving documentation on merge	2019-03-05 11:27:25 +01:00
Julien Neuhart	6441062e7f	adding Google analytics	2019-02-19 15:27:20 +01:00
Julien Neuhart	4827a45f22	adding flat open document support (fixes #47 )	2019-02-18 13:46:58 +01:00
Julien Neuhart	40eef457ab	adding latest tag (fixes #48 )	2019-02-18 13:44:30 +01:00
Julien Neuhart	c22a4d109b	minor fix in doc for web fonts	2019-02-01 11:22:06 +01:00