|
|
361b8bd0f4
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-02-01 16:57:59 +03:00 |
|
|
|
71fde6f7b9
|
python: fix getServerUrl
|
2021-01-29 13:58:29 +03:00 |
|
|
|
dae246e8a2
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor
# Conflicts:
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/config/application.rb
|
2021-01-29 12:49:30 +03:00 |
|
|
|
6e81fa8996
|
Merge branch 'develop' into feature/insert-image
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 15:12:36 +03:00 |
|
|
|
54c6025bc5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/compare-file
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 13:38:00 +03:00 |
|
|
|
b94704adf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/insert-image
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-27 17:13:14 +03:00 |
|
|
|
fec328ad9d
|
python: setFavorite
|
2020-12-24 22:51:35 +03:00 |
|
|
|
51c180726c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
|
2020-11-29 13:29:01 +03:00 |
|
|
|
b21d179f4b
|
python: jwt for compare-file
|
2020-11-26 18:32:06 +03:00 |
|
|
|
c75f9166c5
|
python: compare-file
|
2020-11-26 18:30:27 +03:00 |
|
|
|
9876e745e5
|
python: jwt for insert-image
|
2020-11-26 17:27:01 +03:00 |
|
|
|
31337cc9c9
|
python: insert-image
|
2020-11-26 15:33:16 +03:00 |
|
|
|
6f6e80cf68
|
python: jwt for mailmerge
|
2020-11-26 00:14:12 +03:00 |
|
|
|
5521cd44dd
|
python: add DOC_SERV_JWT_HEADER
|
2020-11-24 13:27:54 +03:00 |
|
|
|
ee5fe30010
|
python: fix 791f2b53a9
|
2020-11-23 15:19:38 +03:00 |
|
|
|
791f2b53a9
|
python: config-refactor
|
2020-11-20 18:16:26 +03:00 |
|
|
|
a76ec17e70
|
Add languages
|
2020-11-20 12:59:46 +03:00 |
|
|
|
be5f6e3a6e
|
python: fix 4903c017f4
|
2020-11-18 18:14:59 +03:00 |
|
|
|
4903c017f4
|
python: mailmerge
|
2020-11-18 17:48:19 +03:00 |
|
|
|
b3a79deef8
|
python: get link to bookmark
|
2020-05-21 12:51:07 +03:00 |
|
|
|
ce16625091
|
python: converted filename was not sent to client
|
2020-03-03 13:27:15 +03:00 |
|
|
|
8fa77cb9ba
|
python: copyrights & cleanup
|
2020-03-03 11:00:23 +03:00 |
|
|
|
f038327928
|
python: sorting by date
|
2020-03-03 10:45:08 +03:00 |
|
|
|
0adaf8a84b
|
python: lower file extension
|
2020-03-03 10:35:52 +03:00 |
|
|
|
85cb88b0fc
|
python: fixed editors language
|
2020-03-03 10:26:49 +03:00 |
|
|
|
1c59409ce2
|
python: blockcontent mode
|
2019-11-07 17:50:30 +03:00 |
|
|
|
6ba9b33606
|
python: version history
|
2019-11-05 17:51:22 +03:00 |
|
|
|
8d657a0101
|
python: jwt support
|
2019-11-01 15:47:59 +03:00 |
|
|
|
c1454eff13
|
python: document list
|
2019-11-01 10:58:20 +03:00 |
|
|
|
f7867e4bc3
|
python: document editing
|
2019-10-28 12:58:31 +03:00 |
|
|
|
f94e057492
|
python: upload, convert, create sample
|
2019-10-25 17:05:20 +03:00 |
|
|
|
a5371faa27
|
python: django template
|
2019-10-25 16:54:23 +03:00 |
|
