|
|
af4cfa8074
|
nodejs: wopi: correct user
|
2021-05-25 17:37:01 +03:00 |
|
|
|
922143bf37
|
nodejs: wopi: default click action
|
2021-05-25 17:35:27 +03:00 |
|
|
|
12f88044b7
|
Merge remote-tracking branch 'origin/develop' into feature/wopi
# Conflicts:
# web/documentserver-example/nodejs/app.js
|
2021-04-28 13:19:37 +03:00 |
|
|
|
0e0eea3ebd
|
nodejs: wopi ui
|
2021-04-28 13:10:41 +03:00 |
|
|
|
b5ef247245
|
nodejs: wopi create file
|
2021-04-28 11:58:59 +03:00 |
|
|
|
06a48dcd4a
|
nodejs: add description for user rights
|
2021-04-27 00:03:05 +03:00 |
|
|
|
49a9f10972
|
nodejs: add list users
|
2021-04-23 10:37:43 +03:00 |
|
|
|
667b9abc0d
|
view files
|
2021-04-22 11:59:20 +03:00 |
|
|
|
5928ed1756
|
Merge pull request #151 from ONLYOFFICE/feature/user-permissions
Feature/user permissions
|
2021-04-21 17:32:25 +03:00 |
|
|
|
fe803efd35
|
nodejs: added comments
|
2021-04-20 17:33:49 +03:00 |
|
|
|
3bcfc0e714
|
nodejs: forbidden to download, print and copy for uid-2
|
2021-04-19 18:01:08 +03:00 |
|
|
|
2f7a2bd545
|
nodejs: add editorConfig.createUrl
|
2021-04-18 18:23:57 +03:00 |
|
|
|
376de19dae
|
nodejs: add password for convert
|
2021-04-14 11:11:12 +03:00 |
|
|
|
2277c060bb
|
nodejs: fix punctuation
|
2021-04-12 09:58:06 +03:00 |
|
|
|
7884f3c64c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/redesign
# Conflicts:
# web/documentserver-example/nodejs/views/index.ejs
# web/documentserver-example/python/templates/index.html
|
2021-03-25 21:31:22 +03:00 |
|
|
|
4f2d7f0a3f
|
nodejs: fix punctuation
|
2021-03-25 21:27:43 +03:00 |
|
|
|
53ec97b0c8
|
nodejs: redesign window upload
|
2021-03-21 15:59:49 +03:00 |
|
|
|
94beb67552
|
nodejs: added tooltips
|
2021-03-16 23:22:49 +03:00 |
|
|
|
3c1eab070d
|
nodejs: redesign
|
2021-03-16 00:06:26 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
988e336f43
|
forcesave is disabled by default (b541936473)
|
2021-03-05 11:20:12 +03:00 |
|
|
|
f0309615d6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
# Conflicts:
# web/documentserver-example/nodejs/app.js
|
2021-02-18 15:39:20 +03:00 |
|
|
|
8e6ae3b915
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/app/models/file_model.rb
|
2021-02-18 15:13:34 +03:00 |
|
|
|
8fc9d6125c
|
Merge pull request #122 from ONLYOFFICE/feature/request-name
Feature/request name
|
2021-02-18 14:14:00 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
6ec262e221
|
nodejs: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-04 16:10:00 +03:00 |
|
|
|
5fdbd2954b
|
uploaded instead created
|
2021-02-04 16:06:40 +03:00 |
|
|
|
758291fd71
|
owner instead author
|
2021-02-04 15:43:09 +03:00 |
|
|
|
d075855065
|
nodejs: request user name
|
2021-02-04 15:24:09 +03:00 |
|
|
|
2ec0a3798d
|
nodejs: reviewGroup instead reviewPermissions
|
2021-02-04 14:31:49 +03:00 |
|
|
|
620a097faa
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
|
2021-02-02 13:59:17 +03:00 |
|
|
|
c3bb70aa9a
|
nodejs: submit filled form
|
2021-02-02 09:52:24 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
606ce23228
|
nodejs: fix merge
|
2021-01-28 15:29:14 +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 |
|
|
|
4c987fbfce
|
nodejs: fix merge
|
2021-01-28 13:49:30 +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 |
|
|
|
53e1fbe9ef
|
nodejs fix merge
|
2021-01-28 10:49:44 +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 |
|
|
|
267fe7d260
|
Merge pull request #105 from ONLYOFFICE/feature/favorite
Feature/favorite
|
2021-01-27 11:49:21 +03:00 |
|
|
|
8cf4eb2fc2
|
Merge branch 'develop' into feature/new-banner
|
2021-01-26 16:06:46 +03:00 |
|
|
|
c54b760526
|
Merge branch 'develop' into feature/reviewPermissions
|
2021-01-19 15:54:13 +03:00 |
|
|
|
25906383e2
|
nodejs: setFavorite
|
2020-12-16 09:57:29 +03:00 |
|
|
|
c597e914a9
|
nodejs: favorite
|
2020-12-15 17:33:00 +03:00 |
|
|
|
51c180726c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
|
2020-11-29 13:29:01 +03:00 |
|
|
|
aca8e94f2a
|
nodejs: compare-file
|
2020-11-26 18:13:01 +03:00 |
|
|
|
2090bad807
|
nodejs: insert-image
|
2020-11-26 17:12:53 +03:00 |
|
|
|
74505f5c44
|
nodejs: jwt for mailmerge
|
2020-11-26 00:31:42 +03:00 |
|
|
|
280d9e3dba
|
nodejs: fix config
|
2020-11-23 15:47:37 +03:00 |
|
