Skip to content

Commit 4ff78ef

Browse files
Merge pull request #114 from documize/inject-domain
All new architecture for backend API
2 parents 7756a50 + 4fc83c9 commit 4ff78ef

File tree

256 files changed

+17597
-15858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+17597
-15858
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li
88

99
## Latest version
1010

11-
v1.50.1
11+
v1.51.0
1212

1313
## OS Support
1414

@@ -19,8 +19,8 @@ v1.50.1
1919
## Tech stack
2020

2121
- EmberJS (v2.14.0)
22-
- Go (v1.8)
23-
- MySQL (v5.7.10+) or Percona (v5.7.16-10+)
22+
- Go (v1.8.3)
23+
- MySQL (v5.7.10+) or Percona (v5.7.16-10+) or MariaDB (10.3.0+)
2424

2525
## Documentation
2626

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ cp -r gui/dist-prod/tinymce embed/bindata/public/tinymce
1717
cp -r gui/dist-prod/sections embed/bindata/public/sections
1818
cp gui/dist-prod/*.* embed/bindata
1919
cp gui/dist-prod/favicon.ico embed/bindata/public
20+
cp gui/dist-prod/manifest.json embed/bindata/public
2021
rm -rf embed/bindata/mail
2122
mkdir -p embed/bindata/mail
22-
cp core/api/mail/*.html embed/bindata/mail
23+
cp domain/mail/*.html embed/bindata/mail
2324
cp core/database/templates/*.html embed/bindata
2425
rm -rf embed/bindata/scripts
2526
mkdir -p embed/bindata/scripts

core/api/convert/convert.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package convert
1414

1515
import (
1616
"errors"
17+
1718
"github.com/documize/community/core/api/convert/html"
1819
"github.com/documize/community/core/api/plugins"
1920
api "github.com/documize/community/core/convapi"
@@ -53,7 +54,7 @@ func Convert(ctx context.Context, xtn string, fileRequest *api.DocumentConversio
5354
/* TODO add sanitisation for body & title HTML
5455
var titlePolicy, bodyPolicy *bluemonday.Policy
5556
56-
func init() {
57+
func xxx() {
5758
policy := bluemonday.UGCPolicy()
5859
policy.RequireNoFollowOnLinks(true)
5960

core/api/convert/html/html.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"strings"
1818

1919
api "github.com/documize/community/core/convapi"
20-
"github.com/documize/community/core/log"
2120
"github.com/documize/community/core/stringutil"
2221
"golang.org/x/net/context"
2322
"golang.org/x/net/html"
@@ -192,7 +191,6 @@ func (h *htmlToSplit) renderAppend(c *html.Node) error {
192191
ebyt := stringutil.EscapeHTMLcomplexCharsByte(byt)
193192
if len(ebyt) > maxBody {
194193
msg := fmt.Sprintf("(Documize warning: HTML render element ignored, size of %d exceeded maxBody of %d.)", len(ebyt), maxBody)
195-
log.Info(msg)
196194
ebyt = []byte("<p><b>" + msg + "</b></p>")
197195
}
198196
if len(h.thisSect.Body)+len(ebyt) > maxBody {

core/api/endpoint/TESTDATA.html

Lines changed: 0 additions & 13 deletions
This file was deleted.

core/api/endpoint/attachment_endpoint.go

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)