Commit Graph

155 Commits

Author SHA1 Message Date
2f72904deb feat(csharp): enable features tips for anonymous 2025-03-03 11:38:09 +07:00
cd033ac3bd fix(csharp): correct null users for protect and mentions for anonymous 2025-03-03 11:37:07 +07:00
eac01bfc61 update copyright 2025 2025-01-27 15:52:48 +07:00
8dfce0020b fix(csharp): 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
ea5f2efe46 feat(csharp): close editor. Fix Bug 69915 2024-10-10 15:32:41 +07:00
35cf2fb0b0 submit for all modes 2024-10-07 14:54:16 +03:00
16580f4a00 feat(csharp): creating and editing pdf instead docxf 2024-07-16 15:35:12 +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
9e2aae1658 csharp: add goback Users.cs 2023-12-29 12:23:39 +07:00
5ac60bace6 Merge pull request #492 from ONLYOFFICE/feature/submit-form
Feature/submit form
2023-11-22 11:49:19 +03:00
c1d1af6fae Merge pull request #487 from ONLYOFFICE/feature/csharp-matrix-formats
Feature/csharp matrix formats
2023-11-21 15:14:21 +03: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
5581cc1ad2 csharp: saving formsdata 2023-11-13 15:17:44 +03:00
030985bbeb csharp: moved the submodule to the assets/document-templates subfolder 2023-11-08 15:02:58 +03:00
c86c6bf17e Merge branch 'develop' into feature/user-image 2023-11-07 11:25:40 +07:00
62e2f7426c csharp: user avatar 2023-11-06 11:41:09 +07: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