Commit Graph

642 Commits

Author SHA1 Message Date
9c6667325f Copyright 2026 2026-01-15 15:03:03 +03:00
c973d1e8d5 Merge remote-tracking branch 'remotes/origin/master' into release/1.15.0
# Conflicts:
#	3rd-Party.license
#	web/documentserver-example/ruby/3rd-Party.license
#	web/documentserver-example/ruby/licenses/3rd-Party.license
2025-11-21 16:54:09 +03:00
63dc3304d8 delete: 3rd-Party.license 2025-11-14 16:37:05 +03:00
a5e2b31d8a ci: added licenses-csharp-mvc.yml 2025-11-14 16:28:49 +03:00
6ea0e491c7 feat(csharp): migrate from packages.config to PackageReference 2025-11-11 09:32:50 +03:00
2a0384c875 update formats 2025-10-15 10:44:43 +03:00
55fbdf7ba2 1.15.0 2025-07-30 15:55:15 +03:00
5e4f1de764 fix typo 2025-07-15 16:09:24 +03:00
10ce2da945 Merge pull request 'feature/new-index-page-text' from feature/new-index-page-text into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/72
2025-07-15 13:03:17 +00:00
057af70f2e fix typo 2025-07-15 15:45:32 +03:00
9c1d998384 feat(csharp-mvc): new text on empty main page 2025-07-14 11:36:53 +07:00
911f3e9723 feat(csharp-mvc): add start filling events and user roles 2025-07-09 12:59:59 +07:00
00296b90c8 update demo files 2025-07-04 16:42:09 +03:00
bfa121f343 Merge remote-tracking branch 'remotes/origin/develop' into feature/request-users-pagination
# Conflicts:
#	CHANGELOG.md
2025-07-02 09:06:12 +03:00
863eee6db7 feat(csharp-mvc): set users by parts with infinite scroll for pagination 2025-06-25 16:58:34 +07:00
8f9d99faf8 fix(csharp-mvc): conversion dialog starts with gray check mark on step 1 2025-06-24 15:12:26 +07:00
0b61d7ff21 Merge remote-tracking branch 'remotes/origin/develop' into feature/load-scripts-not-in-popup
# Conflicts:
#	CHANGELOG.md
2025-06-19 11:00:21 +03:00
cda6534e5b Merge pull request 'feature/change-tab-title-on-rename' from feature/change-tab-title-on-rename into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/65
2025-06-19 07:52:30 +00:00
c51e3b8837 formats update 2025-06-18 16:03:36 +03:00
eb0a556333 feat(csharp-mvc): loading scripts on page load 2025-06-18 15:15:50 +07:00
108f655fec feat(csharp-mvc): change document.title when renaming 2025-06-18 14:01:34 +07:00
36866764ce Merge remote-tracking branch 'remotes/origin/develop' into fix/popup-converted-filename 2025-06-17 15:24:05 +03:00
721f2fbf6c fix(csharp-mvc): change uploaded file name if converted 2025-06-17 16:40:37 +07:00
74097ec485 Merge branch 'release/v9.0.0' into develop 2025-06-09 16:07:10 +03:00
e15d9a3163 1.14.0 2025-06-09 16:04:30 +03:00
0dd9cbca36 docs: fix api link 2025-06-03 16:40:06 +03:00
fe0d985555 Merge remote-tracking branch 'remotes/origin/release/v9.0.0' into develop
# Conflicts:
#	CHANGELOG.md
2025-05-12 17:22:35 +03:00
a5e8db73f8 ur skin language 2025-04-28 13:17:40 +03:00
345e272cbb Merge remote-tracking branch 'remotes/origin/release/v9.0.0' into develop
# Conflicts:
#	CHANGELOG.md
2025-04-14 13:33:50 +03:00
f5e279ca11 change preload address 2025-04-14 13:22:17 +03:00
f40f1a4704 fix text 2025-03-24 13:06:13 +03:00
5c0c2f7baa Merge remote-tracking branch 'remotes/origin/develop' into features-tips
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/Helpers/Users.cs
#	web/documentserver-example/csharp/Users.cs
#	web/documentserver-example/go/server/managers/default/user.go
#	web/documentserver-example/java-spring/pom.xml
#	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/nodejs/helpers/users.js
#	web/documentserver-example/php-laravel/app/Repositories/UserRepository.php
#	web/documentserver-example/php/src/helpers/ExampleUsers.php
#	web/documentserver-example/python/src/utils/users.py
#	web/documentserver-example/ruby/app/models/users.rb
2025-03-24 12:46:19 +03:00
39a32011f8 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-19 11:46:53 +03:00
5cbb905285 refactoring 2025-03-19 11:44:07 +03:00
9378e4313b fix(csharp-mvc): correct download name of converted file. Fix Bug 73522 2025-03-19 15:27:34 +07:00
47a8bff158 fix(csharp-mvc): sort files by modification time. Fix Bug 73528 2025-03-19 15:27:04 +07:00
938212cb6a first user with favorite option 2025-03-17 16:12:41 +03:00
267e14edde reorder user's info 2025-03-17 15:59:31 +03:00
15c23bfc40 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-14 16:18:59 +03:00
336e37cf44 fix version author when changes exist ( Fix Bug 73505 ) 2025-03-12 12:22:11 +03:00
699370936a feat(csharp-mvc): enable features tips for anonymous 2025-03-03 12:01:22 +07:00
ba95202084 fix(csharp-mvc): correct null users for protect and mentions for anonymous 2025-03-03 11:57:23 +07:00
d6d9ea024c Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-02-24 17:21:00 +03:00
635d70d8f4 feat(csharp-mvc): add jwt token lifetime from config 2025-02-24 17:18:51 +03:00
ed0a70f071 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-02-20 13:18:39 +03:00
cce42cb94c fix(csharp-mvc): support for mobile screens with width less than 320px 2025-02-20 13:16:43 +03:00
099a53b24b Merge remote-tracking branch 'remotes/origin/develop' into feature/diagrams-editor
# Conflicts:
#	.gitmodules
#	CHANGELOG.md
2025-02-11 18:14:51 +03:00
f57fa79ce2 1.13.0 2025-02-11 18:09:50 +03:00
0f3c40e0b1 update diagram tab icon 2025-02-11 16:42:41 +07:00
47c015ec3f Merge pull request '1.12.0 update tab icons' from 1.12-icons-update into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/40
2025-02-11 09:04:02 +00:00