|
|
7a6afed510
|
Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
|
2021-08-29 15:39:13 +03:00 |
|
|
|
90c4d54460
|
csharp: new comments
|
2021-08-24 12:40:41 +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 |
|
|
|
c3fa000cea
|
csharp: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:46:28 +03:00 |
|
|
|
61295628de
|
csharp: added commentGroups and sets comment permissions
|
2021-06-16 15:39:33 +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 |
|
|
|
90e7922d7c
|
csharp: fixed bug for setting and removing password for blank document
|
2021-05-31 13:38:05 +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 |
|
|
|
50b9aa4296
|
csharp: removed the ability to add mentions for anonymous users
|
2021-05-21 17:26:47 +03:00 |
|
|
|
0392ffbc9a
|
csharp: add mentions
|
2021-05-20 10:53:43 +03:00 |
|
|
|
f42480dfd2
|
csharp: add favorite and permissions at user list
|
2021-04-26 12:32:13 +03:00 |
|
|
|
f908bba727
|
csharp: add list users
|
2021-04-23 17:39:41 +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 |
|
|
|
27093c5c7a
|
csharp: add jwt for download files
|
2021-04-21 13:13:52 +03:00 |
|
|
|
f2714cb554
|
csharp-mvs: added comments
|
2021-04-20 17:33:49 +03:00 |
|
|
|
0997d2fef5
|
csharp: added comments
|
2021-04-20 17:33:48 +03:00 |
|
|
|
389023cefb
|
csharp: forbidden to download, print and copy for uid-2
|
2021-04-19 18:21:47 +03:00 |
|
|
|
9332035b33
|
csharp: add editorConfig.createUrl
|
2021-04-18 18:23:58 +03:00 |
|
|
|
6eaa948d3a
|
csharp: permissions.edit add condition view
|
2021-04-11 19:43:44 +03:00 |
|
|
|
8a0a1d3a42
|
csharp: fix null user
|
2021-04-09 12:51:32 +03:00 |
|
|
|
25804d0c0a
|
csharp: ext to lowercase
|
2021-03-29 18:16:53 +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 |
|
|
|
f0cc80fd53
|
csharp: submit filled form
|
2021-02-19 14:59:36 +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 |
|
|
|
2cb91eb8d5
|
csharp: added dynamic favicon
|
2021-02-17 20:18:15 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
3e8b6aaffa
|
csharp: download forcesaved file
|
2021-02-16 13:28:14 +03:00 |
|
|
|
e04155e7ad
|
csharp: added forcesave
|
2021-02-15 17:27:29 +03:00 |
|
|
|
3b89aae808
|
csharp: request user name
|
2021-02-08 22:28:19 +03:00 |
|
|
|
79d12ecd02
|
Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
|
2021-02-08 10:27:36 +03:00 |
|
|
|
c6deb13712
|
csharp: reviewGroup instead reviewPermissions
|
2021-02-07 19:30:32 +03:00 |
|
|
|
212fd26807
|
csharp: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-06 20:36:55 +03:00 |
|
|
|
856613d644
|
csharp: check filename from url
|
2021-02-05 13:25:12 +03:00 |
|
|
|
1e023e58b2
|
Merge pull request #119 from ONLYOFFICE/feature/template-submodule
Feature/template submodule
|
2021-02-04 18:39:50 +03:00 |
|
|
|
96d6c521ef
|
csharp: changed path to sample
|
2021-02-04 16:56:28 +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 |
|
|
|
90dd2c837f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule
|
2021-02-04 11:00:08 +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 |
|
|
|
8b9a2d2481
|
csharp: fix merge
|
2021-02-01 23:02:15 +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 |
|
