Skip to content

Commit c3a2717

Browse files
HarveyKandolaHarveyKandola
authored
Merge pull request #126 from documize/nov-17-improvements
All new UX
2 parents e265323 + 34d7a97 commit c3a2717

File tree

878 files changed

+126919
-26576
lines changed

Some content is hidden

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

878 files changed

+126919
-26576
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Integrations for embedding SaaS data within documents.
4242

4343
## Latest version
4444

45-
v1.54.1
45+
v1.55.0
4646

4747
## OS support
4848

@@ -56,8 +56,8 @@ Documize runs on the following:
5656

5757
Documize is built with the following technologies:
5858

59-
- EmberJS (v2.15.0)
60-
- Go (v1.9.0)
59+
- EmberJS (v2.16.2)
60+
- Go (v1.9.2)
6161

6262
...and supports the following databases:
6363

‎build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,8 @@ for arch in amd64 ; do
5050
done
5151

5252
echo "Finished."
53+
54+
55+
# CGO_ENABLED=0 GOOS=linux go build -a -ldflags="-s -w" -installsuffix cgo
56+
# go build -ldflags '-d -s -w' -a -tags netgo -installsuffix netgo test.go
57+
# ldd test

‎core/database/database_test.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,6 @@ package database
1313

1414
import "testing"
1515

16-
//
17-
// // go test github.com/documize/community/core/database -run TestVersionExtract
18-
// func TestVersionExtract(t *testing.T) {
19-
// ts(t, "5", 5)
20-
// ts(t, "45-0ubuntu0-12.12.3", 45)
21-
// ts(t, "untu0-12.12.3", 0)
22-
// ts(t, "junk-string", 0)
23-
// ts(t, "somethingstring", 0)
24-
// }
25-
//
26-
// func ts(t *testing.T, in string, out int) {
27-
// got := ExtractVersionNumber(in)
28-
//
29-
// if got != out {
30-
// t.Errorf("version input `%s` got `%d` expected `%d`\n", in, got, out)
31-
// }
32-
// }
33-
3416
// go test github.com/documize/community/core/database -run TestGetVersion
3517
func TestGetVersion(t *testing.T) {
3618
ts2(t, "5.7.10", []int{5, 7, 10})

‎core/database/templates/db-error.html

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,18 @@
100100
</head>
101101

102102
<body>
103-
<div id="wrapper">
104-
<div class="container">
105-
<div class="logo">
106-
<img src="/assets/img/setup/logo.png" alt="Documize">
103+
<div class="container">
104+
<div class="logo">
105+
<img src="/assets/img/setup/logo.png" alt="Documize">
106+
</div>
107+
<div class="content clearfix">
108+
<div class="image">
109+
<img style="-webkit-user-select: none;" src="/assets/img/setup/error.png" width="184" height="159" alt="Database error">
107110
</div>
108-
<div class="content clearfix">
109-
<div class="image">
110-
<img style="-webkit-user-select: none;" src="/assets/img/setup/error.png" width="184" height="159" alt="Database error">
111-
</div>
112-
<div class="text">
113-
<h1>Database Error</h1>
114-
<p>There seems to be a problem with the Documize database: <strong>{{.DBname}}</strong></p>
115-
<p><em>{{.Issue}}</em></p>
116-
</div>
111+
<div class="text">
112+
<h1>Database Error</h1>
113+
<p>There seems to be a problem with the Documize database: <strong>{{.DBname}}</strong></p>
114+
<p><em>{{.Issue}}</em></p>
117115
</div>
118116
</div>
119117
</div>

‎domain/page/endpoint.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func (h *Handler) GetPage(w http.ResponseWriter, r *http.Request) {
191191

192192
// GetPages gets all pages for document.
193193
func (h *Handler) GetPages(w http.ResponseWriter, r *http.Request) {
194-
method := "page.GetPage"
194+
method := "page.GetPages"
195195
ctx := domain.GetRequestContext(r)
196196

197197
documentID := request.Param(r, "documentID")
@@ -219,6 +219,8 @@ func (h *Handler) GetPages(w http.ResponseWriter, r *http.Request) {
219219
pages = []page.Page{}
220220
}
221221

222+
page.Numberize(pages)
223+
222224
if err != nil {
223225
response.WriteServerError(w, method, err)
224226
h.Runtime.Log.Error(method, err)
@@ -337,7 +339,7 @@ func (h *Handler) DeletePages(w http.ResponseWriter, r *http.Request) {
337339
return
338340
}
339341

340-
model := new([]page.PageLevelRequest)
342+
model := new([]page.LevelRequest)
341343
err = json.Unmarshal(body, &model)
342344
if err != nil {
343345
response.WriteBadRequestError(w, method, "JSON marshal")
@@ -589,7 +591,7 @@ func (h *Handler) ChangePageSequence(w http.ResponseWriter, r *http.Request) {
589591
return
590592
}
591593

592-
model := new([]page.PageSequenceRequest)
594+
model := new([]page.SequenceRequest)
593595
err = json.Unmarshal(body, &model)
594596
if err != nil {
595597
response.WriteBadRequestError(w, method, err.Error())
@@ -650,7 +652,7 @@ func (h *Handler) ChangePageLevel(w http.ResponseWriter, r *http.Request) {
650652
return
651653
}
652654

653-
model := new([]page.PageLevelRequest)
655+
model := new([]page.LevelRequest)
654656
err = json.Unmarshal(body, &model)
655657
if err != nil {
656658
response.WriteBadRequestError(w, method, err.Error())

‎edition/community.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func main() {
4141
// product details
4242
rt.Product = env.ProdInfo{}
4343
rt.Product.Major = "1"
44-
rt.Product.Minor = "54"
45-
rt.Product.Patch = "1"
44+
rt.Product.Minor = "55"
45+
rt.Product.Patch = "0"
4646
rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
4747
rt.Product.Edition = "Community"
4848
rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

‎embed/bindata_assetfs.go

Lines changed: 2888 additions & 1356 deletions
Large diffs are not rendered by default.

‎gui/.eslintrc.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@ module.exports = {
1919
"_": true,
2020
"tinymce": true,
2121
"CodeMirror": true,
22-
"Drop": true,
2322
"Mousetrap": true,
2423
"Sortable": true,
2524
"moment": true,
2625
"Dropzone": true,
27-
"Tooltip": true,
2826
"server": true,
2927
"authenticateUser": true,
3028
"stubAudit": true,
3129
"stubUserNotification": true,
3230
"userLogin": true,
3331
"Keycloak": true,
34-
"slug": true
32+
"slug": true,
33+
"interact": true
3534
}
3635
};

‎gui/app/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010
// https://documize.com
1111

12-
import Ember from 'ember';
12+
import Application from '@ember/application';
1313
import Resolver from './resolver';
1414
import loadInitializers from 'ember-load-initializers';
1515
import config from './config/environment';
@@ -23,7 +23,7 @@ let App;
2323
// console.log(error);
2424
// });
2525

26-
App = Ember.Application.extend({
26+
App = Application.extend({
2727
modulePrefix: config.modulePrefix,
2828
podModulePrefix: config.podModulePrefix,
2929
Resolver

‎gui/app/authenticators/anonymous.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
//
1010
// https://documize.com
1111

12-
import Ember from 'ember';
13-
import Base from 'ember-simple-auth/authenticators/base';
12+
import { resolve } from 'rsvp';
1413

15-
const {
16-
RSVP: { resolve }
17-
} = Ember;
14+
import Base from 'ember-simple-auth/authenticators/base';
1815

1916
export default Base.extend({
2017
restore(data) {

0 commit comments

Comments
 (0)