|
|
030985bbeb
|
csharp: moved the submodule to the assets/document-templates subfolder
|
2023-11-08 15:02:58 +03:00 |
|
|
|
0a76dba089
|
csharp: setUsers for region protection
|
2023-10-30 15:45:16 +07:00 |
|
|
|
c0051304d9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word
# Conflicts:
# CHANGELOG.md
# 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-spring/src/main/resources/templates/editor.html
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/php/src/views/DocEditorView.php
# web/documentserver-example/php/templates/docEditor.tpl
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2023-10-12 11:54:43 +03:00 |
|
|
|
50d2248cd6
|
csharp: onRequestSelectDocument / setRequestedDocument
|
2023-10-03 11:38:17 +07:00 |
|
|
|
42854f325a
|
csharp-mvc: onRequestSelectSpreadsheet/setRequestedSpreadsheet
|
2023-09-29 20:35:32 +07:00 |
|
|
|
5f0fcfebd2
|
csharp: use ajax for display version history
|
2023-08-21 21:31:06 +03:00 |
|
|
|
33363f6144
|
fixed: generating key
|
2023-06-26 13:01:03 +03:00 |
|
|
|
469a8c087b
|
Merge branch 'develop' into feature/referenceData
|
2023-02-27 10:17:41 +03:00 |
|
|
|
ea8b0c0fa3
|
csharp: "protect" permission is added
|
2023-02-22 14:39:27 +03:00 |
|
|
|
69caf53646
|
csharp: referenceData
|
2023-02-14 15:20:27 +03:00 |
|
|
|
3181c7449d
|
Copyright 2023
|
2023-01-20 15:27:03 +05:00 |
|
|
|
05b8989a87
|
csharp: option to send directUrl
|
2022-12-01 10:46:26 +03:00 |
|
|
|
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 |
|
|
|
208b8926be
|
[add] - csharp - directUrl
|
2022-07-01 19:28:55 +03:00 |
|
|
|
500f076e38
|
fix - csharp - coEditing from permissions to editorConfig
|
2022-06-16 16:36:51 +03:00 |
|
|
|
8c90737bf6
|
add - charp - anonymous without liveview
|
2022-06-15 20:38:16 +03:00 |
|
|
|
7f54659d3b
|
add - csharp - anonymous without permissions.chat
|
2022-06-14 19:50:44 +03:00 |
|
|
|
22d2031426
|
fix - csharp - replace with regex
|
2022-06-14 18:10:18 +03:00 |
|
|
|
e1c815b574
|
Fix folder display for localhost
|
2022-06-10 18:29:44 +03:00 |
|
|
|
e0c0595796
|
removed chat
|
2022-03-16 13:06:37 +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 |
|
|
|
88b7fbf55c
|
csharp: userInfoGroups
|
2022-02-11 00:43:01 +03:00 |
|
|
|
fed5598294
|
С#: remove unnecessary construction
|
2022-02-01 16:00:50 +03:00 |
|
|
|
224d2bc570
|
С#: Merge jwt prev + diff
|
2022-01-18 16:25:13 +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 |
|
|
|
ee674e6a57
|
jwt signature for prev.* files C# (via handler)
|
2022-01-10 12:57:22 +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 |
|
|
|
71e1b28f47
|
jwt signature for prev.* files C# (via handler)
|
2021-12-21 17:45:42 +03:00 |
|
|
|
c7e7c9c19d
|
fileType in setHistoryData for C#
|
2021-12-08 17:21:54 +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 |
|
|
|
ad9d627c82
|
csharp: docxf
|
2021-11-17 16:46:09 +03:00 |
|
|
|
08119d7458
|
csharp: revert filling in docx
|
2021-11-17 11:00:49 +03:00 |
|
|
|
83cefae85b
|
csharp: hide submit button
|
2021-11-17 10:48:36 +03:00 |
|
|
|
f1a64c92d2
|
csharp: oform
|
2021-11-17 10:47:50 +03:00 |
|
|
|
08d1080527
|
csharp: fix embedded mode
|
2021-11-02 17:40:00 +03:00 |
|
|
|
35afb7a8fe
|
csharp: add ability to custom path for files storage
|
2021-10-15 13:12:58 +03:00 |
|
|
|
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 |
|
