|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
16a0846248
|
jwt signature for prev.* files C# mvc (via handler) on Net4.8
|
2021-12-21 18:24:02 +03:00 |
|
|
|
f2d4eb2a42
|
fileType in setHistoryData for C# mvc
|
2021-12-08 17:20:19 +03:00 |
|
|
|
95ea50210f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
# Conflicts:
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
|
2021-11-18 12:54:57 +03:00 |
|
|
|
a26a559921
|
csharp-mvc: docxf
|
2021-11-17 16:34:20 +03:00 |
|
|
|
50821067d7
|
csharp-mvc: revert filling in docx
|
2021-11-16 17:32:09 +03:00 |
|
|
|
18bd45e4ab
|
csharp-mvc: hide submit button
|
2021-11-16 17:28:06 +03:00 |
|
|
|
79aac3ccd6
|
csharp-mvc: oform
|
2021-11-16 16:55:49 +03:00 |
|
|
|
bf18854ec0
|
csharp-mvc: fix embedded mode
|
2021-11-02 17:46:41 +03:00 |
|
|
|
60c03c1403
|
csharp-mvc: fix history
|
2021-10-19 11:41:28 +03:00 |
|
|
|
375d916fe2
|
csharp-mvc: add ability to use custom path for files storage
|
2021-10-15 14:34:35 +03:00 |
|
|
|
3df2773867
|
change image url to "" for Blank template
|
2021-07-29 13:48:55 +03:00 |
|
|
|
2782f8f9bd
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/comment-group
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/java/src/main/java/entities/User.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/nodejs/helpers/users.js
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2021-06-17 10:11:07 +03:00 |
|
|
|
417bd3b9f2
|
csharp-mvc: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:48:48 +03:00 |
|
|
|
2d4490e21a
|
csharp-mvc: added commentGroups and sets comment permissions
|
2021-06-16 15:41:23 +03:00 |
|
|
|
badc6644c2
|
Merge pull request #164 from ONLYOFFICE/feature/document-password
Fixed password bug for blank document
|
2021-05-31 13:51:53 +03:00 |
|
|
|
e3f42fffba
|
csharp-mvc: fixed bug for setting and removing password for blank document
|
2021-05-31 13:30:24 +03:00 |
|
|
|
07d11f0bae
|
fixed the no ability to add mentions for anonymous users
|
2021-05-28 15:10:06 +03:00 |
|
|
|
60992ecb38
|
variable users renamed to usersForMentions
|
2021-05-26 17:01:47 +03:00 |
|
|
|
304d628dbe
|
csharp-mvc: removed the ability to add mentions for anonymous users
|
2021-05-21 17:28:20 +03:00 |
|
|
|
b6b980de92
|
mvc: mentions
|
2021-05-20 10:53:31 +03:00 |
|
|
|
22ca55b4c3
|
csharp-mvc: add favorite and permissions at user list
|
2021-04-26 12:32:39 +03:00 |
|
|
|
c679f7ddd3
|
csharp-mvc: add list users
|
2021-04-23 17:17:35 +03:00 |
|
|
|
0b0cdd395c
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: forbidden download, print and copy for uid-3
|
2021-04-22 16:27:52 +03:00 |
|
|
|
ba9d927fc0
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: remove edit button for not OOXML
|
2021-04-22 11:29:59 +03:00 |
|
|
|
495435c8ff
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwt-download-files
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
# web/documentserver-example/nodejs/helpers/docManager.js
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/utils/docManager.py
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/app/controllers/home_controller.rb
# web/documentserver-example/ruby/app/models/document_helper.rb
# web/documentserver-example/ruby/app/models/file_model.rb
|
2021-04-21 17:53:53 +03:00 |
|
|
|
5928ed1756
|
Merge pull request #151 from ONLYOFFICE/feature/user-permissions
Feature/user permissions
|
2021-04-21 17:32:25 +03:00 |
|
|
|
a2116bf3f7
|
csharp-mvc: add jwt for download files
|
2021-04-21 12:42:22 +03:00 |
|
|
|
f2714cb554
|
csharp-mvs: added comments
|
2021-04-20 17:33:49 +03:00 |
|
|
|
1c5b0df480
|
csharp-mvc: forbidden to download, print and copy for uid-2
|
2021-04-19 18:17:14 +03:00 |
|
|
|
b417633c3f
|
csharp-mvc: add editorConfig.createUrl
|
2021-04-18 18:23:59 +03:00 |
|
|
|
f788379eb5
|
csharp-mvc: permissions.edit add condition view
|
2021-04-11 19:44:37 +03:00 |
|
|
|
578ecec9af
|
csharp-mvc: ext to lowercase
|
2021-03-29 18:28:52 +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 |
|
|
|
2635306e2e
|
csharp-mvc: submit filled form
|
2021-02-19 14:59:59 +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 |
|
|
|
246ddc9f9c
|
csharp-mvc: download forcesaved file
|
2021-02-16 13:28:30 +03:00 |
|
|
|
733f798968
|
csharp-mvc: added forcesave
|
2021-02-15 17:26:16 +03:00 |
|
|
|
823374e2fe
|
csharp-mvc: request user name
|
2021-02-08 22:28:56 +03:00 |
|
|
|
61c388a7af
|
csharp-mvc: reviewGroup instead reviewPermissions
|
2021-02-07 19:35:29 +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 |
|
|
|
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 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
4dd5f9d9f6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/add-jwt
# Conflicts:
# web/documentserver-example/python/src/utils/historyManager.py
|
2021-02-02 11:02:53 +03:00 |
|
|
|
c0f459132e
|
csharp-mvc: fix merge
|
2021-02-01 21:07:49 +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 |
|
