|
|
eac01bfc61
|
update copyright 2025
|
2025-01-27 15:52:48 +07:00 |
|
|
|
5cb551a8db
|
fix(csharp-mvc): revert filling by default
|
2024-10-16 15:00:20 +07:00 |
|
|
|
17a03eea56
|
Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-10-15 18:29:42 +03:00 |
|
|
|
e4f5f0bca7
|
submit not for viewer
This reverts commit 35cf2fb0b0.
|
2024-10-15 18:06:37 +03:00 |
|
|
|
6ad97aebc7
|
feat(csharp-mvc): close editor. Fix Bug 69915
|
2024-10-10 15:32:42 +07:00 |
|
|
|
35cf2fb0b0
|
submit for all modes
|
2024-10-07 14:54:16 +03:00 |
|
|
|
2f4b28343c
|
feat(csharp-mvc): creating and editing pdf instead docxf
|
2024-07-16 15:10:17 +07:00 |
|
|
|
6d28e3f8d8
|
Merge branch 'release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-03-21 14:23:41 +03:00 |
|
|
|
0414319893
|
nodejs: fill permission in embedded mode
|
2024-03-21 14:05:31 +03:00 |
|
|
|
9721187083
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-09 12:21:37 +03:00 |
|
|
|
b3d3b81274
|
copyright 2024
|
2024-02-01 12:39:36 +03:00 |
|
|
|
dab4841c1d
|
inserting svg
|
2024-02-01 12:35:46 +03:00 |
|
|
|
b90f333fdd
|
csharp-mvc: add goback Users.cs
|
2023-12-29 12:47:37 +07:00 |
|
|
|
bf72a43605
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# 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/src/helpers/ExampleUsers.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2023-11-21 12:30:39 +03:00 |
|
|
|
9369b124da
|
csharp-mvc: saving formsdata
|
2023-11-13 15:26:17 +03:00 |
|
|
|
c86c6bf17e
|
Merge branch 'develop' into feature/user-image
|
2023-11-07 11:25:40 +07:00 |
|
|
|
672a351402
|
csharp-mvc: user image
|
2023-11-06 10:54:39 +07:00 |
|
|
|
7666394f1d
|
csharp-mvc: setUsers for region protection
|
2023-10-30 15:28:45 +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 |
|
|
|
eda8ab61e9
|
csharp-mvc: onRequestSelectDocument / setRequestedDocument
|
2023-10-03 11:51:00 +07:00 |
|
|
|
09c0f31fd6
|
csharp: onRequestSelectSpreadsheet/setRequestedSpreadsheet
|
2023-09-29 20:01:23 +07:00 |
|
|
|
2611fae25c
|
csharp-mvc: use ajax for display version history
|
2023-08-23 12:16:23 +03:00 |
|
|
|
469a8c087b
|
Merge branch 'develop' into feature/referenceData
|
2023-02-27 10:17:41 +03:00 |
|
|
|
4fa2049adc
|
csharp-mvc: names of helpers fixed + check of empty filename-string (logical error fixed)
|
2023-02-27 10:08:47 +03:00 |
|
|
|
586d7767b4
|
csharp-mvc: "protect" permission is added
|
2023-02-22 14:42:21 +03:00 |
|
|
|
75046b80c6
|
csharp-mvc: referenceData
|
2023-02-14 15:42:36 +03:00 |
|
|
|
3181c7449d
|
Copyright 2023
|
2023-01-20 15:27:03 +05:00 |
|
|
|
7c22ba4e9e
|
csharp-mvc: option to send directUrl
|
2022-12-01 10:46:24 +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 |
|
|
|
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 |
|
|
|
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 |
|
