|
|
24aee6d194
|
Merge branch 'release/v7.2.0' into feature/directUrl
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
|
2022-08-03 12:13:12 +03:00 |
|
|
|
901bb61883
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/liveview
# Conflicts:
# CHANGELOG.md
|
2022-07-29 17:21:54 +03:00 |
|
|
|
b3512ea0ce
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/chat
# Conflicts:
# CHANGELOG.md
|
2022-07-29 17:16:54 +03:00 |
|
|
|
dacf72cae2
|
[add] - csharp mvc - directUrl
|
2022-07-01 19:29:52 +03:00 |
|
|
|
e578f29d9d
|
fix - csharp mvc - coEditing from permissions to editorConfig
|
2022-06-16 16:35:57 +03:00 |
|
|
|
33e1489cd6
|
add - charp mvc - anonymous without liveview
|
2022-06-15 20:41:32 +03:00 |
|
|
|
2031d65adb
|
add - csharp mvc - anonymous without permissions.chat
|
2022-06-14 19:53:12 +03:00 |
|
|
|
bd8e4d6ec7
|
csharp-fix goback
|
2022-06-10 18:31:22 +03:00 |
|
|
|
e0c0595796
|
removed chat
|
2022-03-16 13:06:37 +03:00 |
|
|
|
6525d7210f
|
micro fix
|
2022-03-15 13:33:33 +03:00 |
|
|
|
6b93311ce5
|
customization change
|
2022-03-15 13:10:34 +03:00 |
|
|
|
b9f3bfd2e2
|
new branch + anonymus without id
|
2022-03-02 11:16:24 +03:00 |
|
|
|
c4c819c513
|
format
|
2022-02-11 10:54:03 +03:00 |
|
|
|
ebc864736d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/java/README.md
|
2022-02-11 10:22:04 +03:00 |
|
|
|
c663bfe464
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/userInfoGroups
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2022-02-11 10:14:06 +03:00 |
|
|
|
f9449f7742
|
csharp-mvc: userInfoGroups
|
2022-02-11 00:38:55 +03:00 |
|
|
|
382160f2fc
|
Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop
# Conflicts:
# web/documentserver-example/csharp-mvc/assets
# web/documentserver-example/csharp/assets
# web/documentserver-example/java-spring/src/main/resources/assets
# web/documentserver-example/java/src/main/resources/assets
# web/documentserver-example/nodejs/public/assets
# web/documentserver-example/php/assets
# web/documentserver-example/python/assets
# web/documentserver-example/ruby/public/assets
|
2022-02-09 10:05:10 +03:00 |
|
|
|
6716d38a40
|
support xlsb
|
2022-02-06 11:15:20 +03:00 |
|
|
|
02351113e1
|
С# mvc: remove unnecessary functions and constructions
|
2022-02-01 15:55:36 +03:00 |
|
|
|
57cd71095d
|
С# mvc: Merge jwt prev + diff
|
2022-01-18 17:00:56 +03:00 |
|
|
|
5caaf0b1c6
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2022-01-10 19:00:27 +03:00 |
|
|
|
f81ae23a64
|
Merge branch 'feature/jwtHistoryFiles' of github.com:ONLYOFFICE/document-server-integration into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/ruby/licenses/3rd-Party.license
|
2022-01-10 17:08:45 +03:00 |
|
|
|
bb28257a2d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fileType
# Conflicts:
# web/documentserver-example/php/doceditor.php
|
2022-01-10 16:03:18 +03:00 |
|
|
|
05ea165f77
|
format
|
2022-01-10 16:00:41 +03:00 |
|
|
|
c2b333fac7
|
fix commit
|
2022-01-10 13:01:11 +03:00 |
|
|
|
cae75d9888
|
jwt signature for prev.* files C# mvc (via handler) on Net4.8
|
2022-01-10 12:59:18 +03:00 |
|
|
|
425bd81f08
|
fix commit
|
2021-12-22 18:20:29 +03:00 |
|
|
|
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 |
|
|
|
42859d7a28
|
Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop
|
2021-09-14 09:29:48 +03:00 |
|
|
|
7027970b65
|
support oxps
|
2021-09-14 09:29:19 +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 |
|
