Compare commits

..

1338 Commits

Author SHA1 Message Date
c4de5afd4b java-raw: inner 2025-07-07 15:52:44 +03:00
f6e04d5ab9 java-raw: set config 2025-07-07 15:52:43 +03:00
925c6e96fc java-raw: add custom cors 2025-07-07 15:52:30 +03:00
bf873519de java-raw: idk project file 2025-07-07 15:52:29 +03:00
0df41b9e36 java-raw: add docker files 2025-07-07 15:52:29 +03:00
00296b90c8 update demo files 2025-07-04 16:42:09 +03:00
3eae49253f nodejs: отображать в логах отсутствие WOPI заголовков ( for Bug 75684 ) 2025-07-02 11:55:24 +03:00
c8d28ec950 nodejs: 403 if verification fails 2025-07-02 11:47:00 +03:00
403ff78807 Merge pull request 'feature/request-users-pagination' from feature/request-users-pagination into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/68
2025-07-02 06:08:01 +00: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
f38e2779be Merge pull request 'fix/convert-box-checkmark-color' from fix/convert-box-checkmark-color into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/67
2025-07-02 06:04:03 +00:00
afdd56388c Merge remote-tracking branch 'remotes/origin/master' into develop 2025-07-01 17:19:56 +03:00
c73eece042 Merge pull request 'ci: added create-tag.yml and run release on create tag' from ci/git-actions into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/70
2025-07-01 14:19:30 +00:00
e8a68fad5a Merge remote-tracking branch 'remotes/origin/master' into develop 2025-07-01 17:14:05 +03:00
8701cc53e9 Merge pull request 'release/1.14.0' from release/1.14.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/69
2025-07-01 14:09:50 +00:00
5a214b80d9 ci: added create-tag.yml and run release on create tag 2025-07-01 17:08:29 +03:00
f231b1cd72 nodejs: fix lint 2025-07-01 16:46:51 +03:00
1654d4978f changelog: set users by parts 2025-06-25 17:02:02 +07:00
86bf4d083a feat(ruby): set users by parts with infinite scroll for pagination 2025-06-25 17:00:43 +07:00
540a8ea98b feat(python): set users by parts with infinite scroll for pagination 2025-06-25 17:00:27 +07:00
729c67ab8f feat(php-laravel): set users by parts with infinite scroll for pagination 2025-06-25 17:00:09 +07:00
3d529bf57c feat(php): set users by parts with infinite scroll for pagination 2025-06-25 16:59:48 +07:00
7f2dfc37d4 feat(java-spring): set users by parts with infinite scroll for pagination 2025-06-25 16:59:33 +07:00
6c386f852d feat(java): set users by parts with infinite scroll for pagination 2025-06-25 16:59:06 +07:00
7469285d0c feat(go): set users by parts with infinite scroll for pagination 2025-06-25 16:58:54 +07:00
863eee6db7 feat(csharp-mvc): set users by parts with infinite scroll for pagination 2025-06-25 16:58:34 +07:00
74ff4cec88 feat(csharp): set users by parts with infinite scroll for pagination 2025-06-25 16:58:15 +07:00
209881f280 Merge branch 'release/1.14.0' into develop 2025-06-25 11:11:49 +03:00
32b4c49f6e changelog: conversion dialog starts with gray check mark on step 1 2025-06-24 15:16:08 +07:00
9545bd4375 fix(ruby): conversion dialog starts with gray check mark on step 1 2025-06-24 15:15:41 +07:00
2bc8081b04 fix(python): conversion dialog starts with gray check mark on step 1 2025-06-24 15:15:27 +07:00
9ce708913b fix(php-laravel): conversion dialog starts with gray check mark on step 1 2025-06-24 15:15:02 +07:00
0db101a270 fix(php): conversion dialog starts with gray check mark on step 1 2025-06-24 15:14:39 +07:00
5660b1f1c2 fix(nodejs): conversion dialog starts with gray check mark on step 1 2025-06-24 15:14:22 +07:00
ef294de17f fix(java-spring): conversion dialog starts with gray check mark on step 1 2025-06-24 15:13:52 +07:00
1759180e13 fix(java): conversion dialog starts with gray check mark on step 1 2025-06-24 15:13:30 +07:00
1ef8d40b50 fix(go): conversion dialog starts with gray check mark on step 1 2025-06-24 15:13:01 +07:00
8f9d99faf8 fix(csharp-mvc): conversion dialog starts with gray check mark on step 1 2025-06-24 15:12:26 +07:00
0d0ecc73f8 fix(csharp): conversion dialog starts with gray check mark on step 1 2025-06-24 15:12:12 +07:00
2166b31858 nodejs: infinite scroll for users pagination 2025-06-20 16:11:13 +03:00
3117231ac8 Merge pull request 'feature/load-scripts-not-in-popup' from feature/load-scripts-not-in-popup into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/66
2025-06-19 08:03:46 +00: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
a18a5ee73f Merge remote-tracking branch 'remotes/origin/release/1.14.0' into develop 2025-06-18 15:35:03 +03:00
07b7615efd nodejs: formats update 2025-06-18 15:04:25 +03:00
a0651092f7 feat(ruby): loading scripts on page load 2025-06-18 15:55:55 +07:00
aba434f46d feat(python): loading scripts on page load 2025-06-18 15:53:28 +07:00
edb43ab59d feat(php-laravel): loading scripts on page load 2025-06-18 15:50:57 +07:00
dabd5816f1 feat(php): loading scripts on page load 2025-06-18 15:48:07 +07:00
0c7eabdf3c feat(java-spring): loading scripts on page load 2025-06-18 15:44:45 +07:00
11ef9d8a80 feat(java): loading scripts on page load 2025-06-18 15:37:16 +07:00
eb9e9f7db4 feat(go): loading scripts on page load 2025-06-18 15:28:12 +07:00
eb0a556333 feat(csharp-mvc): loading scripts on page load 2025-06-18 15:15:50 +07:00
1f661f588b feat(csharp): loading scripts on page load 2025-06-18 15:05:44 +07:00
b6577bd184 change tab title on rename 2025-06-18 14:03:08 +07:00
5e1e23176c feat(ruby): change document.title when renaming 2025-06-18 14:01:34 +07:00
6045fefe43 feat(python): change document.title when renaming 2025-06-18 14:01:34 +07:00
68f73f543a feat(php-laravel): change document.title when renaming 2025-06-18 14:01:34 +07:00
ff745e0b71 feat(php): change document.title when renaming 2025-06-18 14:01:34 +07:00
b7e267842f feat(java-spring): change document.title when renaming 2025-06-18 14:01:34 +07:00
dc54716171 feat(java): change document.title when renaming 2025-06-18 14:01:34 +07:00
60376861ce feat(go): change document.title when renaming 2025-06-18 14:01:34 +07:00
108f655fec feat(csharp-mvc): change document.title when renaming 2025-06-18 14:01:34 +07:00
4a5da5ee4e feat(csharp): change document.title when renaming 2025-06-18 14:01:33 +07:00
6a10d55e2b feat(nodejs): change document.title when renaming 2025-06-18 14:01:33 +07:00
af53ccb534 Merge pull request 'fix/popup-converted-filename' from fix/popup-converted-filename into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/64
2025-06-17 12:39:38 +00:00
acf09aa5ef change filename to changelog 2025-06-17 15:25:07 +03:00
36866764ce Merge remote-tracking branch 'remotes/origin/develop' into fix/popup-converted-filename 2025-06-17 15:24:05 +03:00
b1df939a1a Merge remote-tracking branch 'remotes/origin/release/1.14.0' into develop 2025-06-17 15:20:49 +03:00
307f15581b fix changelog 2025-06-17 15:19:53 +03:00
ada58ecb95 fix(ruby): change uploaded file name if converted 2025-06-17 16:49:03 +07:00
c78f1bd2ce fix(python): change uploaded file name if converted 2025-06-17 16:48:17 +07:00
91643fe247 fix(php-laravel): change uploaded file name if converted 2025-06-17 16:47:35 +07:00
538666f6c1 fix(php): change uploaded file name if converted 2025-06-17 16:44:53 +07:00
9402f769c6 fix(java-spring): change uploaded file name if converted 2025-06-17 16:44:02 +07:00
94f4995f3b fix(java): change uploaded file name if converted 2025-06-17 16:42:57 +07:00
bb736d85f8 fix(go): change uploaded file name if converted 2025-06-17 16:41:44 +07:00
721f2fbf6c fix(csharp-mvc): change uploaded file name if converted 2025-06-17 16:40:37 +07:00
bb22b73431 fix(csharp): change uploaded file name if converted 2025-06-17 16:39:38 +07:00
704d8bceb9 fix(nodejs): change uploaded file name if converted 2025-06-17 14:44:59 +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
cd47a8e0de Merge remote-tracking branch 'remotes/origin/feature/setUsers' into release/v9.0.0 2025-06-02 12:39:34 +03:00
cf1541bf3a nodejs: set users by parts 2025-05-31 23:08:54 +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
d533cca184 nodejs: support md 2025-05-12 17:18:15 +03:00
9aa6e58bfc nodejs: set Content-Type for response 2025-05-12 15:10:11 +03:00
537d7eaeb9 nodejs: changed preloading (71c937ae37) 2025-05-12 15:07:23 +03:00
0d894df803 Merge pull request 'dependabot-updates' from dependabot-updates into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/63
2025-04-30 09:47:22 +00:00
b93338d5e9 build(nodejs): bump formidable from 3.5.1 to 3.5.4 2025-04-30 13:56:06 +07:00
8c18df7e4c build(java-spring): bump org.apache.httpcomponents.client5:httpclient5 from 5.4 to 5.4.3 2025-04-30 13:46:57 +07:00
5b5593240f build(php-laravel): update axios, vite, laravel-vite-plugin, rollup and esbuild 2025-04-30 13:17:15 +07:00
770b8bbe70 build(php-laravel): bump laravel/framework to 11.44.7 2025-04-30 12:52:37 +07:00
dd0987a6fc build(ruby): bump nokogiri to 1.18.8 and net-imap to 0.4.20 2025-04-30 12:18:46 +07:00
70affcc0e8 Merge pull request 'refactor(php-laravel): rename exception class file to comply with psr-4 standards' from fix/php-laravel-psr4-classname-rename into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/62
2025-04-29 12:40:35 +00:00
ceacac691d refactor(php-laravel): rename exception class file to comply with psr-4 standards 2025-04-29 12:28:36 +05:00
a5e8db73f8 ur skin language 2025-04-28 13:17:40 +03:00
05f22b9e24 nodejs: auto-convert for odg 2025-04-24 15:22:00 +03:00
84936a506f nodejs: move preload to changelog (71c937ae37) 2025-04-22 16:25:16 +03:00
501fbeacaf Merge remote-tracking branch 'remotes/origin/hotfix/v8.3.3' into release/v9.0.0
# Conflicts:
#	CHANGELOG.md
2025-04-15 09:26:36 +03:00
71c937ae37 nodejs: preload frame moved from uploading popap 2025-04-14 16:25:47 +03:00
71bcc65522 nodejs: fix host on verification (9faf628fba) 2025-04-14 15:52:47 +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
9116eae2a1 nodejs: changeshistory is not used (bd784224b9) 2025-04-14 13:30:19 +03:00
e8b384f49a Merge pull request 'fix(php-laravel): fix download failure during attempt to get a token from a custom jwt header' from fix/php-laravel-jwt-header into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/61
2025-04-14 10:29:55 +00:00
8cf84391c0 php-laravel: fix to changelog 2025-04-14 13:29:34 +03:00
13554abfcb Merge branch 'feature/preload' into release/v9.0.0 2025-04-14 13:26:59 +03:00
f5e279ca11 change preload address 2025-04-14 13:22:17 +03:00
9395d183b0 nodejs: use default config 2025-04-14 12:50:04 +03:00
09600d91c2 nodejs: edit xlsb, view odg 2025-04-11 17:00:11 +03:00
dec01fe8b2 manually extract the bearer token from a jwt header 2025-04-10 22:04:24 +05:00
46d308c1b8 Merge branch 'release/v9.0.0' into develop
# Conflicts:
#	CHANGELOG.md
2025-03-28 13:48:37 +03:00
a7552677eb Merge branch 'hotfix/v8.3.3' into release/v9.0.0
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
#	web/documentserver-example/nodejs/public/images/diagram.ico
2025-03-28 13:45:09 +03:00
c585e30eb8 Merge remote-tracking branch 'remotes/origin/master' into hotfix/v8.3.3
# Conflicts:
#	CHANGELOG.md
2025-03-28 13:42:34 +03:00
4af422acb3 Merge pull request 'release/1.13.0' from release/1.13.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/60
2025-03-28 10:34:05 +00:00
6bac7ffc5b upload-artifact v4 2025-03-28 12:49:27 +03:00
b6a9a4ba77 nodejs: fix lint
# Conflicts:
#	web/documentserver-example/nodejs/helpers/users.js
2025-03-28 12:41:50 +03:00
76ee327af8 fix readme 2025-03-28 12:35:21 +03:00
2df44605c3 3rd-party license 2025-03-28 12:24:35 +03:00
888fb0e12c Merge pull request 'fix(ruby): replacing host when version download url is present. Fix Bug 73693' from fix/ruby-restore into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/59
2025-03-27 07:57:59 +00:00
f1c4e8d875 fix(ruby): replacing host when version download url is present. Fix Bug 73693 2025-03-26 12:44:04 +07:00
f394be17a4 Merge pull request '1.13.0-bugfix' from 1.13.0-bugfix into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/57
2025-03-25 08:06:11 +00:00
ebd306d2b2 fix(python): correct version author when changes exist. Fix Bug 73505 2025-03-25 14:11:12 +07:00
2447aaef12 fix(ruby): correct version author when changes exist. Fix Bug 73505 2025-03-25 13:15:01 +07:00
ed586de8c8 fix(ruby): replace public hostname in the intermediate version download url. Fix Bug 73655 2025-03-25 13:14:05 +07:00
a759f97508 fix(ruby): sort files by modification time. Fix Bug 73654 2025-03-25 11:48:16 +07:00
f40f1a4704 fix text 2025-03-24 13:06:13 +03:00
88e541971e nodejs: fix lint 2025-03-24 12:55:34 +03:00
6239e05032 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-24 12:53:20 +03:00
30c541d119 Merge pull request 'bugfix-1.13.0' from bugfix-1.13.0 into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/56
2025-03-24 09:52:52 +00:00
e25f957605 Merge pull request 'features-tips' from features-tips into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/52
2025-03-24 09:51:59 +00: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
974e728d8b Merge pull request 'feature/docs-integration-sdk' from feature/docs-integration-sdk into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/55
2025-03-24 09:40:10 +00:00
e4984f4c3e fix(php-laravel): open source with correct host. Fix Bug 73552 2025-03-21 13:13:28 +07:00
14dabe7789 fix: (java-spring) code style 2025-03-20 11:25:39 +03:00
18de6a1616 feat(java-spring): DocumentServerClient instead HttpURLConnection 2025-03-20 11:17:12 +03:00
983fa34c9f feat(java-spring): DocumentServerClient instead RequestManager 2025-03-20 11:16:42 +03:00
95a28b15b4 build(java-spring): com.onlyoffice:docs-integration-sdk:1.4.3-SNAPSHOT 2025-03-20 11:16:12 +03:00
5ca511d838 fix(go): correct file uploading error processing. Fix Bug 73601 2025-03-20 15:12:20 +07:00
6290abf5dd feat(java-spring): enable features tips for anonymous 2025-03-20 13:50:46 +07:00
d11115e452 build(java-spring): update docs-intergation-sdk to version 1.4.2-SNAPSHOT 2025-03-20 13:49:55 +07:00
649e167916 php-laravel: Copyright 2025 2025-03-19 15:46:27 +03:00
39a32011f8 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-19 11:46:53 +03:00
64fce32be6 Merge pull request 'release/1.13.0 bugfix' from fix/1.13 into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/53
2025-03-19 08:46:25 +00:00
5cbb905285 refactoring 2025-03-19 11:44:07 +03:00
9769641539 fix(java-spring): correct file name for conversion instead of changing download link 2025-03-19 15:27:35 +07:00
806fee40dd fix(java): correct file name for conversion instead of changing download link 2025-03-19 15:27:35 +07:00
1db4e22007 fix(nodejs): correct file name for conversion instead of changing download link 2025-03-19 15:27:35 +07:00
1a73be6a12 fix(ruby): correct file name for conversion instead of changing download link 2025-03-19 15:27:35 +07:00
c8288b3141 fix(php-laravel): correct file name for conversion instead of changing download link 2025-03-19 15:27:35 +07:00
c03a15a230 fix(php-laravel): get server url from new SettingsManager. Fix Bug 73556 2025-03-19 15:27:34 +07:00
a16318fa71 fix(java): correct version author when changes exist. Fix Bug 73505 2025-03-19 15:27:34 +07:00
a5d98055ce fix(java-spring): correct version author when changes exist. Fix Bug 73505 2025-03-19 15:27:34 +07:00
ec0e2e1b4a fix(php): correct version author when changes exist. Fix Bug 73505 2025-03-19 15:27:34 +07:00
cbd464ad0a fix(php): correct download name of converted file. Fix Bug 73522 2025-03-19 15:27:34 +07:00
9378e4313b fix(csharp-mvc): correct download name of converted file. Fix Bug 73522 2025-03-19 15:27:34 +07:00
5d23ac7572 fix(csharp): correct download name of converted file. Fix Bug 73522 2025-03-19 15:27:34 +07:00
26adbf454b fix(python): correct download name of converted file. Fix Bug 73522 2025-03-19 15:27:25 +07:00
47a8bff158 fix(csharp-mvc): sort files by modification time. Fix Bug 73528 2025-03-19 15:27:04 +07:00
54b0735295 fix(csharp): sort files by modification time. Fix Bug 73528 2025-03-19 15:27:04 +07:00
248ca25671 fix(java): sort files by modification time. Fix Bug 73528 2025-03-19 15:27:04 +07:00
b0f3d02191 fix(java-spring): sort files by modification time. Fix Bug 73528 2025-03-19 15:27:04 +07:00
92325894f9 build(ruby): add nokogiri for linux-musl to gemfile.lock to run using docker. Fix Bug 73519 2025-03-19 15:27:04 +07:00
0a9a37e355 fix(php): replace public url in the intermediate version download link and ignore command service error code 4. Fix Bug 73526 2025-03-19 15:27:04 +07:00
2784c47873 fix(python): replace public url in the intermediate version download link. Fix Bug 73520 2025-03-19 15:27:04 +07:00
6cbe243baa fix: reloading page after upload(java, java-spring). Fix Bug 73527 2025-03-19 15:27:03 +07:00
53daf9121d fix(go): correct change reference source processing. Fix Bug 73529 2025-03-19 15:27:03 +07:00
07b0f2c5be fix(go): enable close for uid-2 and uid-3. Fix Bug 73506 2025-03-19 15:27:03 +07:00
167467e3b3 Merge pull request 'build(ruby): bump rack to 2.2.13' from ruby-bump-rack into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/54
2025-03-19 08:16:56 +00:00
0d2fb178fa build(ruby): bump rack to 2.2.13 2025-03-19 11:16:23 +03: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
90710b9710 nodejs: reorder user's info 2025-03-17 15:12:04 +03:00
1794ce39ab nodejs: replace symbol 2025-03-14 17:07:52 +03:00
95218e4fe4 Merge branch 'feature/roles' into develop
# Conflicts:
#	CHANGELOG.md
2025-03-14 17:03:18 +03:00
a5d2a38809 nodejs: start filling 2025-03-14 17:02:03 +03:00
a2088ae8e1 nodejs: user role 2025-03-14 16:24:16 +03:00
13ccad5fbd Merge branch 'feature/submit' into develop 2025-03-14 16:19:08 +03:00
15c23bfc40 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-14 16:18:59 +03:00
f83b4a8be8 nodejs: second user can submit 2025-03-14 16:15:12 +03:00
43f1a9a800 Merge remote-tracking branch 'remotes/origin/fix/golang' into release/1.13.0 2025-03-12 12:22:44 +03:00
336e37cf44 fix version author when changes exist ( Fix Bug 73505 ) 2025-03-12 12:22:11 +03:00
f554de193e fix(go): correct converted file name. Fix Bug 73501 2025-03-12 15:02:10 +07:00
f5a11721bd Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-11 12:02:16 +03:00
688cdd8ee9 Merge branch 'hotfix/v8.3.1' into release/1.13.0 2025-03-11 11:53:20 +03:00
9a3865e36e Merge branch 'release/v9.0.0' into develop
# Conflicts:
#	CHANGELOG.md
2025-03-11 11:46:53 +03:00
c796154fe1 update diagram tab icon
# Conflicts:
#	web/documentserver-example/csharp-mvc/Content/images/diagram.ico
#	web/documentserver-example/csharp/App_Themes/images/diagram.ico
#	web/documentserver-example/go/static/images/diagram.ico
#	web/documentserver-example/java/src/main/webapp/css/img/diagram.ico
#	web/documentserver-example/php/assets/images/diagram.ico
#	web/documentserver-example/python/static/images/diagram.ico
#	web/documentserver-example/ruby/app/assets/images/diagram.ico
2025-03-11 11:44:48 +03:00
0599f74117 nodejs: support diagram editor
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
2025-03-11 11:44:26 +03:00
8f944e203d nodejs: support vsdx in visio editor
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
2025-03-11 11:43:38 +03:00
d8ea6a6dbb Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-03-11 11:24:37 +03:00
aaf8ac5328 feat(ruby): enable features tips for anonymous 2025-03-03 14:57:09 +07:00
11bbbebec1 feat(python): enable features tips for anonymous 2025-03-03 14:52:30 +07:00
27f21fd6f5 feat(php-laravel): enable features tips for anonymous 2025-03-03 14:45:08 +07:00
e76faa4671 feat(php): enable features tips for anonymous 2025-03-03 14:26:30 +07:00
4d7fe321ba feat(java): enable features tips for anonymous 2025-03-03 14:13:25 +07:00
aeda04b9e7 feat(golang): enable features tips for anonymous 2025-03-03 13:47:51 +07:00
9337ff720e Merge pull request 'fix(go): sort files by time. Fix Bug 73390' from fix/golang-sort-by-time into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/51
2025-03-03 05:41:35 +00: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
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
91024f8626 fix(go): sort files by time. Fix Bug 73390 2025-03-03 11:07:35 +07:00
c36f1c67a9 Merge pull request 'fix(go): return the name of the file created by url. Fix Bug 73389' from fix/golang-create-by-url into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/50
2025-02-28 06:28:56 +00:00
3e64597f45 fix(go): return the name of the file created by url. Fix Bug 73389 2025-02-28 12:20:51 +07:00
f9ab6e47b1 Merge pull request 'fix(go): remove directUrl from index page script. Fix Bug 73380' from fix/golang-direct-url into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/49
2025-02-27 10:43:15 +00:00
283687b692 fix(go): remove directUrl from index page script. Fix Bug 73380 2025-02-27 13:42:27 +03:00
6b9e5503c3 feat(nodejs): enable features tips for anonymous 2025-02-27 15:17:18 +07:00
d6d9ea024c Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-02-24 17:21:00 +03:00
08015e06b6 Merge pull request 'jwt-lifetime' from jwt-lifetime into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/31
2025-02-24 14:20:29 +00:00
ce4b905f06 feat(php-laravel): add jwt token lifetime from config 2025-02-24 17:19:43 +03:00
b6613b5d21 feat(php): add jwt token lifetime from config 2025-02-24 17:18:52 +03:00
ab0993f09f feat(ruby): add jwt token lifetime from config 2025-02-24 17:18:52 +03:00
3c4b2e2877 feat(python): add jwt token lifetime from config 2025-02-24 17:18:51 +03:00
3102f4835c feat(java-spring): add jwt token lifetime from config 2025-02-24 17:18:51 +03:00
7ea4545657 feat(java): add jwt token lifetime from config 2025-02-24 17:18:51 +03:00
635d70d8f4 feat(csharp-mvc): add jwt token lifetime from config 2025-02-24 17:18:51 +03:00
90f3a3e44e feat(csharp): add jwt token lifetime from config 2025-02-24 17:18:50 +03:00
46cf8baa28 feat(go): add jwt token lifetime from config 2025-02-24 17:18:50 +03:00
326fd4a586 Merge branch 'feature/wopi-verification' into release/1.13.0 2025-02-24 17:16:23 +03:00
f74fb7384e Merge pull request 'feat(nodejs): wopi proof key verification' from feature/wopi-verification into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/43
2025-02-24 14:15:35 +00:00
d0efe3e1f2 nodejs: proof key to changelog 2025-02-24 15:17:17 +03:00
91a601dbfe fix(nodejs): skip wopi verification when proof key is missing in discovery 2025-02-24 15:13:33 +03:00
9faf628fba feat(nodejs): wopi proof key verification 2025-02-24 15:13:32 +03:00
14458f82dd Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-02-24 15:11:21 +03:00
f4a11e2047 Merge pull request 'nodejs: move editor style to template file' from replace-editor-css into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/48
2025-02-24 12:10:13 +00:00
af9a3a97ec Merge pull request 'build(ruby): bump nokogiri to 1.18.3' from bump-nokogiri into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/47
2025-02-24 12:08:22 +00:00
c2d01c68fb build(ruby): bump nokogiri to 1.18.3 2025-02-24 15:07:27 +03:00
0f9f09d346 nodejs: move editor style to template file 2025-02-24 14:09:28 +07:00
ed0a70f071 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-02-20 13:18:39 +03:00
f46505a07c Merge pull request 'narrow-mobile-screen-fix' from narrow-mobile-screen-fix into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/45
2025-02-20 10:17:35 +00:00
08fe615b93 fix(ruby): support for mobile screens with width less than 320px 2025-02-20 13:16:45 +03:00
da071258f6 fix(python): support for mobile screens with width less than 320px 2025-02-20 13:16:45 +03:00
8c136540be fix(php-laravel): support for mobile screens with width less than 320px 2025-02-20 13:16:44 +03:00
c65eb623a2 fix(php): support for mobile screens with width less than 320px 2025-02-20 13:16:44 +03:00
9c96a577b4 fix(java-spring): support for mobile screens with width less than 320px 2025-02-20 13:16:44 +03:00
00506049aa fix(java): support for mobile screens with width less than 320px 2025-02-20 13:16:43 +03:00
b6ace095e5 fix(go): support for mobile screens with width less than 320px 2025-02-20 13:16:43 +03:00
cce42cb94c fix(csharp-mvc): support for mobile screens with width less than 320px 2025-02-20 13:16:43 +03:00
83abe9f175 fix(csharp): support for mobile screens with width less than 320px 2025-02-20 13:16:43 +03:00
1374aeb2fd fix(nodejs): support for mobile screens with width less than 320px 2025-02-20 13:16:42 +03:00
dadba2a81f Merge remote-tracking branch 'remotes/origin/hotfix/v8.3.1' into develop 2025-02-19 11:33:47 +03:00
f0ced2f587 nodejs: encode path in url for wopi 2025-02-19 11:33:29 +03:00
fe56ec24b5 nodejs: encode path in url for wopi 2025-02-19 11:31:24 +03:00
6a11ac4ced diagram to changelog for all 2025-02-17 10:35:07 +03:00
5169b1dc97 ci: change sdk version to dev-diagram 2025-02-17 10:26:35 +03:00
dabb51bf8a Merge branch 'release/1.13.0' into develop 2025-02-17 10:23:08 +03:00
5a50edd87c ci: update sdk version 2025-02-17 10:20:49 +03:00
48d90ff2f2 Merge pull request 'ruby: bump rack to 2.2.11 and net-imap to 0.4.19' from ruby-deps into release/1.13.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/44
2025-02-17 06:32:04 +00:00
bde7dd1ae5 build(ruby): bump rack to 2.2.11 2025-02-17 09:31:23 +03:00
81bb9e22e0 build(ruby): bump net-imap to 0.4.19 2025-02-17 09:31:23 +03:00
f15f48eba5 java-spring: sdk 1.4.1-SNAPSHOT 2025-02-14 15:55:18 +03:00
12753dee19 Merge remote-tracking branch 'remotes/origin/release/1.13.0' into develop 2025-02-14 15:51:54 +03:00
5e037f13b5 java-spring: sdk 1.4.0 2025-02-14 15:51:05 +03:00
598e914452 Merge pull request 'feature/diagrams' from feature/diagrams-editor into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/33
2025-02-11 15:19:08 +00: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
d01263917c nodejs: vsdx 2025-02-11 18:14:00 +03:00
f57fa79ce2 1.13.0 2025-02-11 18:09:50 +03:00
19f01e6078 java: support pages, numbers, key formats 2025-02-11 12:55:46 +03:00
0f3c40e0b1 update diagram tab icon 2025-02-11 16:42:41 +07:00
8eb0c3d5e5 Merge pull request 'update-tab-icons' from update-tab-icons into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/42
2025-02-11 09:41:25 +00:00
3ab2e9843d php-laravel: update tab icons 2025-02-11 16:35:51 +07:00
e3a46bf88f go: update tab icons 2025-02-11 16:35:00 +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
1074735afc Merge pull request 'Release/1.12.0' from release/1.12.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/41
2025-02-11 08:43:18 +00:00
b4461b4424 ruby: update tab icons 2025-02-11 11:51:12 +07:00
abd337285e python: update tab icons 2025-02-11 11:50:31 +07:00
9863dc4641 php: update tab icons 2025-02-11 11:49:38 +07:00
f6fb3acb52 nodejs: update tab icons 2025-02-11 11:48:50 +07:00
e67f46c67f java-spring: update tab icons 2025-02-11 11:48:18 +07:00
20fab05971 java: update tab icons 2025-02-11 11:47:36 +07:00
f872b50f5b csharp-mvc: update tab icons 2025-02-11 11:45:06 +07:00
f32e8409e5 csharp: update tab icons 2025-02-11 11:43:54 +07:00
e2777b614b Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
#	web/documentserver-example/java-spring/src/main/resources/templates/editor.html
2025-02-10 10:42:44 +03:00
a091891573 Merge pull request 'fix(java-spring): correct document icon name. Fix Bug 73118' from fix/java-spring-document-icon into release/1.12.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/39
2025-02-10 07:41:44 +00:00
e14be1b9c9 fix(java-spring): correct document icon name. Fix Bug 73118 2025-02-10 14:25:33 +07:00
1fe19724c2 nodejs: Updated dependencies and fixed vulnerabilities 2025-02-10 10:14:29 +03:00
40e27137ed Merge pull request 'feat(nodejs): rename in wopi' from feature/wopi-rename into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/37
2025-02-10 06:54:59 +00:00
11f335afc3 Merge remote-tracking branch 'remotes/origin/develop' into feature/wopi-rename
# Conflicts:
#	CHANGELOG.md
2025-02-10 09:53:57 +03:00
355c5c4ed1 feat(nodejs): rename in wopi 2025-02-10 13:03:11 +07:00
27456a308d Merge pull request 'style(nodejs): move mobile editor icon' from move-mobile-editor-icon into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/38
2025-02-07 09:57:39 +00:00
6e0f2e35f4 Merge pull request 'feature/on-user-action-required' from feature/on-user-action-required into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/36
2025-02-07 09:48:38 +00:00
27b63833c3 Merge remote-tracking branch 'remotes/origin/develop' into feature/on-user-action-required
# Conflicts:
#	CHANGELOG.md
2025-02-07 12:41:35 +03:00
0f895e7b38 nodejs: wopi favicon to changelog 2025-02-07 12:40:17 +03:00
81679f35a1 Merge pull request 'feat(nodejs): use favIconUrl in wopi' from wopi-faviconurl into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/35
2025-02-07 09:37:31 +00:00
3301421663 clean file 2025-02-07 12:29:54 +03:00
bf2f32b7cb Merge remote-tracking branch 'remotes/origin/develop' into feature/diagrams-editor
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/assets/document-formats
#	web/documentserver-example/csharp/assets/document-formats
#	web/documentserver-example/go/static/assets/document-formats
#	web/documentserver-example/java/src/main/resources/assets/document-formats
#	web/documentserver-example/php/assets/document-formats
#	web/documentserver-example/python/assets/document-formats
#	web/documentserver-example/ruby/assets/document-formats
2025-02-07 11:59:22 +03:00
13d5d38abc support hwp, hwpx, pages, numbers, key formats 2025-02-07 11:54:56 +03:00
5c3047850b style(nodejs): move mobile editor icon 2025-02-07 11:40:39 +07:00
ed1759181a update submodules 2025-02-06 18:24:39 +03:00
28ed07733a Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
#	web/documentserver-example/nodejs/public/assets/document-formats
2025-02-06 18:22:44 +03:00
d4aaa38414 nodejs: update submodule 2025-02-06 18:19:54 +03:00
a53fa55a89 feat(ruby): onUserActionRequired 2025-02-06 15:29:19 +07:00
9d05480f5e feat(python): onUserActionRequired 2025-02-06 15:28:03 +07:00
edd7e8476f feat(php-laravel): onUserActionRequired 2025-02-06 15:27:17 +07:00
310d12d40a feat(php): onUserActionRequired 2025-02-06 15:25:53 +07:00
0c9d03b3f0 feat(java-spring): onUserActionRequired 2025-02-06 15:24:10 +07:00
7935998094 feat(java): onUserActionRequired 2025-02-06 15:22:40 +07:00
b355e1fa0b feat(go): onUserActionRequired 2025-02-06 15:18:53 +07:00
31e9c5380f feat(csharp-mvc): onUserActionRequired 2025-02-06 15:15:13 +07:00
5ea1eb6995 feat(csharp): onUserActionRequired 2025-02-06 15:09:45 +07:00
a1243c2ba1 feat(nodejs): onUserActionRequired 2025-02-06 15:07:33 +07:00
e1409966bd feat(nodejs): use favIconUrl in wopi 2025-02-06 14:54:38 +07:00
fad5afb32d Merge branch 'release/1.12.0' into develop 2025-02-05 14:30:17 +03:00
40c1856315 java-spring: sdk 1.2.1 ( Fix Bug 73107 ) 2025-02-05 14:29:40 +03:00
b64772de74 Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop
# Conflicts:
#	web/documentserver-example/java-spring/pom.xml
2025-02-05 11:16:19 +03:00
bc67af0fa4 java-spring: sdk 1.3.1-SNAPSHOT ( Fix Bug 73107 ) 2025-02-05 11:15:26 +03:00
ca7fb41089 Merge remote-tracking branch 'remotes/origin/release/1.12.0' into develop 2025-02-04 18:00:39 +03:00
f0b752fe2f docs(go): configure jwt 2025-02-04 18:00:21 +03:00
da6a0e9c3c Merge pull request 'jwt-in-readme' from jwt-in-readme into release/1.12.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/32
2025-02-04 14:59:57 +00:00
40c22da401 nodejs: configure jwt 2025-02-04 17:58:11 +03:00
314deba650 docs(java-spring): configure jwt 2025-02-04 17:57:50 +03:00
4c609a4ef4 docs(java): configure jwt 2025-02-04 17:57:50 +03:00
679adb3336 docs(csharp-mvc): configure jwt 2025-02-04 17:57:25 +03:00
f314212341 docs(csharp): configure jwt 2025-02-04 17:57:24 +03:00
acc67c0c5a update tab icons
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/29

# Conflicts:
#	web/documentserver-example/go/static/images/cell.ico
#	web/documentserver-example/go/static/images/slide.ico
#	web/documentserver-example/go/static/images/word.ico
#	web/documentserver-example/php-laravel/public/images/cell.ico
#	web/documentserver-example/php-laravel/public/images/slide.ico
#	web/documentserver-example/php-laravel/public/images/word.ico
2025-02-04 17:51:10 +03:00
534eedfae1 feat(ruby): support vsdx in diagram editor 2025-02-04 15:56:39 +07:00
77775754b6 feat(python): support vsdx in diagram editor 2025-02-04 15:47:49 +07:00
bfebc197af feat(php): support vsdx in diagram editor 2025-02-04 15:28:36 +07:00
a3d7b159da feat(java): support vsdx in diagram editor 2025-02-04 15:03:07 +07:00
f12cb242ea feat(go): support vsdx in diagram editor 2025-02-04 14:48:00 +07:00
8a5f37da3f feat(csharp-mvc): support vsdx in diagram editor 2025-02-04 14:10:43 +07:00
5c9fe8f8f5 feat(csharp): support vsdx in diagram editor 2025-02-04 13:27:05 +07:00
3e6a8e2a92 Merge branch 'release/v8.3.0' into develop 2025-02-03 16:33:02 +03:00
343705c4bd fix(nodejs): update tab icons 2025-02-03 16:31:52 +03:00
db30f43119 update file type icons
# Conflicts:
#	web/documentserver-example/csharp-mvc/Content/images/file_docx.svg
#	web/documentserver-example/csharp-mvc/Content/images/file_pdf.svg
#	web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg
#	web/documentserver-example/csharp-mvc/Content/images/file_upload.svg
#	web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg
#	web/documentserver-example/csharp-mvc/Content/images/icon_docx.svg
#	web/documentserver-example/csharp-mvc/Content/images/icon_pdf.svg
#	web/documentserver-example/csharp-mvc/Content/images/icon_pptx.svg
#	web/documentserver-example/csharp-mvc/Content/images/icon_xlsx.svg
#	web/documentserver-example/csharp/App_Themes/images/file_docx.svg
#	web/documentserver-example/csharp/App_Themes/images/file_pdf.svg
#	web/documentserver-example/csharp/App_Themes/images/file_pptx.svg
#	web/documentserver-example/csharp/App_Themes/images/file_upload.svg
#	web/documentserver-example/csharp/App_Themes/images/file_xlsx.svg
#	web/documentserver-example/csharp/App_Themes/images/icon_docx.svg
#	web/documentserver-example/csharp/App_Themes/images/icon_pdf.svg
#	web/documentserver-example/csharp/App_Themes/images/icon_pptx.svg
#	web/documentserver-example/csharp/App_Themes/images/icon_xlsx.svg
#	web/documentserver-example/go/static/images/file_docx.svg
#	web/documentserver-example/go/static/images/file_pdf.svg
#	web/documentserver-example/go/static/images/file_pptx.svg
#	web/documentserver-example/go/static/images/file_upload.svg
#	web/documentserver-example/go/static/images/file_xlsx.svg
#	web/documentserver-example/go/static/images/icon_docx.svg
#	web/documentserver-example/go/static/images/icon_pdf.svg
#	web/documentserver-example/go/static/images/icon_pptx.svg
#	web/documentserver-example/go/static/images/icon_xlsx.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docx.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pdf.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pptx.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/file_upload.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/file_xlsx.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_docx.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_pdf.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_pptx.svg
#	web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_xlsx.svg
#	web/documentserver-example/java/src/main/webapp/css/img/file_docx.svg
#	web/documentserver-example/java/src/main/webapp/css/img/file_pdf.svg
#	web/documentserver-example/java/src/main/webapp/css/img/file_pptx.svg
#	web/documentserver-example/java/src/main/webapp/css/img/file_upload.svg
#	web/documentserver-example/java/src/main/webapp/css/img/file_xlsx.svg
#	web/documentserver-example/java/src/main/webapp/css/img/icon_docx.svg
#	web/documentserver-example/java/src/main/webapp/css/img/icon_pdf.svg
#	web/documentserver-example/java/src/main/webapp/css/img/icon_pptx.svg
#	web/documentserver-example/java/src/main/webapp/css/img/icon_xlsx.svg
#	web/documentserver-example/nodejs/public/images/file_docx.svg
#	web/documentserver-example/nodejs/public/images/file_pdf.svg
#	web/documentserver-example/nodejs/public/images/file_pptx.svg
#	web/documentserver-example/nodejs/public/images/file_upload.svg
#	web/documentserver-example/nodejs/public/images/file_xlsx.svg
#	web/documentserver-example/nodejs/public/images/icon_docx.svg
#	web/documentserver-example/nodejs/public/images/icon_pdf.svg
#	web/documentserver-example/nodejs/public/images/icon_pptx.svg
#	web/documentserver-example/nodejs/public/images/icon_xlsx.svg
#	web/documentserver-example/php-laravel/public/images/file_docx.svg
#	web/documentserver-example/php-laravel/public/images/file_pdf.svg
#	web/documentserver-example/php-laravel/public/images/file_pptx.svg
#	web/documentserver-example/php-laravel/public/images/file_upload.svg
#	web/documentserver-example/php-laravel/public/images/file_xlsx.svg
#	web/documentserver-example/php-laravel/public/images/icon_docx.svg
#	web/documentserver-example/php-laravel/public/images/icon_pdf.svg
#	web/documentserver-example/php-laravel/public/images/icon_pptx.svg
#	web/documentserver-example/php-laravel/public/images/icon_xlsx.svg
#	web/documentserver-example/php/assets/images/file_docx.svg
#	web/documentserver-example/php/assets/images/file_pdf.svg
#	web/documentserver-example/php/assets/images/file_pptx.svg
#	web/documentserver-example/php/assets/images/file_upload.svg
#	web/documentserver-example/php/assets/images/file_xlsx.svg
#	web/documentserver-example/php/assets/images/icon_docx.svg
#	web/documentserver-example/php/assets/images/icon_pdf.svg
#	web/documentserver-example/php/assets/images/icon_pptx.svg
#	web/documentserver-example/php/assets/images/icon_xlsx.svg
#	web/documentserver-example/python/static/images/file_docx.svg
#	web/documentserver-example/python/static/images/file_pdf.svg
#	web/documentserver-example/python/static/images/file_pptx.svg
#	web/documentserver-example/python/static/images/file_upload.svg
#	web/documentserver-example/python/static/images/file_xlsx.svg
#	web/documentserver-example/python/static/images/icon_docx.svg
#	web/documentserver-example/python/static/images/icon_pdf.svg
#	web/documentserver-example/python/static/images/icon_pptx.svg
#	web/documentserver-example/python/static/images/icon_xlsx.svg
#	web/documentserver-example/ruby/app/assets/images/file_docx.svg
#	web/documentserver-example/ruby/app/assets/images/file_pdf.svg
#	web/documentserver-example/ruby/app/assets/images/file_pptx.svg
#	web/documentserver-example/ruby/app/assets/images/file_upload.svg
#	web/documentserver-example/ruby/app/assets/images/file_xlsx.svg
#	web/documentserver-example/ruby/app/assets/images/icon_docx.svg
#	web/documentserver-example/ruby/app/assets/images/icon_pdf.svg
#	web/documentserver-example/ruby/app/assets/images/icon_pptx.svg
#	web/documentserver-example/ruby/app/assets/images/icon_xlsx.svg
2025-02-03 16:31:52 +03:00
b759c8ba53 nodejs: interactive-widget=resizes-content ( Fix Bug 72802 ) 2025-02-03 15:07:07 +03:00
d7f45cc7a9 Merge pull request 'feature/php-laravel-sdk-integration' from feature/php-laravel-sdk-integration into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/25
Reviewed-by: Stepan Mayorov <stepan.mayorov@onlyoffice.com>
Reviewed-by: Alexander Kondratev <aleksandr.kondratyev@onlyoffice.com>
2025-01-31 12:02:28 +00:00
57b3641647 Merge remote-tracking branch 'remotes/origin/develop' into feature/php-laravel-sdk-integration
# Conflicts:
#	CHANGELOG.md
2025-01-31 15:01:35 +03:00
41fd4d9e92 Merge branch 'release/v8.3.0' into develop
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
#	web/documentserver-example/nodejs/views/editor.ejs
2025-01-31 13:37:58 +03:00
ad3e6bbe15 1.12.0 2025-01-31 13:34:00 +03:00
76c7e10993 sq-AL skin language
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/go/config/configuration.json
#	web/documentserver-example/php-laravel/app/Repositories/LanguageRepository.php
2025-01-31 13:11:06 +03:00
f023a9defd nodejs: support hwp, hwps formats
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
2025-01-31 12:20:11 +03:00
e9cd5e30fb nodejs: support pages, numbers, key formats
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
2025-01-31 12:20:11 +03:00
85bf35f50a nodejs: refresh file config
# Conflicts:
#	CHANGELOG.md
2025-01-31 12:20:03 +03:00
383e2dcaba fix changelog 2025-01-31 11:52:37 +03:00
b7d863b0e1 Revert "feat: add kurdish language"
This reverts commit a0da50d123.

# Conflicts:
#	CHANGELOG.md
2025-01-29 14:14:29 +03:00
d79c1d35b2 Merge branch 'develop' into feature/php-laravel-sdk-integration 2025-01-27 15:56:11 +05:00
66f1233c16 Merge pull request 'update copyright 2025' from copyright-2025 into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/30
2025-01-27 10:04:38 +00:00
eac01bfc61 update copyright 2025 2025-01-27 15:52:48 +07:00
bb4e0f2313 Merge branch 'feature/restore-by-url' into develop 2025-01-27 11:47:45 +03:00
b3de340b66 Merge remote-tracking branch 'remotes/origin/develop' into feature/restore-by-url
# Conflicts:
#	CHANGELOG.md
2025-01-27 11:47:12 +03:00
74aee6a701 Merge branch 'feature/hwp' into develop 2025-01-27 11:36:05 +03:00
2e3fdf9904 Merge pull request 'update tab icons' from update-icons into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/29
2025-01-27 08:34:20 +00:00
53a4684ece fix changelog 2025-01-27 11:31:42 +03:00
2bd367e345 Merge pull request 'add kurdish language' from feature/kurdish-language into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/28
2025-01-27 08:19:56 +00:00
afb8ab651c fix(ruby): update tab icons 2025-01-27 15:12:25 +07:00
06080ee140 fix(python): update tab icons 2025-01-27 15:11:20 +07:00
dfc4d9656f fix(php-laravel): update tab icons 2025-01-27 15:10:26 +07:00
10a9bbc2ee fix(php): update tab icons 2025-01-27 15:09:22 +07:00
3d6c4bafb2 fix(java-spring): update tab icons 2025-01-27 15:08:34 +07:00
c0a5772226 fix(java): update tab icons 2025-01-27 15:07:35 +07:00
6e8289cf82 fix(go): update tab icons 2025-01-27 15:06:26 +07:00
5a50742d89 fix(csharp-mvc): update tab icons 2025-01-27 15:05:45 +07:00
d93bdbc50d fix(csharp): update tab icons 2025-01-27 15:04:50 +07:00
c796f999f1 fix(nodejs): update tab icons 2025-01-27 15:03:05 +07:00
a0da50d123 feat: add kurdish language 2025-01-27 13:58:41 +07:00
6e624a1e2a feat(php-laravel): restore file by url 2025-01-27 12:55:48 +07:00
63d9a4fb56 feat(ruby): restore file by url 2025-01-27 12:55:48 +07:00
5450a70e8b feat(python): restore file by url 2025-01-27 12:55:48 +07:00
3016f18654 feat(php): restore file by url 2025-01-27 12:55:48 +07:00
1b03eb30cb feat(java-spring): restore file by url 2025-01-27 12:55:47 +07:00
d052523451 fix(java-spring): reading changes.json with utf-8 encoding 2025-01-27 12:55:47 +07:00
a62ae98b0e feat(java): restore file by url 2025-01-27 12:55:47 +07:00
915b1ae361 feat(go): restore file by url 2025-01-27 12:55:47 +07:00
1d7e3f50ea fix(go): change meta on file restore 2025-01-27 12:55:47 +07:00
64e53e24a6 feat(csharp-mvc): restore file by url 2025-01-27 12:55:47 +07:00
eb1dd1b3f7 feat(csharp): restore file by url 2025-01-27 12:55:28 +07:00
a20215cefb feat(nodejs): restore file by url 2025-01-27 12:54:06 +07:00
2f8306e725 update submodules 2025-01-21 15:27:03 +03:00
a4386bcff4 Merge pull request 'build(nodejs): update config package to 3.3.12' from nodejs-update-config-package into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/27
2025-01-21 08:40:36 +00:00
8e6e1bb9cb build(nodejs): update config package to 3.3.12 2025-01-21 13:51:11 +07:00
2d4c71576d use format and format manager sdk classes 2025-01-16 15:45:28 +05:00
9870ecee0b create custom document manager class extending sdk documents manager class 2025-01-16 15:44:54 +05:00
8ef74cd576 create custom format model extending sdk format class 2025-01-16 15:43:45 +05:00
ceaa9d42ed remove redundant document formats submodule 2025-01-16 15:40:48 +05:00
c07db2d6c8 update composer lock file 2025-01-15 21:54:43 +05:00
45d76b5d78 set docs sdk version to 1.1 and higher 2025-01-15 21:54:26 +05:00
4f6f05aa17 nodejs: support hwp, hwps formats 2025-01-15 13:50:51 +03:00
212939e9fc add sdk env variables 2025-01-15 14:15:10 +05:00
fe2d02673a update changelog 2025-01-14 18:49:48 +05:00
5a4c151931 Merge branch 'develop' into feature/php-laravel-sdk-integration 2025-01-14 18:46:12 +05:00
fb053f7f71 run laravel pint autofix 2025-01-14 18:23:19 +05:00
1776e758c3 delete redundant service classes 2025-01-14 17:45:32 +05:00
bfcff2b523 use convert request adapter in convert command 2025-01-14 17:44:03 +05:00
9ce227216f create adapter for sdk convert service 2025-01-14 17:43:26 +05:00
dca8684410 use sdk command request for updating meta information 2025-01-14 17:42:01 +05:00
a76dcb1c79 Merge branch 'feature/vsdx' into release/v8.3.0 2025-01-14 14:57:36 +03:00
4ceb7ee5cd nodejs: support diagram editor 2025-01-14 14:56:30 +03:00
924200ad8a use php sdk command request service 2025-01-13 18:59:06 +05:00
f715ed454d sq-AL skin language 2025-01-10 16:33:00 +03:00
2cd8cd6472 nodejs: remove logging to console with data (Fix Bug 72374) 2025-01-10 14:54:46 +03:00
3fd58754cd use sdk forms class objects in callback saving process 2025-01-09 18:29:03 +05:00
f277117f3d pass formsdataurl to callback class object 2025-01-09 18:25:25 +05:00
461f9858c3 remove redundant forcesavetype check 2025-01-09 18:24:28 +05:00
e5b4be43cb get history changes from history class object 2025-01-09 18:06:04 +05:00
80ee474993 use settings manager function for replacing docs url with internal 2025-01-09 18:04:47 +05:00
f5003c2988 check if history data is not empty 2025-01-09 18:00:54 +05:00
54e5cfcc8c use document manager for retrieving file related urls 2024-12-23 16:45:01 +05:00
5c65aec49b implement sdk document manager 2024-12-23 16:41:07 +05:00
27d293e528 use sdk callback service for tracking file changes 2024-12-19 14:01:49 +05:00
a33ef3597b implement sdk callback service 2024-12-19 13:57:59 +05:00
1e9b017c19 use the command request adapter for retrieving forgotten files list 2024-12-16 16:24:59 +05:00
f5934baffa add jwt related setting keys 2024-12-16 16:23:17 +05:00
a9e5e01990 add documentserverinternalurl key 2024-12-16 16:22:44 +05:00
9b9a715117 create an adapter for the sdk request service class 2024-12-16 16:21:29 +05:00
c6606c631d use sdk formats manager for retrieving formats list 2024-12-16 16:18:07 +05:00
82775f8d1b implement sdk request service 2024-12-16 16:15:54 +05:00
97288932ac implement sdk http client 2024-12-16 16:15:08 +05:00
69a3865fb8 Merge pull request 'feature/refresh-file' from feature/refresh-file into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/22
2024-12-16 07:27:14 +00:00
3383a00ad0 Merge remote-tracking branch 'remotes/origin/develop' into feature/refresh-file 2024-12-16 10:23:38 +03:00
7a523efaec Merge pull request 'feature/docs-integration-sdk-1.3' from feature/docs-integration-sdk-1.3 into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/24
2024-12-16 07:23:21 +00:00
cf90c42605 feat: delete model common/Changes from docs-integration-sdk 2024-12-16 10:20:08 +03:00
ec25b8a355 feat: migrate to httpclient5 2024-12-16 10:18:21 +03:00
eada50a422 feat: com.onlyoffice.docs-integration-sdk:1.3.1-SNAPSHOT 2024-12-16 10:17:11 +03:00
a20d43caac refresh file to changelog 2024-12-16 10:04:41 +03:00
2fa62b9961 Merge remote-tracking branch 'remotes/origin/develop' into feature/refresh-file 2024-12-16 10:01:58 +03:00
74d067236a Merge pull request 'feature/update-laravel-pint' from feature/update-laravel-pint into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/23
2024-12-16 07:01:16 +00:00
999a944c5e run laravel pint autofix 2024-12-16 11:55:01 +05:00
db1278fa9c run composer update laravel/pint 2024-12-16 11:54:41 +05:00
56ed3bd017 feat(php-laravel): refresh file config 2024-12-16 11:58:14 +07:00
b68b543605 feat(php): refresh file config 2024-12-13 16:00:18 +07:00
31649e7203 feat(ruby): refresh file config 2024-12-13 15:01:44 +07:00
12495facdb feat(python): refresh file config 2024-12-13 14:14:44 +07:00
6511fbbf55 feat(java-spring): refresh file config 2024-12-13 14:14:44 +07:00
3e4b1b509b feat(java): refresh file config 2024-12-13 14:14:44 +07:00
bf9c1dc36c feat(go): refresh file config 2024-12-13 14:14:44 +07:00
3fe3a49edb feat(csharp-mvc): refresh file config 2024-12-13 14:14:44 +07:00
a6a1c4a4cc feat(csharp): refresh file config 2024-12-13 14:14:43 +07:00
05b4e9d63d Merge pull request 'nodejs-fileslist-fix' from nodejs-fileslist-fix into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/21
2024-12-11 13:41:47 +00:00
c6e73540ac Merge branch 'feature/vsdx' into develop (For Bug 72011) 2024-12-11 16:26:45 +03:00
eb31cabed5 nodejs: support vssx, vstx, vsdm, vssm, vstm in ds visio v8.3 2024-12-11 16:24:38 +03:00
135d17e7cc fix(nodejs): files list responsive width. Fix Bug 71949 2024-12-11 13:42:58 +07:00
ae21e7c6ca fix(nodejs): files list height. Fix Bug 71461 2024-12-11 13:42:50 +07:00
945402cede Merge branch 'feature/refresh-file' into develop 2024-12-09 12:08:40 +03:00
6051bbeb6d nodejs: onRequestRefreshFile not for anonymous 2024-12-09 12:08:28 +03:00
465d90e518 Merge pull request 'feature/refresh-file' from feature/refresh-file into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/20
2024-12-05 11:40:54 +00:00
05adfca5e0 nodejs: current permissions to refreshFile 2024-12-05 14:39:28 +03:00
0e627ad8fd nodejs: refresh file config 2024-12-05 14:39:21 +03:00
5dba1fa5ee changelog reorder 2024-12-05 11:27:12 +03:00
8940f71501 Merge pull request 'build(ruby): bump rails-html-sanitizer from 1.6.0 to 1.6.1' from bump-rails-html-sanitizer into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/19
2024-12-04 09:10:41 +00:00
c1d98d9df9 build(ruby): bump rails-html-sanitizer from 1.6.0 to 1.6.1 2024-12-04 15:16:35 +07:00
fa1c7eea2d Merge branch 'feature/8.3' into develop 2024-11-29 14:48:28 +03:00
186d7df2d3 nodejs: support vsdx in visio editor 2024-11-29 14:47:22 +03:00
d090ac039b nodejs: support pages, numbers, key formats 2024-11-29 14:46:17 +03:00
3186245cc8 update file type icons 2024-11-26 17:19:28 +03:00
6f7927c894 fix(nodejs): list of files is hidden behind the footer 2024-11-26 13:29:51 +07:00
b7b4e36367 Merge pull request 'Only available formats for forced conversion' from force-conversion-correct-formats into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/18
2024-11-21 14:08:29 +00:00
524bd4951a xml with -9 to changelog 2024-11-21 17:07:46 +03:00
9a189b06ee Merge remote-tracking branch 'remotes/origin/develop' into force-conversion-correct-formats 2024-11-21 17:05:25 +03:00
89d7145eec Merge pull request 'feature/convert-button' from feature/convert-button into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/15
Reviewed-by: serik.kerimbayevich <serik.kerimbayevich@onlyoffice.com>
2024-11-21 13:52:33 +00:00
983ba4ff30 converting to changelog 2024-11-21 16:45:38 +03:00
cd4afd7131 Merge remote-tracking branch 'remotes/origin/develop' into feature/convert-button 2024-11-21 16:44:25 +03:00
4dc13cc102 update file type icons 2024-11-21 16:25:30 +03:00
5d291649ed Merge remote-tracking branch 'remotes/origin/master' into develop
# Conflicts:
#	.github/workflows/lint-go.yml
2024-11-21 13:27:37 +03:00
44ad9ad1ee master branch only 2024-11-21 13:26:00 +03:00
e97c8a8393 actions for go 2024-11-21 13:23:19 +03:00
829e1cc234 go: readme 2024-11-21 13:19:03 +03:00
34ec3a994a copyright 2024 2024-11-21 13:18:43 +03:00
02adb6cdca copyright to forgotten 2024-11-21 13:14:37 +03:00
48a15fba8b go: license files 2024-11-21 13:06:25 +03:00
8765bd9504 Merge pull request 'feature/go-lang' from feature/go-lang into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/17
2024-11-21 09:11:42 +00:00
28a26f001a fix(php): public url for unsupported converted files 2024-11-21 15:55:40 +07:00
2ee81699e9 fix(python): public url for unsupported converted files 2024-11-21 15:55:21 +07:00
c28aec0c0f fix(ruby): public url for unsupported converted files 2024-11-21 15:54:56 +07:00
f01bcae614 fix(go): available formats for forced conversion 2024-11-21 13:22:55 +07:00
321e60b17d fix(ruby): available formats for forced conversion 2024-11-21 13:19:06 +07:00
0ee55e0e87 fix(python): available formats for forced conversion 2024-11-21 13:17:09 +07:00
5fe1bf2f14 fix(php): available formats for forced conversion 2024-11-21 13:15:02 +07:00
c2153c48c5 fix(java-spring): available formats for forced conversion 2024-11-21 13:12:26 +07:00
90e46de59b fix(php-laravel): available formats for forced conversion 2024-11-21 13:08:43 +07:00
4eecbdeb3d fix(java): available formats for forced conversion 2024-11-20 16:50:50 +07:00
8b6cc401ee fix(csharp-mvc): available formats for forced conversion 2024-11-20 16:43:01 +07:00
f8cf8ebc84 fix(csharp): available formats for forced conversion 2024-11-20 16:40:32 +07:00
be92907929 fix(nodejs): available formats for forced conversion 2024-11-20 16:37:18 +07:00
a318a75c96 replace local settings and jwt classes with respective sdk classes 2024-11-19 18:11:27 +05:00
7f0f1739cb implement jwt manager class 2024-11-19 18:04:27 +05:00
c8cb50f89c implement settings manager class 2024-11-19 18:03:51 +05:00
de3801145a include docs-integration-sdk package 2024-11-19 18:02:13 +05:00
4ce6aa42be update submodules 2024-11-08 17:14:57 +03:00
8ecddf831c Merge remote-tracking branch 'remotes/origin/develop' into feature/go-lang 2024-11-08 17:14:22 +03:00
5dc7ffdecd update submodules 2024-11-08 17:13:49 +03:00
72821c7741 Merge remote-tracking branch 'remotes/origin/develop' into feature/go-lang
# Conflicts:
#	CHANGELOG.md
2024-11-08 10:18:55 +03:00
e8e42b6632 build(ruby): bump rexml from 3.3.3 to 3.3.9 2024-11-07 14:50:29 +07:00
42c5850c04 build(go): add go example linter workflow 2024-11-07 14:34:12 +07:00
54782d497d style(go): simplifycompositelit lint fix 2024-11-07 14:34:12 +07:00
7a39b68a68 style(go): usestdlibvars lint fix 2024-11-07 14:34:12 +07:00
cd0eaa9185 style(go): assignment to nil map lint fix (staticcheck:SA5000) 2024-11-07 14:34:12 +07:00
78400cdd8e style(go): stylecheck lint fix (ST1023) 2024-11-07 14:34:12 +07:00
e0b0c0f6c7 style(go): bodyclose lint fix 2024-11-07 14:34:12 +07:00
f71dd6b7cb style(go): misspell lint fix 2024-11-07 14:34:12 +07:00
bc6ba94703 style(go): errname lint fix 2024-11-07 14:34:11 +07:00
f952fc4ba5 style(go): godot lint fix 2024-11-07 14:34:11 +07:00
df8690b2c4 style(go): gocritic lint fix 2024-11-07 14:34:11 +07:00
adb8efd489 style(go): deprecated lint fix (staticcheck:SA1019) 2024-11-07 14:34:11 +07:00
9ba754f7bb style(go): unused lint fix 2024-11-07 14:34:11 +07:00
46c008499f style(go): line length(lll) lint fix 2024-11-07 14:34:11 +07:00
40221ecb11 style(go): errcheck lint fix 2024-11-07 14:34:11 +07:00
94f65b4f06 style(go): add golangci linter configuration 2024-11-07 14:34:03 +07:00
d4c83b5305 refactor(go): endpoint interface is divided into topic interfaces 2024-11-02 13:51:47 +07:00
c8b1b12e83 refactor(go): api endpoints are split into separate files 2024-11-01 16:08:12 +07:00
240e61d250 Merge remote-tracking branch 'remotes/origin/master' into develop 2024-10-31 16:52:40 +03:00
78fe9e02ce Merge pull request 'release/v1.11.0' from release/v1.11.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/16
2024-10-31 13:49:25 +00:00
8e260dec56 nodejs: fix lint (b36bfdec4d) 2024-10-31 16:45:37 +03:00
b67f6140a3 Merge pull request 'fix(php): correct forcesave submitform url. Fix Bug 71218' from fix-php-submitform into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/13
2024-10-31 07:58:49 +00:00
cd826987f6 feat(go): convert button 2024-10-31 14:32:13 +07:00
8ff457a219 fix(nodejs): docType icon for converting pdf 2024-10-30 16:32:35 +07:00
d2eb17607d feat(ruby): convert button 2024-10-30 16:32:35 +07:00
b7fcf10791 feat(python): convert button 2024-10-30 16:32:34 +07:00
2cdab7cbe1 feat(php-laravel): convert button 2024-10-30 16:32:34 +07:00
9f3561575f feat(php): convert button 2024-10-30 16:32:34 +07:00
3fda69efc8 feat(java-spring): convert button 2024-10-30 16:32:34 +07:00
55b709f87c feat(java): convert button 2024-10-30 16:32:34 +07:00
cbe6a1af48 feat(csharp-mvc): convert button 2024-10-30 16:32:34 +07:00
96a787cd5d feat(csharp): convert button 2024-10-30 16:32:33 +07:00
a886d535c8 fix(php): correct download urls for trackmanager. Fix Bug 71218 2024-10-29 13:31:54 +07:00
a5492d86c7 Merge remote-tracking branch 'remotes/origin/release/v1.11.0' into develop 2024-10-28 13:11:57 +03:00
3010db6bec Merge pull request 'build: update documentserver version to 8.2 in docker-compose files' from documentserver-version into release/v1.11.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/14
2024-10-28 10:11:33 +00:00
9f922ccdbe build: update documentserver version to 8.2 in docker-compose files 2024-10-28 13:10:46 +03:00
ad51cad2fb build: update documentserver version to 8.2 in docker-compose files 2024-10-28 16:39:47 +07:00
1e6b3672ae Merge pull request 'feature/on-request-reference-source' from feature/on-request-reference-source into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/10
Reviewed-by: serik.kerimbayevich <serik.kerimbayevich@onlyoffice.com>
2024-10-21 11:38:21 +00:00
9aca7a2b52 Merge remote-tracking branch 'remotes/origin/develop' into feature/on-request-reference-source
# Conflicts:
#	CHANGELOG.md
2024-10-21 14:37:46 +03:00
63934eedeb Merge remote-tracking branch 'remotes/origin/release/v1.11.0' into develop 2024-10-21 14:34:28 +03:00
cb8b4d1681 fix(nodejs): replace localhost in unsupported converted file url. Fix Bug 70551 (c4d80f6b5e) 2024-10-21 14:09:42 +03:00
8c6328e409 Merge pull request 'update-dependencies' from update-dependencies into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/12
2024-10-21 10:05:11 +00:00
b1fd32a0f6 Merge remote-tracking branch 'remotes/origin/release/v1.11.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-10-20 17:14:02 +03:00
ac98ecb8e7 nodejs: fix author 2024-10-20 17:13:12 +03:00
decb722cf9 1.11.0 2024-10-20 17:08:13 +03:00
401451b830 build(ruby): update dependencies 2024-10-16 17:02:16 +07:00
026daa0bf7 build(nodejs): update dependencies 2024-10-16 17:01:51 +07:00
1154ad273b Merge pull request 'revert-filling-by-default' from revert-filling-by-default into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/11
2024-10-16 09:00:35 +00:00
55cb8f0b9d Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-10-16 11:57:20 +03:00
d7d31bd6b7 fix changelog 2024-10-16 11:56:16 +03:00
3ab9ce15f0 changelog: revert filling by default 2024-10-16 15:00:21 +07:00
a615acd73d fix(php-laravel): revert filling by default 2024-10-16 15:00:21 +07:00
4bdae5d83b fix(ruby): revert filling by default 2024-10-16 15:00:21 +07:00
a9c737dbac fix(python): revert filling by default 2024-10-16 15:00:21 +07:00
639c20cffc fix(php): revert filling by default 2024-10-16 15:00:21 +07:00
011be765ab fix(java-spring): revert filling by default 2024-10-16 15:00:21 +07:00
cf9bc29986 fix(java): revert filling by default 2024-10-16 15:00:20 +07:00
5cb551a8db fix(csharp-mvc): revert filling by default 2024-10-16 15:00:20 +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
d6a821a7f9 feat(php-laravel): fetch files endpoint 2024-10-15 16:25:31 +07:00
37d07b1903 feat(php-laravel): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
e922fb4bdb feat(ruby): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
e736b94076 feat(python): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
c9528a6e47 feat(php): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
93fcf5264d feat(java-spring): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
c039a8a94e feat(java): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
5c3134d451 feat(csharp-mvc): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
8c7f4ffee0 feat(csharp): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
727a3018b9 Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop 2024-10-14 13:03:35 +03:00
8714cc3d69 Revert "nodejs: comment only is not for pdf"
This reverts commit 146d26c868.
2024-10-14 12:08:22 +03:00
b7d6afb7d9 build(ruby): bump rexml from 3.3.3 to 3.3.6 2024-10-11 16:55:04 +07:00
f1c5be0401 Merge remote-tracking branch 'remotes/origin/master' into release/v8.2.0 2024-10-11 12:33:49 +03:00
d68860f025 Merge pull request 'release/v1.10.0 from release/v1.10.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/9
2024-10-11 09:27:13 +00:00
fdd90fd851 python: fix lint 2024-10-11 12:20:12 +03:00
50721212b1 Merge remote-tracking branch 'remotes/origin/develop' into feature/go-lang
# Conflicts:
#	CHANGELOG.md
2024-10-10 13:50:04 +03:00
70a515f276 Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop 2024-10-10 13:49:08 +03:00
abb7f6e893 Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0 2024-10-10 13:47:38 +03:00
cddb89ced3 Merge pull request 'feature/on-request-close' from feature/on-request-close into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/7
2024-10-10 10:45:50 +00:00
c318020c6b php-laravel: fix lint 2024-10-10 13:44:07 +03:00
675d8ff8e1 Merge remote-tracking branch 'remotes/origin/master' into develop 2024-10-10 13:40:29 +03:00
89c60280ba php-laravel: lint 2024-10-10 13:40:12 +03:00
bb4cbd1625 Merge remote-tracking branch 'remotes/origin/develop' into feature/on-request-close 2024-10-10 13:37:57 +03:00
4a595fc60e nodejs: fix lint (b36bfdec4d) 2024-10-10 13:37:09 +03:00
fc45eca00d Merge remote-tracking branch 'remotes/origin/master' into develop 2024-10-10 13:29:38 +03:00
8522e08670 php-laravel: lint 2024-10-10 13:29:10 +03:00
bf4451bef1 close to changelog 2024-10-10 13:24:22 +03:00
52b792f3a2 Merge pull request 'fix(java-spring): error saving non-existent file. Fix Bug 70788' from fix-java-spring-forgotten into release/v1.10.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/8
2024-10-10 10:18:41 +00:00
05f7fa2b84 fix(java-spring): error saving non-existent file. Fix Bug 70788 2024-10-10 17:11:48 +07:00
a942265f63 feat(java-spring): close editor. Fix Bug 69915 2024-10-10 15:54:30 +07:00
ab8eab83cc feat(ruby): close editor. Fix Bug 69915 2024-10-10 15:32:43 +07:00
c01c486f3c feat(python): close editor. Fix Bug 69915 2024-10-10 15:32:42 +07:00
4a0ec745a7 feat(php-laravel): close editor. Fix Bug 69915 2024-10-10 15:32:42 +07:00
f145cadf01 feat(php): close editor. Fix Bug 69915 2024-10-10 15:32:42 +07:00
00f43b6ecd feat(java): close editor. Fix Bug 69915 2024-10-10 15:32:42 +07:00
6ad97aebc7 feat(csharp-mvc): close editor. Fix Bug 69915 2024-10-10 15:32:42 +07:00
ea5f2efe46 feat(csharp): close editor. Fix Bug 69915 2024-10-10 15:32:41 +07:00
eba8bce11b Merge pull request 'feature/filename-title' from feature/filename-title into develop
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/6
2024-10-08 15:15:05 +00:00
a92c71e045 python: fix lint 2024-10-08 18:14:22 +03:00
77a9435e29 nodejs: fix lint 2024-10-08 18:14:14 +03:00
a7e0e462d0 Merge pull request 'feature/golang-update' (#4) from feature/golang-update into feature/go-lang
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/4
2024-10-08 09:56:29 +00:00
d13798f9db Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop 2024-10-08 12:54:34 +03:00
06c3dc1446 Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0 2024-10-08 12:54:10 +03:00
b751d44a51 Merge pull request '1.10.0-bugfix' (#5) from 1.10.0-bugfix into release/v1.10.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/5
2024-10-08 09:52:38 +00:00
55ab10a1a6 changelog: filename in editor page title 2024-10-08 15:24:54 +07:00
11f62358be feat(go): filename in editor page title 2024-10-08 15:04:19 +07:00
1ced3a7f0d feat(php-laravel): filename in editor page title 2024-10-08 14:31:15 +07:00
b138385196 feat(ruby): filename in editor page title 2024-10-08 13:42:48 +07:00
940ae9fedd go: submit for all modes (35cf2fb0b0) 2024-10-07 14:56:26 +03:00
2ab8a55d8f Merge remote-tracking branch 'remotes/origin/develop' into feature/golang-update 2024-10-07 14:55:58 +03:00
e32dd4152b php-laravel: submit for all modes (35cf2fb0b0) 2024-10-07 14:55:30 +03:00
3db9b887ed Merge branch 'release/v8.2.0' into develop 2024-10-07 14:54:30 +03:00
35cf2fb0b0 submit for all modes 2024-10-07 14:54:16 +03:00
728c74b1aa feat(python): filename in editor page title 2024-10-07 16:37:16 +07:00
e2bc4a6628 feat(php): filename in editor page title 2024-10-07 16:23:25 +07:00
8e8593d7c1 feat(java-spring): filename in editor page title 2024-10-07 16:13:34 +07:00
353e1b9ea6 feat(java): filename in editor page title 2024-10-07 16:00:12 +07:00
4cb2c83581 feat(csharp-mvc): filename in editor page title 2024-10-07 15:49:15 +07:00
ce72ffe77e feat(csharp): filename in editor page title 2024-10-07 15:49:15 +07:00
efba3452c6 feat(nodejs): filename in editor page title 2024-10-07 15:49:10 +07:00
cfff9c95ea go: command and converter address 2024-10-07 11:39:48 +03:00
95cdc163c1 Merge remote-tracking branch 'remotes/origin/develop' into feature/golang-update
# Conflicts:
#	.gitmodules
#	CHANGELOG.md
2024-10-07 11:38:47 +03:00
a27081b288 php-laravel: command and converter address 2024-10-07 11:37:30 +03:00
11bcd3805a Merge remote-tracking branch 'remotes/origin/release/v8.2.0' into develop 2024-10-07 11:36:13 +03:00
25ec76084f coauthoring/CommandService.ashx address replaced with command 2024-10-07 11:35:55 +03:00
c72218d3ae ConvertService.ashx address replaced with converter 2024-10-07 11:34:22 +03:00
cd81f8cd1c feat(go): using default empty files 2024-10-07 15:19:20 +07:00
17458ec5b3 fix(java-spring): сut out directUrl. Fix Bug 70571 2024-10-07 14:42:24 +07:00
c4d80f6b5e fix(nodejs): replace localhost in unsupported converted file url. Fix Bug 70551 2024-10-03 15:15:42 +07:00
85b7284c8a feat(go): update main page 2024-10-02 16:06:47 +07:00
5cccae71f3 feat(go): forgotten files 2024-10-02 16:06:47 +07:00
2a05278c16 feat(go): file versions for index endpoint 2024-10-02 16:06:47 +07:00
ba4024665a feat(go): real server version in meta 2024-10-02 16:06:47 +07:00
dfb4e06772 feat(go): update convert endpoint. force conversion support 2024-10-02 16:06:47 +07:00
618369fe5f feat(go): pdf filetype support 2024-10-02 16:06:47 +07:00
641ae7c15d feat(go): removeAll endpoint 2024-10-02 16:06:47 +07:00
481ac474bd feat(go): formats endpoint 2024-10-02 16:06:46 +07:00
9828fdd704 fix(go): not nil remove comment group for uid-3 2024-10-02 16:06:46 +07:00
b1343c7554 feat(go): fillForms extensions support 2024-10-02 16:06:46 +07:00
78e8394457 feat(go): update configuration 2024-10-02 16:06:46 +07:00
fd7579a36a feat(go): update static resources 2024-10-02 16:06:33 +07:00
f1cf416166 nodejs: resize wopi frame (fix Bug 70591) 2024-10-01 15:16:13 +03:00
a0ddf8d350 using default empty files (2b0b902f9c) 2024-09-30 12:54:58 +03:00
576a234289 Merge branch 'release/v8.2.0' into develop 2024-09-30 12:53:39 +03:00
50bbd86cf5 Merge branch 'release/v1.10.0' into release/v8.2.0 2024-09-30 12:52:43 +03:00
2b0b902f9c using default empty files (For Bug 70101) 2024-09-30 12:50:09 +03:00
b36bfdec4d fix(nodejs): fix maxfilesize issue on upload (Fix Bug 70516) 2024-09-27 14:25:21 +03:00
f3e5b8e8cf Revert "nodejs: disable forgotten by default"
This reverts commit f48734b235.
2024-09-24 18:18:16 +03:00
4c2a654871 Merge branch 'release/v8.2.0' into develop 2024-09-24 15:08:14 +03:00
97b70cceb5 Merge branch 'release/v1.10.0' into release/v8.2.0 2024-09-24 15:07:22 +03:00
596d445439 revert empty files (For Bug 70101) 2024-09-24 15:06:16 +03:00
4943adc21a nodejs: WOPI rename 2024-09-24 14:37:32 +03:00
db3ccd7482 Revert "nodejs: filling by default if possible" (Fix Bug 70284)
This reverts commit 15e09fece2.

# Conflicts:
#	web/documentserver-example/nodejs/app.js
2024-09-24 12:06:41 +03:00
4c7ea51207 Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0 2024-09-24 12:02:52 +03:00
4f8f7399bb Merge pull request 'bugfix-1.10.0' (#3) from bugfix-1.10.0 into release/v1.10.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/3
2024-09-24 09:02:19 +00:00
b762ef4120 php-laravel: he-IL skin language (581f2aaef6) 2024-09-23 10:59:52 +03:00
934eaecad9 Merge branch 'release/v8.2.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-09-23 10:53:42 +03:00
fe4340e731 Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into develop 2024-09-23 10:52:10 +03:00
581f2aaef6 he-IL skin language 2024-09-23 10:51:25 +03:00
a96bfe0777 build(go): update submodules 2024-09-23 13:34:59 +07:00
62f98954b4 fix(python): exclude nochanges(4) error in command service request 2024-09-20 18:10:53 +07:00
819faf84f1 fix(ruby): exclude nochanges(4) error in command service request. Fix Bug 69913 2024-09-20 18:03:38 +07:00
66cf2aca8c Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into bugfix-1.10.0
# Conflicts:
#	web/documentserver-example/csharp-mvc/Scripts/jscript.js
#	web/documentserver-example/csharp/script/jscript.js
#	web/documentserver-example/python/static/js/jscript.js
2024-09-20 09:57:35 +03:00
73b727ff9f Merge pull request 'fix: add file existence check before save. Fix Bug 69948' (#2) from fix/java-check-file-exist into release/v1.10.0
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/2
2024-09-18 08:55:32 +00:00
4c8fb6b3be nodejs: getting name in wopi (Fix Bug 70092) 2024-09-18 11:53:31 +03:00
dcc5a8f56d build(java-spring): update SDK dependency. Fix Bug 69951 2024-09-18 15:38:34 +07:00
14df5fcfa0 fix: add file existence check before save 2024-09-17 14:17:00 +03:00
e2e8087800 fix(python): extension without dot in conversion script. Fix Bug 69931 2024-09-16 15:59:12 +07:00
4c6e6dc235 fix(java): not blank page goback for uid-2. Fix Bug 69945 2024-09-13 16:31:05 +07:00
cd4ff5e045 fix(php): replacing localhost in saveas file url. Fix Bug 69936 2024-09-13 14:16:58 +07:00
b9b4aeffac fix working with formats (893303c27f) (Fix Bug 70022) 2024-09-12 10:10:05 +03:00
e25b10d618 fix(csharp-mvc): extension without dot in conversion script. Fix Bug 70022 2024-09-12 14:03:49 +07:00
f00abbc9e7 fix(csharp): extension without dot in conversion script. Fix Bug 70022 2024-09-12 14:03:15 +07:00
09344f6bbb fix(ruby): replace url to public server for forgotten files (Fix Bug 69930) 2024-09-11 15:58:47 +03:00
c23e9b6a0f fix(php): replace url to public server for forgotten files 2024-09-11 15:58:05 +03:00
814ed51134 fix(python): replace url to public server for forgotten files 2024-09-11 15:58:05 +03:00
63237f52ca fix(csharp): forgotten pdf logo. Fix Bug 70023 2024-09-11 16:13:46 +07:00
aeae7446df Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into develop 2024-09-10 22:36:43 +03:00
8cf285c51b nodejs: separate method for getting fileName from url (Fix Bug 70092) 2024-09-10 22:36:21 +03:00
4ae4687d29 nodejs: replace unsupported symbols in file name 2024-09-10 22:36:21 +03:00
4cd3385b33 php-laravel: update empty files (f55beaa8ac) 2024-09-10 18:16:31 +03:00
d675b92ba8 Merge branch 'release/v1.10.0' into develop 2024-09-10 18:12:13 +03:00
f55beaa8ac update empty files (Fix Bug 70100) 2024-09-10 18:11:50 +03:00
0a802159f0 Merge remote-tracking branch 'remotes/origin/develop' into feature/go-lang
# Conflicts:
#	CHANGELOG.md
2024-09-10 17:20:13 +03:00
3f3274a316 Merge remote-tracking branch 'remotes/origin/feature/php-laravel' into develop 2024-09-09 12:22:25 +03:00
6eb812eb40 format changelog 2024-09-09 12:22:07 +03:00
e6862bce87 update submodule with tiff ext (4be1abca19) 2024-09-09 09:26:54 +03:00
21c92bb13a Merge remote-tracking branch 'remotes/origin/develop' into feature/php-laravel 2024-09-09 09:25:59 +03:00
4be1abca19 update submodule with tiff ext 2024-09-09 09:24:36 +03:00
7eac06aa57 nodejs: fix default actions on mobile (For Bug 65920) 2024-09-06 17:25:16 +03:00
763512afc4 nodejs: fix lint (194ad60648) 2024-09-06 17:22:39 +03:00
1b0867af69 nodejs: percentage on converting (Fix Bug 69567) 2024-09-06 15:15:24 +03:00
aa42745a3a nodejs: opening history for wopi (Fix Bug 70025) 2024-09-06 14:52:14 +03:00
194ad60648 nodejs: decode filename from utf7 in "save as" process (Fix Bug 69827) 2024-09-05 18:21:13 +03:00
b8a5bd4fab discard user creation during building process 2024-08-27 15:04:29 +05:00
3d4df2a316 fix incorrect language retrieving method 2024-08-27 13:21:32 +05:00
3a17c7aef9 update templates 2024-08-26 11:07:33 +03:00
19ef21c440 Merge remote-tracking branch 'remotes/origin/develop' into feature/php-laravel 2024-08-26 11:07:09 +03:00
1e6465aef7 update templates 2024-08-26 11:06:04 +03:00
9f823a64f3 run laravel pint autofix 2024-08-19 00:12:37 +05:00
e811ae280e implement reference data 2024-08-19 00:10:03 +05:00
ad44aa982c append port to origin only if present 2024-08-19 00:08:50 +05:00
95cb7e708a fix incorrect config key 2024-08-19 00:07:54 +05:00
82ef4af322 feat(go): artifact and release workflows 2024-08-08 19:46:23 +05:00
143e809228 docs(go): changelog 2024-08-08 19:20:05 +05:00
1c01d6c081 docs(go): deps bump, revised licenses 2024-08-08 19:14:31 +05:00
6d119e1449 Merge pull request #572 from ONLYOFFICE/feature/golang-update
Update golang example
2024-08-08 18:25:19 +05:00
6b6fa50e49 Merge pull request #586 from ONLYOFFICE/feature/ruby-update-deps
chore(ruby): update dependencies
2024-08-05 16:53:35 +03:00
c01bcf1807 chore(ruby): update dependencies 2024-08-05 16:30:11 +03:00
06538c87fc run laravel pint autofix 2024-08-05 17:50:25 +05:00
112bb10c5e implement on request rename 2024-08-05 17:49:21 +05:00
909d503f24 enable on make action link event 2024-08-05 17:16:00 +05:00
26cefa9592 autofix linter offences 2024-08-04 12:42:47 +05:00
2d7491c5cb implement file version restore method 2024-08-04 12:40:31 +05:00
23e12fd02a return an absolute path of a version file 2024-08-04 12:38:30 +05:00
9e9152e29f create a method for retrieving an absolute path of a file 2024-08-04 12:37:37 +05:00
dbec7788ca change version creation order 2024-08-04 12:36:29 +05:00
5caeb643c7 fix incorrect commands 2024-08-04 12:35:10 +05:00
a1758227a8 create php-laravel release artifact 2024-08-01 15:33:49 +05:00
1c9a1fee9c fix linter offences: new_with_parentheses 2024-08-01 15:22:33 +05:00
7201ec4f9e tabs to changelog (efac5b9d70) 2024-08-01 13:16:07 +03:00
5c8f1f525e add troubleshooting section 2024-08-01 15:08:10 +05:00
ae75cfecde add php-laravel changelogs 2024-08-01 14:09:27 +05:00
4da1b99f0a update linter actions versions 2024-08-01 14:01:40 +05:00
5e47e8904a update artifact actions versions 2024-08-01 13:59:11 +05:00
5939624d96 add user info entry to env variables list 2024-08-01 13:50:26 +05:00
c20d8f6dd7 specify laravel version and and show only essential env variables in configration section 2024-08-01 13:31:13 +05:00
31cda491e3 set default values to example app env variables 2024-08-01 12:30:12 +05:00
53687405b2 fix incorrect npm command 2024-08-01 12:28:45 +05:00
7d7d4abb62 fix undefined user 2024-08-01 12:28:05 +05:00
4822db320d hide restore button 2024-08-01 12:26:49 +05:00
56101aa086 sort files lsit by modification time by default 2024-08-01 12:26:02 +05:00
c781fd2bc2 create readme 2024-07-31 18:14:37 +05:00
c38a8ce22e add additional installation commands 2024-07-31 18:14:22 +05:00
07bdcc70af Merge remote-tracking branch 'remotes/origin/develop' into feature/php-laravel 2024-07-31 14:47:13 +03:00
11a22f88a5 php-laravel: fix remove favorite status (c46b4e16d5) 2024-07-31 14:46:56 +03:00
c46b4e16d5 fix remove favorite status (0e1a580a86) 2024-07-31 14:28:21 +03:00
5179e81d8f Revert "trigger php-laravel artifact"
This reverts commit bdca18f28c.
2024-07-31 12:55:04 +05:00
f70dddd627 rename jwt secret env variable 2024-07-31 12:54:34 +05:00
29d1401687 add user related env variables and change default drivers 2024-07-31 12:54:07 +05:00
bdca18f28c trigger php-laravel artifact 2024-07-31 12:09:28 +05:00
07a0d4f62b create artifact for php-laravel example 2024-07-31 12:07:46 +05:00
d411a9f98e Revert "test php-laravel action linter"
This reverts commit b1c272e17f.
2024-07-30 18:41:49 +05:00
f20676c964 do not fix style errors 2024-07-30 18:39:30 +05:00
b1c272e17f test php-laravel action linter 2024-07-30 18:36:29 +05:00
3eedf0ad6d create action linter for php-laravel example 2024-07-30 18:33:15 +05:00
71879477c7 remove unrelated info 2024-07-30 16:17:35 +05:00
a618e19617 add copyright info to original files 2024-07-30 16:17:10 +05:00
5bf073dd66 add 3rd party licenses 2024-07-30 15:55:24 +05:00
297bed31e7 add license 2024-07-30 15:54:37 +05:00
e9e066da8e autofix linter errors in EnsureForgottenPageEnabled class 2024-07-30 14:10:05 +05:00
0086aba64d control forgotten page display with env variable 2024-07-30 14:08:37 +05:00
5ab85490f5 run laravel pint fix 2024-07-30 13:56:31 +05:00
35e44e3eb6 log errors in controller methods 2024-07-30 13:53:17 +05:00
c3c05490b7 add and rename doc server version env variable 2024-07-30 13:47:32 +05:00
edd8813e56 add makefile 2024-07-30 13:40:33 +05:00
f5e2bbb82b create and modify env variables 2024-07-30 13:39:08 +05:00
f5664fe912 fix incorrect path to formats js file 2024-07-30 13:38:17 +05:00
0786a1c326 add submodules 2024-07-30 12:08:00 +05:00
ee0680f806 Merge branch 'develop' into feature/php-laravel 2024-07-30 11:11:01 +05:00
414cb9b535 delete redundant vite config inputs 2024-07-29 18:11:03 +05:00
e3aa07ef9a delete redundant static js file 2024-07-29 18:10:08 +05:00
267c53bb14 update composer.lock 2024-07-29 18:09:32 +05:00
6b32e9f95d implement editor history function 2024-07-29 18:09:11 +05:00
77ecde55c0 complete refactor 2024-07-29 18:07:54 +05:00
2c61843695 add and check additional embeded param and refactor use classes 2024-07-29 17:55:08 +05:00
c85fc5ef31 check and decode jwt tokens in middleware 2024-07-29 17:52:49 +05:00
88ddd4c2cb check and create user directories in middleware 2024-07-29 17:51:57 +05:00
b772ffba90 create enum for format type 2024-07-29 17:49:26 +05:00
a6fdc58767 create custom view for errors 2024-07-29 17:47:57 +05:00
856dce26c9 add filesystem disk for force saved files 2024-07-29 17:46:09 +05:00
06be29e983 show file upload errors using jqxhr responsejson property 2024-07-29 17:40:57 +05:00
110cbdefab upgrade docs docker image to 8.1 version 2024-07-29 17:39:31 +05:00
5ba55833db rename proxy docker image 2024-07-29 17:38:28 +05:00
4d424a2ee6 increase php upload file size 2024-07-29 17:35:50 +05:00
6b47993786 add pdf icons 2024-07-29 17:32:32 +05:00
cabb56cbbb move resources/css to public/css 2024-07-29 17:31:04 +05:00
681912f544 move resources/images to public/images 2024-07-29 17:29:34 +05:00
8d7767e4a7 1.10.0 2024-07-25 09:50:41 +03:00
6d4484cbe5 reorder changelog 2024-07-25 09:47:58 +03:00
4f6a0d554c Merge remote-tracking branch 'remotes/origin/master' into develop 2024-07-25 09:43:50 +03:00
a3430f7aec Merge pull request #580 from ONLYOFFICE/pdf-form
PDF-forms
2024-07-24 15:01:55 +03:00
aaea7e4cb8 feat(java-spring): permission submitForm (John Smith: true) 2024-07-24 14:20:57 +03:00
5fd90b295f Merge pull request #581 from ONLYOFFICE/fix/nodejs-conversion-error
Fix/nodejs conversion error
2024-07-19 12:35:01 +03:00
9fda921107 nodejs: display error message if it is the only param in convert response 2024-07-19 13:44:41 +05:00
b55c19f886 nodejs: add tag for displaying conversion error message 2024-07-19 13:42:08 +05:00
d0b1cc9900 feat(java): creating and editing pdf instead docxf 2024-07-16 16:21:15 +07:00
16580f4a00 feat(csharp): creating and editing pdf instead docxf 2024-07-16 15:35:12 +07:00
2f4b28343c feat(csharp-mvc): creating and editing pdf instead docxf 2024-07-16 15:10:17 +07:00
0d37b7ef7c feat(java-spring): creating and editing pdf instead docxf 2024-07-15 17:41:03 +07:00
597b3dfac7 feat(php): creating and editing pdf instead docxf 2024-07-15 17:41:02 +07:00
1936274a13 feat(python): creating and editing pdf instead docxf 2024-07-15 17:41:02 +07:00
b7837f8dcb feat(ruby): creating and editing pdf instead docxf 2024-07-15 17:40:31 +07:00
0b03376e0e fix: incorrect files/saveas url 2024-07-08 17:47:38 +05:00
1e3c48ddad feat: implement forgotten files page 2024-07-08 17:46:34 +05:00
dbe896c1c1 feature: implement editor saveas 2024-07-08 17:43:34 +05:00
afca8b2eea validate direct url 2024-07-08 17:39:09 +05:00
7fa9444201 add jquery ui 2024-07-08 17:37:46 +05:00
e088efe744 fix link in readme 2024-07-02 11:02:08 +03:00
f3a56acae9 reorder changelog 2024-07-02 10:41:07 +03:00
b937d304d7 nodejs: form type is pdf 2024-07-02 10:39:15 +03:00
4fb7062b95 Merge remote-tracking branch 'remotes/origin/hotfix/v8.1.1' into develop
# Conflicts:
#	web/documentserver-example/nodejs/app.js
2024-07-02 10:27:41 +03:00
b36388124d Merge pull request #579 from ONLYOFFICE/release/v1.9.0
Release/1.9.0
2024-07-02 10:20:10 +03:00
2c6c5e3a1f nodejs: saving deleted file (Fix Bug 68926) 2024-07-01 12:46:30 +03:00
3f0c1d51d3 publish node service port 2024-07-01 13:08:34 +05:00
1c80079e1d create package-lock 2024-07-01 12:57:52 +05:00
4b50cb7ab6 composer: use firebase/php-jwt 2024-07-01 12:48:57 +05:00
b86e9d6b60 remove User class 2024-07-01 12:47:36 +05:00
6db9bdbc4e bind local storage to interface 2024-07-01 12:46:13 +05:00
30a3365bc9 implement local storage 2024-07-01 12:45:41 +05:00
4554a630bf rename and change class usage 2024-07-01 12:45:18 +05:00
3593ea6e13 pass client ip to storage 2024-07-01 12:43:19 +05:00
4b05cc0c1b rename Document to DocumentStorage 2024-07-01 12:42:21 +05:00
6a428cd861 handle jwt tokens in middleware 2024-07-01 12:41:19 +05:00
b7ac2f7984 skip editor/track route csrf validation 2024-07-01 12:40:24 +05:00
3e30d34159 add file disks for files and formats 2024-07-01 12:39:41 +05:00
3b12f3bd53 create command request 2024-07-01 12:38:42 +05:00
4d1e6e5333 rename Document to DocumentServer 2024-07-01 12:36:54 +05:00
ed1f5503d2 format api implementation 2024-07-01 12:36:07 +05:00
f8390113e5 change conversion classes namespace 2024-07-01 12:33:53 +05:00
12732cab10 create editor key helper 2024-07-01 12:32:26 +05:00
7471f80d26 add function for parsing url origin 2024-07-01 12:31:23 +05:00
a199018adf create command service error class 2024-07-01 12:30:23 +05:00
27e090fe3b implement document server class 2024-07-01 12:29:39 +05:00
d8585f4499 add template path 2024-07-01 12:27:47 +05:00
9c61dbab16 create storage interface 2024-07-01 12:25:09 +05:00
faa9595e4f implement editor 2024-07-01 12:23:39 +05:00
6418d924e3 replace Storage class with DocumentStorage 2024-07-01 12:21:28 +05:00
ed3aa3485e nodejs: search referenceData for current user 2024-06-24 14:06:02 +03:00
6f12493e59 nodejs: check path in referenceData at first 2024-06-24 13:58:12 +03:00
22f98fda0f nodejs: search referenceData for current user 2024-06-24 13:52:00 +03:00
b91772e7d4 Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop 2024-06-24 12:34:59 +03:00
052f73e47f nodejs: formats v2.0.0 2024-06-24 12:32:45 +03:00
55b062d64a Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop 2024-06-20 13:26:36 +03:00
b06c872a4c Merge pull request #578 from ONLYOFFICE/fix/python-linter
update and fixate flake8 version in python example
2024-06-20 13:23:45 +03:00
ce846f489b build(python): update and fixate flake8 version 2024-06-20 13:20:27 +03:00
7a5fdc9821 Merge pull request #542 from ONLYOFFICE/fix/compose-prod ( Fix Bug 68727 )
Fix/compose prod
2024-06-20 11:36:46 +03:00
fe50a6f1ab fix(python): starting server on localhost in prod container 2024-06-20 11:34:47 +03:00
8268b633c7 fix(ruby): installing dev dependencies in prod container 2024-06-20 11:34:46 +03:00
1a46d063fd createurl helpers 2024-06-18 15:34:02 +05:00
6e08c9d898 create path helper 2024-06-18 15:33:30 +05:00
3ca3dfa763 create document service class 2024-06-18 15:32:57 +05:00
3f3ea583a7 create conversion exceptions 2024-06-18 15:31:13 +05:00
9d3971c10d add jquery 2024-06-18 15:29:27 +05:00
06b2459ae4 implement file upload 2024-06-18 15:27:08 +05:00
b70eefe10f implement file delete 2024-06-18 15:25:39 +05:00
81d9336a3e create jwt class 2024-06-18 15:21:51 +05:00
bd5ab3d7e9 add firebase/jwt to composer file 2024-06-18 15:21:31 +05:00
ba4c10d326 bind local file repository to file repository interface 2024-06-18 13:55:50 +05:00
13bd01c73e create index controller 2024-06-18 13:54:57 +05:00
55e0ad536f create storage class 2024-06-18 13:53:31 +05:00
49e2cfbf48 create local file repository 2024-06-18 13:52:43 +05:00
692926b0e4 create formats class 2024-06-18 13:51:32 +05:00
9cc2859c1d create languages class 2024-06-18 13:51:03 +05:00
040962ae28 create users class 2024-06-18 13:50:32 +05:00
eed9fd3098 create file repository interface 2024-06-18 13:49:19 +05:00
5d3bcfed8f create file entity 2024-06-18 13:48:29 +05:00
a9eaad4cfb create format entity 2024-06-18 13:47:57 +05:00
6b10a17ee7 create user entity 2024-06-18 13:47:21 +05:00
764d87eecd create autoload config for onlyoffice directory 2024-06-18 13:44:52 +05:00
f5a8ca367b create route to main page 2024-06-18 13:40:45 +05:00
940d759e36 configure vite 2024-06-18 13:38:27 +05:00
1cdcf6c0a8 create config file for static assets 2024-06-18 13:36:03 +05:00
7a1f6a471b add images 2024-06-18 13:34:40 +05:00
f161da3879 add index page js files 2024-06-18 13:33:30 +05:00
d525fa6611 add style files for index page 2024-06-18 13:32:29 +05:00
f0fd90f115 create main page view 2024-06-18 13:31:28 +05:00
f45b6f60d4 bind config class as singleton 2024-06-18 13:24:51 +05:00
5974a62fd2 Merge pull request #570 from ONLYOFFICE/feature/mobile-design
Feature/mobile design
2024-06-18 09:00:46 +03:00
56540846f1 Merge pull request #577 from ONLYOFFICE/fix/lint-ruby-workflow
fix(ruby): bundle install in linter workflow
2024-06-18 09:00:26 +03:00
ceecd1af09 php-laravel: create config class 2024-06-17 18:02:24 +05:00
54210428ef fix(ruby): bundle install in linter workflow 2024-06-17 14:11:20 +07:00
458920771c Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-design 2024-06-14 13:39:30 +03:00
dd189175a1 Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop 2024-06-14 13:38:57 +03:00
93c723eb47 nodejs: fix lint 2024-06-14 13:37:33 +03:00
d564e78b2c Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-design 2024-06-14 13:31:31 +03:00
27c01046af Merge pull request #576 from ONLYOFFICE/fix/csharp-mvc-missing-formats
fix(csharp-mvc): add missing formats js file to scripts bundle
2024-06-14 13:30:37 +03:00
aa7b6aae8b fix(csharp-mvc): add missing formats js file to scripts bundle 2024-06-14 14:50:24 +05:00
be58fa39b2 Merge pull request #575 from ONLYOFFICE/fix/ruby-linter
ruby lint fix
2024-06-14 11:15:43 +03:00
6c827aa8bc Merge pull request #574 from ONLYOFFICE/feature/ruby-gemfile-update
ruby gemfile update
2024-06-14 11:10:51 +03:00
da1111a867 Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop 2024-06-14 11:04:40 +03:00
8cc0580310 nodejs: fix comment collumn (146d26c868) 2024-06-14 11:03:58 +03:00
d4b82453d2 fix(ruby): call super without arguments when signature is identical 2024-06-13 17:48:08 +07:00
3420b20c2f build(ruby): update some dependencies 2024-06-13 17:28:21 +07:00
cfe6db3fd4 Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop 2024-06-07 12:18:37 +03:00
8c44f4a653 nodejs: switch back templates branch 2024-06-07 12:18:01 +03:00
0561a1068c Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-06-07 09:46:26 +03:00
d6309505ff 1.9.0 2024-06-07 09:43:21 +03:00
2308abaf80 Merge branch 'feature/editnew-from-wopi-discovery-pdf' into develop 2024-06-07 08:50:45 +03:00
95e7aff092 Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/wopiIndex.ejs
2024-06-07 08:49:20 +03:00
8207aec7a5 sr-Cyrl-RS skin language
# Conflicts:
#	CHANGELOG.md
2024-06-06 17:26:17 +03:00
a5fa0096e8 en-GB skin language
# Conflicts:
#	CHANGELOG.md
2024-06-06 17:25:51 +03:00
0c886264ba fix sr-Latn-RS
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/csharp/settings.config
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/java/src/main/resources/settings.properties
2024-06-06 17:25:23 +03:00
871b08018f filling to changelog 2024-06-06 14:53:00 +03:00
88220ddf7c nodejs: upade pdf icon (Fix Bug 68355) 2024-06-05 10:01:03 +03:00
39edf9f364 feat(go): editor template, config and events update 2024-05-29 17:20:50 +07:00
6fd44a3f4c feat(go): restore endpoint 2024-05-28 18:00:43 +07:00
cfd010cc99 sr-Cyrl-RS skin language 2024-05-27 13:22:33 +03:00
02b50f7a36 feat(go): historyObj endpoint 2024-05-27 16:14:49 +07:00
de33a42391 fix(go): now history of file without changes is not null 2024-05-27 16:13:39 +07:00
03fa66fbce build docker compose 2024-05-27 13:09:37 +05:00
0817960acd install laravel 2024-05-27 13:08:26 +05:00
109ebcf45d feat(go): rename endpoint 2024-05-27 15:05:27 +07:00
8e76c7ad61 feat(go): add command request manager 2024-05-27 15:04:44 +07:00
bea25acd69 feat(go): create endpoint post method 2024-05-23 16:18:51 +07:00
075ad0ee1f feat(go): convey users and insert data in editor template 2024-05-23 14:12:43 +07:00
e933e918dd Merge pull request #571 from ONLYOFFICE/fix/php-check-fileid
fix(php): check if fileid parameter is present and not empty
2024-05-22 14:16:57 +03:00
7c60aeb26b feat(go): files edpoint 2024-05-22 15:36:57 +07:00
61fb573a4b feat(go): reference endpoint 2024-05-22 13:18:29 +07:00
3d11876f59 fix(php): check if fileid parameter is present and not empty 2024-05-21 17:55:01 +05:00
259c121707 feat(csharp): implement design for mobile devices 2024-05-21 13:11:01 +05:00
083de6993c feat(csharp-mvc): implement design for mobile devices 2024-05-21 13:10:30 +05:00
982a853058 fix(go): posExt without dot 2024-05-21 14:05:22 +07:00
b162076378 feat(java-spring): implement design for mobile devices 2024-05-20 19:13:47 +05:00
a37fee7192 feat(java): implement design for mobile devices 2024-05-20 19:09:26 +05:00
96bc425eb5 feat(ruby): implement design for mobile devices 2024-05-20 19:07:00 +05:00
9054e4919d feat(python): implement design for mobile devices 2024-05-20 19:05:42 +05:00
e573bb4cc4 feat(php): implement design for mobile devices 2024-05-20 19:04:18 +05:00
f568f7ae18 feat(nodejs): implement design for mobile devices 2024-05-20 19:01:26 +05:00
4238de80cc nodejs: update pdf icon 2024-05-20 14:10:03 +03:00
146d26c868 nodejs: comment only is not for pdf 2024-05-20 13:56:06 +03:00
ecb520e4cb nodejs: submitting in embedded mode 2024-05-20 13:44:54 +03:00
61f20f5ddd feat(go): update users 2024-05-16 16:39:45 +07:00
efac5b9d70 Merge pull request #561 from ONLYOFFICE/feature/forgotten-page
Feature/forgotten page
2024-05-15 12:52:47 +03:00
9f20706205 forgotten to changelog 2024-05-15 12:48:30 +03:00
f48734b235 nodejs: disable forgotten by default 2024-05-15 12:46:21 +03:00
3b4b1b3684 Merge pull request #568 from ONLYOFFICE/fix/java-spring-filename-check
fix(java-spring): check for null value first
2024-05-14 15:29:07 +03:00
0280503110 fix(java-spring): check for null value first 2024-05-14 15:58:48 +05:00
057d15e00d Merge pull request #563 from ONLYOFFICE/fix/zip-upload
fix(nodejs): uploading only files with actions. Fix Bug 67497
2024-05-14 13:43:48 +03:00
9a22cd66d9 refactor(java-spring): use sdk for fetching and deleting forgotten files 2024-05-14 14:10:14 +05:00
67137ad6e1 fix(nodejs): ignore zip from saveAs 2024-05-14 15:38:48 +07:00
1d3ae82f1c Merge branch 'develop' into feature/forgotten-page 2024-05-14 13:11:13 +05:00
c3a5c15781 feat(go): add document-formats submodule 2024-05-14 15:02:42 +07:00
a512a0ed26 Merge pull request #566 from ONLYOFFICE/docs/java-spring-license
docs(java-spring): update 3rd-Party.license file
2024-05-13 14:38:38 +03:00
27a9817f46 update license file 2024-05-13 14:35:12 +03:00
354b500077 Merge branch 'develop' into feature/forgotten-page 2024-05-13 14:02:51 +05:00
7852934047 docs(java-spring): update 3rd-Party.license file 2024-05-08 15:39:57 +03:00
06482fa72c Merge pull request #555 from ONLYOFFICE/feature/editnew-from-wopi-discovery
Creating only files with editnew in wopi discovery
2024-05-08 12:00:04 +03:00
9efc5237aa nodejs: fix creation pdf in wopi 2024-05-08 11:56:04 +03:00
4fa2bb8459 Merge remote-tracking branch 'remotes/origin/develop' into feature/editnew-from-wopi-discovery 2024-05-08 11:45:27 +03:00
38581960f3 Merge pull request #564 from ONLYOFFICE/fix/makefile-compose-migration
makefile docker compose V2 migration. Fix Bug 67214
2024-05-08 11:43:18 +03:00
43bdef50a1 java-spring: using sdk to changelog 2024-05-08 11:03:47 +03:00
4c71114177 nodejs: revert formats (fix 729065fed0) 2024-05-08 11:03:35 +03:00
5eb6171954 Merge pull request #557 from ONLYOFFICE/feature/docs-integration-sdk
Feature/docs integration sdk
2024-05-08 10:45:01 +03:00
7620eb1f8e Merge branch 'develop' into feature/golang-update 2024-05-07 14:28:46 +07:00
26782137e7 csharp: remove unnecessary angel bracket 2024-05-02 13:52:49 +05:00
8680ed5970 php: catch and log commandrequest errors 2024-04-25 20:03:28 +05:00
af39abbf00 php: throw exception if there is connection error or command service returns error code other than 0 2024-04-25 20:01:16 +05:00
dec31c2f59 python: log error 2024-04-25 19:40:48 +05:00
9ae6252e53 feat(python): raise error if command service returns error code other than 0 2024-04-25 19:37:27 +05:00
3c84ab6633 makefile docker compose V2 migration. Fix Bug 67214 2024-04-25 15:11:39 +07:00
7cffe4cee9 fix(nodejs): uploading only files with actions. Fix Bug 67497 2024-04-24 18:04:24 +07:00
107459cf19 en-GB skin language 2024-04-24 13:22:57 +03:00
a9b63ef903 build(nodejs): bump formidable from 1.2.2 to 3.2.4 2024-04-24 15:24:06 +07:00
e863fd60f4 fix(ruby): show empty table in forgotten files page if error occurs 2024-04-23 23:33:45 +05:00
172a501247 feat(ruby): raise error if command service returns error code other than 0 2024-04-23 23:30:27 +05:00
e487a89203 fix(csharp-mvc): show empty table in forgotten files page if error occurs 2024-04-23 18:03:23 +05:00
aeb2394b39 feat(csharp-mvc): control access to forgotten page using config variable 2024-04-23 17:55:22 +05:00
5c804c1e1e feat(csharp-mvc): display message in error template 2024-04-23 17:54:27 +05:00
6b319f1dc1 fix(csharp): show empty table in forgotten files page if error occurs 2024-04-23 17:47:47 +05:00
4a029f8f40 feat(csharp): control access to forgotten page using config variable 2024-04-23 17:42:49 +05:00
26673ec668 docxf, oform as pdf documentType 2024-04-23 11:26:16 +03:00
030cf91c65 fix(nodejs): show empty forgotten files list if error occurs 2024-04-23 00:02:55 +05:00
c60d2236d5 fix: linter offences 2024-04-22 23:30:24 +05:00
0a181bd04e feat(java-spring): control access to forgotten page using config variable 2024-04-22 23:24:56 +05:00
3fc658b0f8 feat(java): control access to forgotten page using config variable 2024-04-22 22:52:06 +05:00
403c2e2d8c feat(ruby): control access to forgotten page using config variable 2024-04-22 18:11:00 +05:00
beb831173d feat(python): control access to forgotten page using config variable 2024-04-22 17:30:09 +05:00
06a8668107 feat(php): control access to forgotten page using config variable 2024-04-22 16:40:32 +05:00
a722b142bb feat(nodejs): control access to forgotten page using config variable 2024-04-22 15:47:58 +05:00
39a61835ea fix main panel overflow in forgotten page 2024-04-22 13:44:13 +05:00
df3e018e3c fix link on logo 2024-04-22 12:37:03 +05:00
0f32feb1b9 csharp-mvc: fix link on logo 2024-04-19 13:47:05 +03:00
d61ebb27ae csharp-mvc: include files to project 2024-04-19 13:46:15 +03:00
e86118a56f csharp: fix link on logo 2024-04-19 13:43:45 +03:00
096edcfa66 csharp: include files to project 2024-04-19 13:43:15 +03:00
c5c1196a6f nodejs: copyright 2024 2024-04-19 13:24:29 +03:00
844e723387 save as for pdf 2024-04-19 12:29:47 +03:00
57087f0465 fix(nodejs): type confusion through parameter tampering 2024-04-17 22:23:22 +05:00
86339c8ea6 fix(php): fix linter offences 2024-04-17 18:33:16 +05:00
528cc5538e refactor(php): handle commandrequest failure 2024-04-17 18:31:35 +05:00
2880604546 fix(nodejs): fix linter offences 2024-04-17 18:06:41 +05:00
61d7a8003f refactor(nodejs): return correct response statuses 2024-04-17 18:04:29 +05:00
9e52d6d8b1 fix(nodejs): fix responsive design issues 2024-04-17 18:00:03 +05:00
6565fd2178 refactor(nodejs): rewrite delete event using dom and fetch and place it in separate file 2024-04-17 17:52:39 +05:00
f12fc29a57 feature(nodejs): add links to navbar 2024-04-17 17:44:55 +05:00
cd465a633e fix: responsive header image in forgotten files page 2024-04-17 16:36:28 +05:00
5fc22799e1 fix: fix table content overflow 2024-04-17 16:31:04 +05:00
59057a5905 feature(csharp-mvc): add navbar 2024-04-17 13:33:26 +05:00
8be3cfd66a feature(csharp): add navbar 2024-04-17 13:29:38 +05:00
b1167516d4 feature(csharp-mvc): forgotten files page 2024-04-17 13:24:01 +05:00
2f2ef0e65f feature(csharp): forgotten files page 2024-04-17 13:14:40 +05:00
33aba9a404 feature(java-spring): add navbar 2024-04-16 23:32:32 +05:00
82003763fa feature(java): add navbar 2024-04-16 23:19:34 +05:00
ea41130297 feature(ruby): add navbar 2024-04-16 22:57:49 +05:00
f909c31250 feature(python): add navbar 2024-04-16 22:45:39 +05:00
352b4c0ded feature(php): add navbar 2024-04-16 22:32:16 +05:00
7ec588280b feature(java-spring): forgotten files page 2024-04-16 19:15:30 +05:00
d43e4a98df feature(java): forgotten files page 2024-04-16 17:21:27 +05:00
461122a052 feature(ruby): forgotten files page 2024-04-16 13:31:54 +05:00
d1a1127b63 feature(python): forgotten files page 2024-04-16 13:02:55 +05:00
4263175871 refactor(python): return response in commandrequest method 2024-04-16 12:52:58 +05:00
98b93b3bc5 feature(php): forgotten files page 2024-04-16 00:38:07 +05:00
e32438218f refactor(java-spring): return response in commandrequest method 2024-04-15 19:11:10 +05:00
613d5e30a9 refactor(java): return response in commandrequest method 2024-04-15 19:09:55 +05:00
ccaf607cef refactor(csharp-mvc): return response in commandrequest method 2024-04-15 19:08:55 +05:00
837e63f372 refactor(csharp): return response in commandrequest method 2024-04-15 19:07:30 +05:00
a2a4c2b32f Merge branch 'develop' into feature/forgotten-page 2024-04-15 18:45:39 +05:00
fa303e9bf2 switching from filling to editing 2024-04-15 16:32:44 +03:00
e89eee7e28 Merge pull request #560 from ONLYOFFICE/bump-some-gems
build(ruby): bump gem versions as directed by dependabot
2024-04-09 11:20:35 +03:00
6a4b79fb54 build(ruby): bump gem versions as directed by dependabot 2024-04-05 17:39:48 +07:00
b1dd965590 Merge pull request #559 from ONLYOFFICE/fix/nodejs-dependencies-overrides
build(nodejs): add overrides in package.json
2024-04-05 10:25:35 +03:00
208bf086d8 Merge pull request #558 from ONLYOFFICE/feature/nodejs-navbar-update
feature/nodejs navbar update
2024-04-05 10:18:19 +03:00
ebb1179190 build(nodejs): add overrides in package.json 2024-04-04 17:32:09 +07:00
3375315cc0 feature(nodejs): show navigation bar at top even if there are no files in user directory 2024-04-04 13:08:47 +05:00
2bed0f0bb7 build: delete com.inversoft:prime-jwt dependency 2024-04-03 15:44:53 +03:00
3570f189a0 build: ossrh snapshot repository 2024-04-03 15:17:16 +03:00
afd5a88b1d Merge remote-tracking branch 'remotes/origin/develop' into feature/docs-integration-sdk
# Conflicts:
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java
2024-04-03 15:16:19 +03:00
a070b6e82b nodejs: rename back (eda1876f59) 2024-04-03 14:27:57 +03:00
43d260cd7a Merge pull request #534 from ONLYOFFICE/feature/nodejs-forced-conversion
Feature/nodejs forced conversion
2024-04-03 14:05:24 +03:00
14bb9fc8a4 Merge pull request #556 from ONLYOFFICE/fix/wopi-mobile-default-action
fix(nodejs): mobileEdit default action for mobile wopi page. Fix Bug 65920
2024-04-03 13:07:02 +03:00
57ca15153f Merge pull request #551 from ONLYOFFICE/feature/fetching-formats
Feature/fetching formats
2024-04-03 12:31:53 +03:00
bbde4dc87b Merge pull request #525 from ONLYOFFICE/nodejs-update-dependencies
build(nodejs): updated dependencies
2024-04-03 12:19:33 +03:00
a0ce620f84 build: use com.onlyoffice:docs-integration-sdk from maven 2024-04-02 16:36:50 +03:00
5b46195f72 fix(nodejs): mobileEdit default action for mobile wopi page. Fix Bug 65920 2024-04-02 12:55:33 +07:00
81c94c9fbd refactor(nodejs): load formats script and remove redundant variables 2024-04-01 12:24:14 +05:00
cc3c640868 refactor: merge format and format-manager files into formats file 2024-04-01 12:21:18 +05:00
e3c82eed09 feat(nodejs): creating only files with editnew in wopi discovery 2024-04-01 12:10:26 +07:00
1df3c046ee docs: license 2024 2024-03-29 10:27:50 +03:00
1f2623dc07 refactor: settings for connect doc-server to application.properties 2024-03-29 10:19:39 +03:00
317018df5b fix: convert file after upload 2024-03-29 09:54:19 +03:00
729065fed0 Merge branch 'develop' into feature/docs-integration-sdk
# Conflicts:
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/Callback.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/CallbackHandler.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/Status.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/EditCallback.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/ForcesaveCallback.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/SaveCallback.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DocumentManager.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/DefaultJwtManager.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/JwtManager.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/template/SampleTemplateManager.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/template/TemplateManager.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/AbstractModel.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/Format.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Embedded.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Goback.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Info.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/ConvertErrorType.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Mode.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/ToolbarDocked.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Type.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/CommentGroup.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Document.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/EditorConfig.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/FileModel.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Permission.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/ReferenceData.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Template.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/SSLUtils.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/FileUtility.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultFormatService.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultServiceConverter.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/ServiceConverter.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Action.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ChangesHistory.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ChangesUser.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Convert.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ConvertedData.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/History.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/AbstractMapper.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/Mapper.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/PermissionsMapper.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/mappers/UsersMapper.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/Configurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/CustomizationConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/DocumentConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/EditorConfigConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/EmbeddedConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/FileConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEditorConfigConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultEmbeddedConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultFileConfigurer.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultDocumentWrapper.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultEmbeddedWrapper.java
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java
#	web/documentserver-example/java-spring/src/main/resources/assets/document-formats
2024-03-28 17:17:16 +03:00
248595472d build: docs-integration-sdk-1.1.3-SNAPSHOT.jar 2024-03-28 15:19:18 +03:00
ead7e8de06 fix: condition upload file 2024-03-28 15:18:43 +03:00
20e6664a6b nodejs: absolute url in request to discovery (1e72167e7d)
Revert "nodejs: absolute host is not needed with urllib" (2460f2c7ac)
2024-03-28 13:35:50 +03:00
61af52a534 nodejs: fix favicon on wopi action 2024-03-28 10:53:12 +03:00
6236f90a50 Merge pull request #554 from ONLYOFFICE/feature/for-bug-59054
Feature/for bug 59054
2024-03-27 13:00:27 +03:00
5118352714 nodejs: debug mobile editors opening (Fix Bug 59054) 2024-03-27 12:57:58 +03:00
aa5a660001 nodejs: fix wopi editor size (Fix Bug 59054) 2024-03-27 12:57:52 +03:00
bf1f987333 nodejs: wopi refactoring 2024-03-27 12:56:08 +03:00
f1f834fb0c refactor: create and use new method for finding formats by extension 2024-03-26 17:57:52 +05:00
53c3e97b5c fix(nodejs): linter offence 2024-03-25 14:25:03 +05:00
eda1876f59 refactor(nodejs): rename convext variable and remove redundant internalext variable 2024-03-25 14:18:55 +05:00
64eab6c4a2 refactor(nodejs): add flag for keeping original file and replace conditional expression with it 2024-03-25 14:09:36 +05:00
acb9a0e4c9 refactor(java-spring): add formatslist dto object and replace jsonobject with it 2024-03-25 12:51:13 +05:00
909f638a92 Merge pull request #552 from ONLYOFFICE/fix/nodejs-wopi-putfile
fix(nodejs): handle document creation in putFile. Fix Bug 66817
2024-03-22 10:02:57 +03:00
c55142bd73 Merge remote-tracking branch 'remotes/origin/feature/create-pdf' into release/v8.1.0 2024-03-21 16:06:24 +03:00
6c03b145e2 nodejs: editing pdf form 2024-03-21 15:24:47 +03:00
15e09fece2 nodejs: filling by default if possible 2024-03-21 15:23:57 +03:00
abf382a03b nodejs: creating pdf form 2024-03-21 15:03:13 +03:00
6d28e3f8d8 Merge branch 'release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-03-21 14:23:41 +03:00
1b8f60d5dd nodejs: update formats 2024-03-21 14:21:29 +03:00
0414319893 nodejs: fill permission in embedded mode 2024-03-21 14:05:31 +03:00
12ad0d9e7e fix(nodejs): handle document creation in putFile. Fix Bug 66817 2024-03-21 17:18:58 +07:00
f3b35a878c refactor(java-spring): move formats method to indexcontroller and change return type to responseentity 2024-03-21 13:23:31 +05:00
c712f596e1 Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-03-20 12:52:55 +03:00
ad39fb7c19 nodejs: wopi formsubmit icon
# Conflicts:
#	CHANGELOG.md
2024-03-20 12:51:24 +03:00
7d2eb086ce Merge pull request #545 from ONLYOFFICE/feature/delete-all-files
Feature/delete all files
2024-03-20 11:01:40 +03:00
0a61708f67 Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
#	CHANGELOG.md
2024-03-20 10:58:41 +03:00
389198aec6 Merge pull request #544 from ONLYOFFICE/feature/auto-conversion-error
Feature/auto conversion error
2024-03-20 10:02:53 +03:00
0d302ee8f6 nodejs: error message when error:1 2024-03-19 18:06:43 +03:00
d3a548bf3f fix(ruby): conversion error code to integer 2024-03-19 17:19:48 +07:00
fadae60e89 fix: linter offenses 2024-03-19 13:43:17 +05:00
426b15b8f1 Merge remote-tracking branch 'origin/develop' into feature/fetching-formats 2024-03-19 13:01:48 +05:00
601146c847 refactor(nodejs): change formats retrieval method on frontend 2024-03-19 12:59:54 +05:00
c4980c19e7 Revert "docxf and oform since v7.0"
This reverts commit beb9885b03.

# Conflicts:
#	web/documentserver-example/php/doceditor.php
2024-03-18 18:24:47 +03:00
0bfb036be6 refactor(csharp-mvc): change formats retrieval method on frontend 2024-03-18 18:03:10 +05:00
88b36049d2 refactor(csharp): change formats retrieval method on frontend 2024-03-18 18:02:29 +05:00
f1a1ec15ad Merge branch 'release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/helpers/users.js
2024-03-18 14:38:55 +03:00
495ba9814f nodejs: close editor
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/helpers/users.js
2024-03-18 14:35:26 +03:00
558365325c nodejs: format max length
# Conflicts:
#	web/documentserver-example/nodejs/helpers/users.js
2024-03-18 14:34:52 +03:00
683f1d33c4 nodejs: close editor 2024-03-18 14:30:25 +03:00
e8c98ba12a nodejs: format max length 2024-03-18 14:28:30 +03:00
e389cf41b8 fix(ruby): linter offence 2024-03-18 16:27:59 +05:00
80291baa40 goback: change state for users (408d80fff6) 2024-03-18 14:21:12 +03:00
b9113f93f6 fix: linter offenses 2024-03-18 16:03:00 +05:00
af778a8636 fix(ruby): linter offenses 2024-03-18 15:26:22 +05:00
47f4f022aa Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
#	CHANGELOG.md
2024-03-15 16:48:58 +03:00
b2202111ac fix changelog 2024-03-15 16:47:29 +03:00
1da215b1eb Merge remote-tracking branch 'remotes/origin/develop' into feature/auto-conversion-error
# Conflicts:
#	CHANGELOG.md
2024-03-15 16:46:37 +03:00
8c8d14b48c refactor(java-spring): change formats retrieval method on frontend 2024-03-15 15:50:14 +05:00
5217a64e83 refactor(java): change formats retrieval method on frontend 2024-03-15 15:38:14 +05:00
456789191d build(nodejs): returned some dependencies versions with breaking changes 2024-03-15 17:33:00 +07:00
e1e9efa305 refactor(ruby): change formats retrieval method on frontend 2024-03-15 15:29:58 +05:00
a3016f3f96 Merge remote-tracking branch 'remotes/origin/master' into develop 2024-03-15 13:18:37 +03:00
333981cdad Merge pull request #549 from ONLYOFFICE/release/1.8.0
Release/1.8.0
2024-03-15 13:02:53 +03:00
cee60a340a nodejs: code alert 177 (e85cb5137b) 2024-03-15 12:55:59 +03:00
6c09b3f62a nodejs: wopi formsubmit icon 2024-03-15 11:18:45 +03:00
4b7ba35f83 nodejs: send email and image for protect request 2024-03-15 11:06:48 +03:00
abab30176f refactor(python): change formats retrieval method on frontend 2024-03-14 19:11:37 +05:00
1abcf78b85 refactor(php): change formats retrieval method on frontend 2024-03-14 19:08:12 +05:00
a952858ab8 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-03-14 15:07:47 +03:00
65ff78fba7 Merge pull request #548 from ONLYOFFICE/fix/ruby-conversion-progress
fix(ruby): conversion percent type validation. Fix Bug 66869
2024-03-14 15:07:11 +03:00
717996af87 Merge pull request #547 from ONLYOFFICE/fix/ruby-historyobj
fix(ruby): historyobj method. Fix Bug 66862
2024-03-14 15:06:45 +03:00
66389fe69c fix(ruby): conversion percent type validation. Fix Bug 66869 2024-03-14 17:24:02 +07:00
a63d8d4284 fix(ruby): previous in history data 2024-03-14 16:30:22 +07:00
ed39928d1f Merge pull request #546 from ONLYOFFICE/fix/ruby-saveas-url-in-docker
fix(ruby): replacing file_url host in saveas. Fix Bug 66874
2024-03-14 11:13:50 +03:00
5bc7ffde73 fix(ruby): historyobj method. Fix Bug 66862 2024-03-13 18:27:58 +07:00
5258fd0674 feat(csharp-mvc): handling auto-conversion error(-9) 2024-03-13 15:39:42 +05:00
ca274bc465 feat(csharp): handling auto-conversion error(-9) 2024-03-13 15:39:07 +05:00
b1d66e16a5 feat(java-spring): handling auto-conversion error(-9) 2024-03-13 15:38:24 +05:00
359cda0f67 feat(java): handling auto-conversion error(-9) 2024-03-13 15:37:13 +05:00
24a3441b1e feat(ruby): handling auto-conversion error(-9) 2024-03-13 15:36:13 +05:00
c6eff10be1 fix(ruby): replacing file_url host in saveas. Fix Bug 66874 2024-03-13 17:36:06 +07:00
a7fca1a53b feat(python): handling auto-conversion error(-9) 2024-03-13 15:35:06 +05:00
5b6a2ba318 refactor(csharp): remove console.log 2024-03-13 13:44:47 +05:00
bb4aed6efb fix(python): uncontrolled data used in path expression 2024-03-13 13:38:53 +05:00
01d8c0acde Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
#	web/documentserver-example/ruby/Gemfile.lock
2024-03-12 11:22:07 +03:00
8fdbdb926b Merge pull request #543 from ONLYOFFICE/fix/ruby-gem-conflict
fix(ruby): resolved gem conflict. Fix Bug 66514
2024-03-12 11:21:04 +03:00
31cf6ca486 Merge pull request #529 from ONLYOFFICE/fix/ruby-gemfile-lock
build(ruby): updated gemfile.lock to 0 vulnerabilities
2024-03-12 11:20:10 +03:00
fbe24234d2 refactor(python): create method for deleting user folder and call it inside remove http method 2024-03-12 12:15:22 +05:00
ac894171fb changelog: delete all files 2024-03-12 11:23:53 +05:00
0174d2a465 fix(ruby): resolved gem conflict. Fix Bug 66514 2024-03-11 18:08:26 +07:00
0f000c1457 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-03-11 13:28:12 +03:00
97b0cdd042 fix(ruby): nginx body size 2024-03-11 13:26:29 +03:00
143c0a095f fix(python): nginx body size 2024-03-11 13:25:05 +03:00
04c004acdb fix(php): nginx body size 2024-03-11 13:25:04 +03:00
1699dc22b5 nodejs: fix rename var (9048082cb7) 2024-03-09 16:54:56 +03:00
cc62ff8a61 Merge pull request #531 from ONLYOFFICE/feature/php-forced-conversion
Feature/php forced conversion
2024-03-07 15:59:54 +03:00
fd21292dbd refactor(nodejs): change parameter name and remove redundant checking 2024-03-07 16:24:51 +05:00
d43294bd8a feat(csharp-mvc): implement delete all files method 2024-03-07 15:56:02 +05:00
81f5bdd528 feat(csharp): implement delete all files method 2024-03-07 15:42:23 +05:00
c1da8e14c3 feat(java-spring): implement delete all files method 2024-03-06 14:41:29 +05:00
767b5588ab feat(java): implement delete all files method 2024-03-06 14:27:21 +05:00
8858c3c256 feat(ruby): implement delete all files method 2024-03-06 14:24:52 +05:00
89f1c18d06 feat(python): implement delete all files method 2024-03-06 13:52:06 +05:00
81ad7f7a64 feat(php): implement delete all files method 2024-03-06 13:42:41 +05:00
23ba4ff5b3 Merge pull request #541 from ONLYOFFICE/feature/fix-domain
Feature/fix domain
2024-03-06 09:32:36 +03:00
423233e93f update submodule 2024-03-05 16:42:41 +03:00
5f3eaa05f9 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
#	web/documentserver-example/php/assets/js/jscript.js
2024-03-05 16:33:14 +03:00
283d93667e ruby: change document-server to documentserver 2024-03-05 16:24:39 +03:00
158ac4161c python: change document-server to documentserver 2024-03-05 16:24:27 +03:00
bf3df5c89d php: change document-server to documentserver 2024-03-05 16:24:04 +03:00
d8251f3280 fix config paths 2024-03-05 16:16:31 +03:00
e4db31fbd5 Merge remote-tracking branch 'remotes/origin/feature/readme' into develop
# Conflicts:
#	Readme.md
2024-03-05 16:04:45 +03:00
b633f5ff19 Merge pull request #536 from Afrowave/python-example-update
CHORE: Add the Python example reference on the README.
2024-03-05 15:24:12 +03:00
0c8110d2aa Merge pull request #540 from ONLYOFFICE/fix/php-posExt-of-loaded-file
fix(php): ext of loaded file without dot. Fix Bug 66718
2024-03-05 09:51:06 +03:00
f9f8dada69 Merge pull request #539 from ONLYOFFICE/fix/php-user-in-open-source-request
fix(php): checking user in editor request. fix bug 66716
2024-03-05 09:50:33 +03:00
36535f89bb fix(php): ext of loaded file without dot. Fix Bug 66718 2024-03-05 13:46:14 +07:00
09031033aa fix(php): checking user in editor request. fix bug 66716 2024-03-05 13:30:34 +07:00
f657e5ab4a Merge pull request #537 from ONLYOFFICE/fix/csharp-mvc-document-formats-type
fix(csharp-mvc): empty strings tolerant json deserialization.
2024-03-04 15:12:50 +03:00
e42f7fd271 fix(csharp-mvc): empty strings tolerant json deserialization. Fix bug 66688 2024-03-04 13:53:31 +07:00
0f0549c535 Merge remote-tracking branch 'origin/python-example-update' into python-example-update 2024-03-02 15:53:10 +03:00
e896f03acc CHORE: Add the Python example reference on the README. 2024-03-02 15:53:06 +03:00
a74d6b8676 CHORE: Add the Python example reference on the README. 2024-03-02 15:39:19 +03:00
672aae3791 refactor(nodejs): rename variables, ids, and classes regarding forced conversion 2024-03-01 16:29:04 +05:00
999e147539 fix(nodejs): disable file type buttons after selection 2024-03-01 15:25:14 +05:00
e57ad73d4f feat(php): allow to explicitly select output file type when getting auto-conversion error(-9) 2024-03-01 13:03:59 +05:00
690ab5471b Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-02-28 17:40:09 +03:00
f9fa10e70a nodejs: fix when siteUrl is '/' (Fix Bug 66578) 2024-02-28 17:39:48 +03:00
2460f2c7ac nodejs: absolute host is not needed with urllib (1e72167e7d) 2024-02-28 17:22:31 +03:00
e3342a030c nodejs: fix mobile size (Fix Bug 34620) 2024-02-28 14:40:21 +03:00
47b07a5c8b Merge pull request #528 from ONLYOFFICE/fix/java-spring-document-formats-type
fix(java-spring): empty strings as null in json deserialization.
2024-02-27 15:02:14 +03:00
e7630f516d build(ruby): updated gemfile.lock to 0 vulnerabilities 2024-02-27 16:47:26 +07:00
3e6bee4cc1 fix(java-spring): empty strings as null in json deserialization. fix bug 66552 2024-02-27 15:14:16 +07:00
2b1f7b0548 Merge pull request #527 from ONLYOFFICE/fix/java-document-formats-type
fix(java): empty strings as null in json dererialization. fix bug 66534
2024-02-27 08:57:14 +03:00
ba195952b2 Merge pull request #526 from ONLYOFFICE/fix/ruby-correct-server-url
Fix/ruby correct server url
2024-02-27 08:56:10 +03:00
4ac8d9ee16 fix(ruby): correct server url for images 2024-02-27 08:55:10 +03:00
c46292c595 fix(java): empty strings as null in json dererialization. fix bug 66534 2024-02-26 17:43:55 +07:00
19a38df423 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
#	web/documentserver-example/nodejs/app.js
2024-02-26 12:39:33 +03:00
b771b70ced Merge pull request #523 from ONLYOFFICE/fix/nodejs-editor-fileExt-vulnerability
fix(nodejs): editor fileExt validation. fix bug 66576
2024-02-26 12:37:56 +03:00
67a21fbe35 Merge pull request #524 from ONLYOFFICE/ruby-update-gemfile-lock
build(ruby): update gemfile.lock
2024-02-26 12:13:04 +03:00
08dc8ae6a7 build(ruby): updating gemfile.lock for containers 2024-02-22 17:28:13 +07:00
dcf2fb43e0 build(nodejs): updated dependencies (found 0 vulnerabilities) 2024-02-22 15:47:38 +07:00
dca6f4173e build(ruby): update gemfile.lock 2024-02-22 15:23:07 +07:00
c91d765296 fix(nodejs): editor fileExt validation. fix bug 66576 2024-02-22 14:49:46 +07:00
9615f5a93a Merge pull request #522 from ONLYOFFICE/fix/php-reference-link
fix(php): fix bug 66518
2024-02-21 15:46:08 +03:00
a9f0068600 fix(php): fix bug 66518 2024-02-21 16:53:19 +07:00
9f2a72aafa Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
#	web/documentserver-example/php/templates/docEditor.tpl
2024-02-20 15:04:31 +03:00
a71e7b1896 Merge pull request #520 from ONLYOFFICE/fix/php-container-links
fix(php): nginx headers, correct serverPath and forgotten comma
2024-02-20 15:00:17 +03:00
d8cb434ad2 Merge pull request #521 from ONLYOFFICE/feat/php-make-restart
feat(php): make restart
2024-02-20 14:55:33 +03:00
96af86846b feat(php): make restart 2024-02-20 17:26:40 +07:00
a83c22e537 fix(php): nginx headers, correct serverPath and forgotten comma 2024-02-20 14:41:29 +07:00
fa5fb2f182 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-02-19 13:56:26 +03:00
4be1eaf917 Merge pull request #519 from ONLYOFFICE/fix/php-max-filesize
fix(php): upload file max size. fix bug 64359
2024-02-19 13:55:07 +03:00
f9bd8db640 fix(php): upload file max size. fix bug 64359 2024-02-19 13:54:25 +03:00
0ba4facdb7 Merge pull request #518 from ONLYOFFICE/fix/saveas-vulnerability
fix(nodejs): checking file domain. fix bug 65593
2024-02-19 13:51:55 +03:00
03625022ca fix(nodejs): checking file domain. fix bug 65593 2024-02-19 15:06:16 +07:00
f154ffc981 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
#	web/documentserver-example/php/src/helpers/Users.php
2024-02-16 18:50:23 +03:00
be7ca0006a Merge pull request #517 from ONLYOFFICE/fix/php-user-image
fix(php): add image to users class
2024-02-16 18:49:07 +03:00
39a6581292 fix(php): add image to users class
Fix Bug 66516
2024-02-16 18:48:38 +03:00
90142299e5 Merge pull request #516 from ONLYOFFICE/feature/tabs-menu
feat(nodejs): move links to header
2024-02-15 15:12:37 +03:00
0f288d539e feat(nodejs): move links to header 2024-02-15 12:35:12 +03:00
d00237226b python: fix link (Fix Bug 66427) 2024-02-15 11:41:23 +03:00
2ead6e1f7e feat(nodejs): move links to header 2024-02-15 11:23:34 +03:00
98d48f373a nginx headers 2024-02-15 11:18:42 +03:00
92e7294f81 using ds v8.0 2024-02-15 11:16:46 +03:00
ea9ac4bb42 Merge pull request #506 from ONLYOFFICE/feature/delete-all-files
feat(nodejs): add a button to clear all files
2024-02-14 22:27:36 +03:00
5775f44f27 Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
#	CHANGELOG.md
2024-02-14 22:26:45 +03:00
4ce10d82a1 Merge pull request #513 from ONLYOFFICE/python-reference-fix
fix(python): link in reference body
2024-02-14 22:22:38 +03:00
3e9e4281c5 Merge pull request #515 from ONLYOFFICE/fix/wopi-edit
fix(nodejs): correct edited exts from discovery info
2024-02-14 22:22:10 +03:00
3eac4912e1 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-02-14 22:19:11 +03:00
283139450c Form template rename as PDF form 2024-02-14 16:45:07 +03:00
e8df1c2821 fix(nodejs): correct edited exts from discovery info 2024-02-14 15:29:27 +07:00
da3224de7b Merge pull request #514 from ONLYOFFICE/fix/client-max-body-size
Fix/client max body size
2024-02-13 16:00:52 +03:00
819aa2b03f fix(python): nginx body size 2024-02-13 17:52:28 +07:00
f1aafa5fd6 fix(php): nginx body size 2024-02-13 17:44:05 +07:00
ff2bcd0ef6 feat(nodejs): add a button to clear all files 2024-02-13 11:12:36 +03:00
a17c349fb8 Merge pull request #512 from ONLYOFFICE/feature/rename-lock-file
Rename lock file
2024-02-13 09:53:36 +03:00
2268bd1cf4 nodejs: refactoring creating file 2024-02-12 13:37:26 +03:00
605c21c0be fix(python): link in reference body 2024-02-12 16:30:50 +07:00
941c00c476 nodejs: fix serbian lang 2024-02-12 10:37:27 +03:00
3f0495321c Rename npm-shrinkwrap.json to package-lock.json 2024-02-09 12:35:25 +03:00
18fd30700f copyright 2024 2024-02-09 12:22:50 +03:00
9721187083 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-02-09 12:21:37 +03:00
bce5e3760a do not convert to oform 2024-02-09 12:21:24 +03:00
e4d43eda2a Revert "Remove and make"
This reverts commit ac6632d25b.
2024-02-09 08:56:51 +00:00
ac6632d25b Remove and make 2024-02-09 08:51:58 +00:00
b3d3b81274 copyright 2024 2024-02-01 12:39:36 +03:00
dab4841c1d inserting svg 2024-02-01 12:35:46 +03:00
0ec909346d Merge remote-tracking branch 'remotes/origin/release/v8.0.0' into release/1.8.0
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/nodejs/public/assets/document-formats
2024-01-31 09:44:13 +03:00
a7cf7ae378 Merge branch 'release/1.8.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-01-30 18:12:51 +03:00
0bcd7088e6 1.8.0 2024-01-30 18:11:47 +03:00
d256b63263 Merge branch 'feature/filling-pdf' into release/1.8.0 2024-01-30 18:03:34 +03:00
89132ae29a nodejs: pdf editor without creation (Fix Bug 64607 ) 2024-01-30 18:02:13 +03:00
c15438a0d7 nodejs: pdf as new documentType 2024-01-30 18:02:12 +03:00
319a689fe2 nodejs: filling pdf 2024-01-30 16:51:02 +03:00
e85cb5137b nodejs: fix serbian lang 2024-01-23 16:22:41 +03:00
163daa37c9 Merge pull request #508 from ONLYOFFICE/fix/send-notify
fix(php): correct sendNotify agrument
2024-01-23 14:01:56 +03:00
541a1e55b4 Merge pull request #507 from ONLYOFFICE/fix/edit-converted
fix(php): correct ext substring
2024-01-23 13:39:14 +03:00
d692abda4b fix(php): correct sendNotify agrument 2024-01-19 18:08:02 +07:00
f0d7892526 fix(php): correct ext substring 2024-01-19 17:59:18 +07:00
3a2f30bfcd Merge branch 'release/v8.0.0' into develop
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/csharp/settings.config
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/java/src/main/resources/settings.properties
2024-01-19 12:27:44 +03:00
e25ca233ee deps: bump gomod dependencies 2024-01-18 10:05:48 +03:00
03cc008de8 Merge pull request #505 from ONLYOFFICE/fix/saveas-exception
fix(python): correct saveAs url  (Fix Bug 65801)
2024-01-16 12:36:00 +03:00
5e76f08c83 fix(python): correct saveAs url 2024-01-16 14:50:46 +07:00
4ca824f1d7 Merge branch 'release/v8.0.0' into develop 2024-01-15 15:07:42 +03:00
ec268cacf7 nodejs: wopi frame without sandbox attribute (Fix Bug 65575) 2024-01-09 17:22:18 +03:00
c683d17bda Merge pull request #496 from ONLYOFFICE/feature/force-converting
Force converting problem files
2024-01-09 15:41:10 +03:00
7918671725 nodejs: handling conversion -9 error 2024-01-09 11:08:15 +03:00
408d80fff6 Merge pull request #502 from ONLYOFFICE/feature/users-different-goback
Users different goback
2024-01-09 11:04:15 +03:00
1b0e8df99f Merge remote-tracking branch 'remotes/origin/develop' into feature/users-different-goback
# Conflicts:
#	CHANGELOG.md
2024-01-09 11:01:08 +03:00
50104f1122 different goback to changelog 2024-01-09 11:00:16 +03:00
b90f333fdd csharp-mvc: add goback Users.cs 2023-12-29 12:47:37 +07:00
9e2aae1658 csharp: add goback Users.cs 2023-12-29 12:23:39 +07:00
0168355600 Merge pull request #494 from ONLYOFFICE/feature/converting
Converting
2023-12-28 12:26:02 +03:00
480b8af172 converting to changelog 2023-12-28 11:58:06 +03:00
f5d767e59d nodejs: wopi layout fix 2023-12-28 11:58:06 +03:00
62ad307327 nodejs: converting dialog window 2023-12-28 11:58:05 +03:00
b3b605230f nodejs: convert button on index page 2023-12-28 11:57:14 +03:00
ae2425f7e4 Merge pull request #503 from ONLYOFFICE/feature/formats-request
Getiing formats object on node
2023-12-28 10:45:30 +03:00
5849c9bb69 nodejs: getiing formats object 2023-12-27 13:35:03 +03:00
8ba1d5e8d7 update formats (add missed records) 2023-12-26 12:32:27 +03:00
91f3bda0b4 ruby: add goback users.rb 2023-12-22 15:15:26 +03:00
185605a1eb python: add goback users.py 2023-12-22 15:15:08 +03:00
6563a26d2d php: add goback users.php 2023-12-22 15:14:49 +03:00
d9061c57a3 nodejs: add goback users.js 2023-12-22 15:09:37 +03:00
b9c2c2e770 java: add goback user.java 2023-12-22 15:08:35 +03:00
a55d7b2d9d java-spring : add goback user.java 2023-12-22 15:08:09 +03:00
e0489a6922 Merge pull request #499 from ONLYOFFICE/feature/remove-history-close-restore
Remove Close History and Restore
2023-12-19 12:30:44 +03:00
dc14a9aa90 csharp-mvc: remove historyClose and restore 2023-12-19 15:41:22 +07:00
92206ed637 csharp: remove historyClose and restore 2023-12-19 15:31:28 +07:00
a763e2b9fe add: using replaceToInnerDocumentServerUrl() 2023-12-18 12:57:32 +03:00
841a4cd47e delete: SSLUtils 2023-12-18 12:52:10 +03:00
a5cd051303 change: method saveAs in FileController 2023-12-18 12:45:19 +03:00
381c9d74aa revert: docservice.properties 2023-12-18 12:41:58 +03:00
154dbb63e9 hange: dependency docs-integration-sdk as jar file 2023-12-18 12:41:51 +03:00
09f6ba00b2 ruby: add changes after pr #501 2023-12-18 10:09:54 +03:00
43f1555c68 python: add changes after pr #501 2023-12-18 10:09:47 +03:00
83535632bb php: add changes after pr #501 2023-12-18 10:09:40 +03:00
f1d41a4bf2 java: add changes after pr #501 2023-12-18 10:09:19 +03:00
f43e7414bb java-spring: add changes after pr #501 2023-12-18 10:09:11 +03:00
4455521e00 nodejs: add changes after pr #501 2023-12-18 10:08:32 +03:00
7b91694107 Merge branch 'develop' into feature/remove-history-close-restore 2023-12-15 18:16:04 +03:00
8edb65692a Merge pull request #501 from ONLYOFFICE/feature/fix-editros-files
Remove history methods for anonymous users
2023-12-15 17:55:20 +03:00
a36f270829 Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-editros-files
# Conflicts:
#	web/documentserver-example/php/templates/docEditor.tpl
2023-12-15 17:54:25 +03:00
f726ae534c Merge pull request #500 from ONLYOFFICE/feature/add-onRequestUsers-onRequestSendNotify
Add functions RequestUsers and RequestSendNotify
2023-12-15 17:50:31 +03:00
69b266489f csharp-mvc: add onRequestUsers and onRequestSendNotify in Editor.aspx 2023-12-15 20:03:15 +07:00
7c18d08bc6 csharp: add onRequestUsers and onRequestSendNotify in DocEditor.aspx 2023-12-15 19:57:55 +07:00
11614ca5be delete: gitmodule document-formats 2023-12-15 11:16:33 +03:00
23caedfeff add: using model ReferenceData from sdk 2023-12-15 11:10:39 +03:00
3c10bdd9c6 delete: unused application.properties 2023-12-15 11:00:57 +03:00
56f4cb2208 refactoring: docservice.properties 2023-12-15 10:08:08 +03:00
bb2b9de205 delete: unused application.properties 2023-12-15 10:07:45 +03:00
6431ee33a8 delete: unused models and dto 2023-12-15 09:58:45 +03:00
9750b37f97 delete: unused FormatService 2023-12-15 09:49:19 +03:00
6dc02a3f43 delete: unused FileUtility 2023-12-15 09:48:16 +03:00
3bb39f4fb0 delete: unused ServiceConverter 2023-12-15 09:47:15 +03:00
5a9933f002 change: FileController, DefaultCallbackManager, DefaultHistoryManager with using sdk DocumentManager 2023-12-15 09:47:11 +03:00
5829794052 add: method generateRevisionId to DocumentManager 2023-12-15 09:46:58 +03:00
870e14af73 change: IndexController with using sdk DocumentManager 2023-12-15 09:36:10 +03:00
e6f6e0572b change: DefaultHistoryManager with using sdk DocumentManager 2023-12-15 09:34:26 +03:00
f4165d7715 change: DefaultCallbackManager with using sdk DocumentManager 2023-12-15 09:34:16 +03:00
bea8fd534e change: method getDocumentName in DocumentMangerImpl 2023-12-15 09:34:10 +03:00
2a59733e61 add: methods getFileName, generateFilepath to LocalFileStorage 2023-12-15 09:33:48 +03:00
ce937a58bb delete: unused DocumentManager 2023-12-14 16:27:46 +03:00
5955137575 change: FileController, DefaultCallbackManager with using sdk DocumentManager 2023-12-14 16:27:28 +03:00
91182b1967 add: method versionDir to HistoryManager 2023-12-14 16:26:47 +03:00
931f2db9d1 change: sdk DocumentManager, moved methods from DocumentManager (getCorrectName, getFilesInfo, createDemo) 2023-12-14 16:19:28 +03:00
bcf6ba1428 delete: FileUtility from sdk UrlManager 2023-12-14 16:02:23 +03:00
32d914c78c delete: unused TemplateManager 2023-12-14 15:59:46 +03:00
e324cb333b add: mathod getTemplateImageUrl to sdk UrlManager 2023-12-14 15:58:11 +03:00
88e80de4fc change: DocumentManager moved url methods to sdk UrlManager 2023-12-14 15:50:46 +03:00
b16e35275b change: FileController replace FileUtility method to sdk DocumentManager 2023-12-14 15:16:46 +03:00
5519ac4afc changed: DefaultHistoryManager with using sdk history models 2023-12-14 13:14:35 +03:00
32a66f4495 change: replace using JwtManager to sdk JwtManager 2023-12-14 12:35:31 +03:00
682265078c change: CallbackManager with using sdk CommandService 2023-12-14 12:13:36 +03:00
6717612fc1 ruby: add onRequestUsers and onRequestSendNotify in editor.html.erb 2023-12-14 12:09:32 +03:00
8db11243fd change: CallbackServiceImpl with using method processEditing from CallbackManager 2023-12-14 12:09:31 +03:00
45b6bfa443 add: method processEditing to CallbackManager 2023-12-14 12:08:27 +03:00
ad43b9298f change: FileController with using sdk CommandService 2023-12-14 12:04:52 +03:00
5577f5388f add: sdk service (CommandService) to spring context 2023-12-14 12:04:32 +03:00
f504b2be6e delete: unused callback handlers (EditCallback, ForcesaveCallback, SaveCallback) 2023-12-14 11:29:59 +03:00
776a34a5a0 change: FileController with using sdk CallbackService 2023-12-14 11:28:41 +03:00
6fcc535468 add: implementations sdk CallbackService (CallbackServiceImpl) 2023-12-14 11:28:07 +03:00
ced855d6ac delete: unused method (getConvertedData) from ServiceConverter 2023-12-13 16:45:24 +03:00
3725020468 change: process conversion with using sdk service convertService (FileController, DefaultCallbackManager) 2023-12-13 16:40:24 +03:00
e230d8ea9b add: sdk service (ConvertService) to spring context 2023-12-13 16:38:05 +03:00
a10366bae9 add: setting docservice.lossyEdit to docservice.properties 2023-12-13 16:37:17 +03:00
a7fc3d38e4 delete: unused mappers (PermissionsMapper, UsersMapper) 2023-12-13 14:57:44 +03:00
11ead2e57f delete: unused wrappers (DefaultCustomizationWrapper, DefaultDocumentWrapper, DefaultEmbeddedWrapper, DefaultFileWrapper) 2023-12-13 14:57:44 +03:00
59a2b1b439 delete: unused services (CustomizationConfigurer, DocumentConfigurer, EditorConfigConfigurer, EmbeddedConfigurer, FileConfigurer) 2023-12-13 14:57:44 +03:00
1bedfa0cf2 change: EditorController with using sdk ConfigService 2023-12-13 14:57:44 +03:00
b9137b1d86 add: sdk service (ConfigService) 2023-12-13 14:57:44 +03:00
892d390fff add: method getCurrentUser to UserServices 2023-12-13 14:57:43 +03:00
2e55bf1cfc add: docservice.properties file 2023-12-13 14:57:43 +03:00
9fe8701718 add: sdk managers (JwtManager, RequestManager) to spring context 2023-12-13 14:57:30 +03:00
c2c14dd2f4 add: implementations sdk managers (DocumentMangerImpl, SettingsManagerImpl, UrlManagerImpl) 2023-12-13 14:43:49 +03:00
d1a67fa322 add: dependency com.onlyoffice.docs-intagration-sdk 2023-12-13 14:42:41 +03:00
7f678c9ed8 ruby: remove history methods for anonymous users (fe352ebad1)
old commit:
fe352ebad1
2023-12-12 10:35:35 +03:00
ee951fbfbc python: remove history methods for anonymous users (18cf21efe4)
old commit:
18cf21efe4
2023-12-12 10:32:42 +03:00
91f32c1387 php: remove history methods for anonymous users (39820cec0a)
old commit:
39820cec0a
2023-12-12 10:30:42 +03:00
7051437928 java: remove history methods for anonymous users (52a722cf89)
old commit:
52a722cf89
2023-12-12 10:25:45 +03:00
0967c1c3ac java-spring: remove history methods for anonymous users (bc5393e28c)
old commit:
bc5393e28c
2023-12-12 10:19:25 +03:00
cf097501c6 Fix Bug 34620 - resize on mobile
This reverts commit d3a08acec3.
2023-12-11 15:33:07 +03:00
0b0e0dad8c python: add onRequestUsers and onRequestSendNotify in editor.html 2023-12-11 12:55:06 +03:00
d97291719a php: add onRequestUsers and onRequestSendNotify in docEditor.tpl 2023-12-11 12:41:40 +03:00
75ca703f8a java-spring: add onRequestUsers and onRequestSendNotify in editor.html 2023-12-11 11:59:52 +03:00
01618fee17 java: add onRequestUsers and onRequestSendNotify in editor.jsp 2023-12-11 11:54:36 +03:00
78a8b56b48 java: delete spaces from editor.jsp 2023-12-07 13:47:25 +03:00
3b9bad4a26 Merge branch 'develop' into feature/remove-history-close-restore 2023-12-07 11:34:27 +03:00
435b8013f6 style: updates to styling 2023-12-07 10:58:41 +03:00
a9063af6e1 fix sr-Latn-RS 2023-12-06 12:56:12 +03:00
bde236075c ruby: remove historyClose and restore 2023-12-05 16:08:45 +03:00
f74f34504f python: remove historyClose and restore 2023-12-05 16:08:29 +03:00
3243a04a1b php: remove historyClose and restore 2023-12-05 15:25:20 +03:00
6598aa585a java: remove historyClose and restore 2023-12-05 15:25:05 +03:00
e02744e56b nodejs: remove historyClose and restore 2023-12-05 14:59:14 +03:00
ec596753c6 java-spring: remove historyClose and restore 2023-12-05 14:58:24 +03:00
3820f76d27 nodejs: added page for forgotten files 2023-11-03 09:14:41 +03:00
2459863430 Merge pull request #468 from ONLYOFFICE/release/1.7.0
Release/1.7.0
2023-10-30 12:17:35 +03:00
fa24c1b823 fix: history highlights 2023-02-02 18:49:17 +05:00
b1ef74d2a2 fix: create asset files 2023-02-01 17:48:01 +05:00
6145ae0fcd doc: readme 2023-02-01 17:25:57 +05:00
40412b6c17 fix: server_address as internal address for callback and download url 2023-02-01 17:21:44 +05:00
d43ecd489e fix: go submodule 2023-02-01 14:42:02 +05:00
190f5bba65 chore: submodules 2023-02-01 13:18:31 +05:00
ce39734850 chore: copyrights 2023-02-01 12:26:44 +05:00
7f31cefd76 fix: invalid path to key.txt 2023-01-31 18:38:44 +05:00
b5220091ff fix: handle callback errors 2023-01-31 18:00:03 +05:00
724d7363d8 feat: refactoring 2023-01-31 17:44:01 +05:00
5678307eb5 go-lang: add a download link handler (file, prev, diff) 2022-01-21 18:19:22 +03:00
7a149c6faa go-lang: basic example 2021-09-23 14:33:25 +05:00
976 changed files with 57057 additions and 9691 deletions

View File

@ -25,7 +25,7 @@ jobs:
rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: DotNet.Csharp.MVC.Example
path: ${{ github.workspace }}/web/documentserver-example/csharp-mvc/deploy

View File

@ -24,7 +24,7 @@ jobs:
rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: DotNet.Csharp.Example
path: ${{ github.workspace }}/web/documentserver-example/csharp/deploy

32
.github/workflows/artifact-go.yml vendored Normal file
View File

@ -0,0 +1,32 @@
name: Artifact Golang
on:
workflow_dispatch:
push:
branches: [master]
paths: ['web/documentserver-example/go/**']
pull_request:
branches: [master]
paths: ['web/documentserver-example/go/**']
jobs:
artifact:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Build Artifact
run: |
cd ${{ github.workspace }}
cwd=$(pwd)
git submodule update --init --recursive
cd ./web/documentserver-example/go
mkdir -p ./deploy/'Go Example'
rsync -av --exclude='deploy' ./ ./deploy/'Go Example'
rm -rf ./deploy/'Go Example'/static/assets/document-formats/.git
rm -rf ./deploy/'Go Example'/static/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: Go.Example
path: ${{ github.workspace }}/web/documentserver-example/go/deploy

View File

@ -25,7 +25,7 @@ jobs:
rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Java.Example
path: ${{ github.workspace }}/web/documentserver-example/java/deploy

View File

@ -25,7 +25,7 @@ jobs:
rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Node.js.Example
path: ${{ github.workspace }}/web/documentserver-example/nodejs/deploy

View File

@ -0,0 +1,31 @@
name: Artifact PHP Laravel
on:
workflow_dispatch:
push:
branches: [master]
paths: ['web/documentserver-example/php-laravel/**']
pull_request:
branches: [master]
paths: ['web/documentserver-example/php-laravel/**']
jobs:
artifact:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Build Artifact
run: |
cd ${{ github.workspace }}
git submodule update --init --recursive
cd ./web/documentserver-example/php-laravel
mkdir -p ./deploy/'PHP Laravel Example'
rsync -av --exclude='deploy' ./ ./deploy/'PHP Laravel Example'
rm -rf ./deploy/'PHP Laravel Example'/public/assets/document-formats/.git
rm -rf ./deploy/'PHP Laravel Example'/public/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: PHP-Laravel.Example
path: ${{ github.workspace }}/web/documentserver-example/php-laravel/deploy

View File

@ -25,7 +25,7 @@ jobs:
rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
rm -rf ./deploy/'PHP Example'/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: PHP.Example
path: ${{ github.workspace }}/web/documentserver-example/php/deploy

View File

@ -25,7 +25,7 @@ jobs:
rm -rf ./deploy/'Python Example'/assets/document-formats/.git
rm -rf ./deploy/'Python Example'/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Python.Example
path: ${{ github.workspace }}/web/documentserver-example/python/deploy

View File

@ -25,7 +25,7 @@ jobs:
rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Ruby.Example
path: ${{ github.workspace }}/web/documentserver-example/ruby/deploy

View File

@ -26,7 +26,7 @@ jobs:
rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Java.Spring.Example
path: ${{ github.workspace }}/web/documentserver-example/java-spring/deploy

27
.github/workflows/create-tag.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: Create Tag
on:
push:
branches: [master]
paths-ignore:
- '.github/**'
- '**/AUTHORS.md'
- '**/LICENSE'
- '**/README.md'
jobs:
create-tag:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Get Info
run: |
echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
id: info
- name: Create Tag
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
git tag -a 'v${{ steps.info.outputs.version }}' -m 'Release/v${{ steps.info.outputs.version }}'
git push origin 'v${{ steps.info.outputs.version }}'

29
.github/workflows/lint-go.yml vendored Normal file
View File

@ -0,0 +1,29 @@
name: Golangci
on:
workflow_dispatch:
push:
branches: [master]
paths: ['web/documentserver-example/go/**']
pull_request:
branches: [master, develop]
paths: ['web/documentserver-example/go/**']
jobs:
lint:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./web/documentserver-example/go
steps:
- uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
- name: Lint Golangci
run: |
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
golangci-lint run

View File

@ -3,10 +3,10 @@ name: Lint Java
on:
workflow_dispatch:
push:
branches: [master, main]
branches: [master]
paths: ['web/documentserver-example/java/**']
pull_request:
branches: [master, main, develop]
branches: [master, develop]
paths: ['web/documentserver-example/java/**']
jobs:

View File

@ -3,10 +3,10 @@ name: ESLint
on:
workflow_dispatch:
push:
branches: [master, main]
branches: [master]
paths: ['web/documentserver-example/nodejs/**']
pull_request:
branches: [master, main, develop]
branches: [master, develop]
paths: ['web/documentserver-example/nodejs/**']
env:

37
.github/workflows/lint-php-laravel.yml vendored Normal file
View File

@ -0,0 +1,37 @@
name: Laravel Pint
on:
workflow_dispatch:
push:
branches: [master]
paths: ['web/documentserver-example/php-laravel/**']
pull_request:
branches: [master, develop]
paths: ['web/documentserver-example/php-laravel/**']
jobs:
lint:
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
php: [8.2]
defaults:
run:
working-directory: ./web/documentserver-example/php-laravel
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: json, dom, curl, libxml, mbstring
coverage: none
- name: Install Pint
run: composer global require laravel/pint
- name: Run Pint
run: pint --test

View File

@ -3,10 +3,10 @@ name: PHPCs
on:
workflow_dispatch:
push:
branches: [master, main]
branches: [master]
paths: ['web/documentserver-example/php/**']
pull_request:
branches: [master, main, develop]
branches: [master, develop]
paths: ['web/documentserver-example/php/**']
jobs:
@ -17,7 +17,7 @@ jobs:
working-directory: ./web/documentserver-example/php
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2

View File

@ -3,10 +3,10 @@ name: PyLint
on:
workflow_dispatch:
push:
branches: [master, main]
branches: [master]
paths: ['web/documentserver-example/python/**']
pull_request:
branches: [master, main, develop]
branches: [master, develop]
paths: ['web/documentserver-example/python/**']
jobs:

View File

@ -3,10 +3,10 @@ name: Rubocop
on:
workflow_dispatch:
push:
branches: [master, main]
branches: [master]
paths: ['web/documentserver-example/ruby/**']
pull_request:
branches: [master, main, develop]
branches: [master, develop]
paths: ['web/documentserver-example/ruby/**']
jobs:
@ -30,7 +30,7 @@ jobs:
- name: Install Dependencies
run: |
bundle update
bundle install
- name: Rubocop
run: |

View File

@ -3,10 +3,10 @@ name: Lint Spring
on:
workflow_dispatch:
push:
branches: [master, main]
branches: [master]
paths: ['web/documentserver-example/java-spring/**']
pull_request:
branches: [master, main, develop]
branches: [master, develop]
paths: ['web/documentserver-example/java-spring/**']
jobs:

View File

@ -2,7 +2,8 @@ name: Release
on:
push:
branches: [master,main]
tags:
- 'v*'
permissions:
contents: write
@ -63,6 +64,14 @@ jobs:
rsync -av --exclude='PHP Example' ./ ./'PHP Example'
rm -rf ./'PHP Example'/assets/document-formats/.git
rm -rf ./'PHP Example'/assets/document-templates/.git
- name: Build PHP Laravel Artifact
run: |
cd ${{ github.workspace }}
cd ./web/documentserver-example/php-laravel
mkdir -p ./'PHP Laravel Example'
rsync -av --exclude='PHP Laravel Example' ./ ./'PHP Laravel Example'
rm -rf ./'PHP Laravel Example'/public/assets/document-formats/.git
rm -rf ./'PHP Laravel Example'/public/assets/document-templates/.git
- name: Build Python Artifact
run: |
cd ${{ github.workspace }}
@ -87,6 +96,14 @@ jobs:
rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git
rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.git
- name: Build Go Artifact
run: |
cd ${{ github.workspace }}
cd ./web/documentserver-example/go
mkdir -p .'Go Example'
rsync -av --exclude='Go Example' ./ ./'Go Example'
rm -rf ./'Go Example'/static/assets/document-formats/.git
rm -rf ./'Go Example'/static/assets/document-templates/.git
- name: Pack Artifacts
run: |
cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc
@ -99,12 +116,16 @@ jobs:
zip -r Node.js.Example.zip ./'Node.js Example'
cd ${{ github.workspace }}/web/documentserver-example/php
zip -r PHP.Example.zip ./'PHP Example'
cd ${{ github.workspace }}/web/documentserver-example/php-laravel
zip -r PHP.Laravel.Example.zip ./'PHP Laravel Example'
cd ${{ github.workspace }}/web/documentserver-example/python
zip -r Python.Example.zip ./'Python Example'
cd ${{ github.workspace }}/web/documentserver-example/ruby
zip -r Ruby.Example.zip ./'Ruby Example'
cd ${{ github.workspace }}/web/documentserver-example/java-spring
zip -r Java.Spring.Example.zip ./'Java Spring Example'
cd ${{ github.workspace }}/web/documentserver-example/go
zip -r Go.Example.zip ./'Go Example'
- name: Create Release
uses: ncipollo/release-action@v1
id: create_release
@ -116,8 +137,10 @@ jobs:
${{ github.workspace }}/web/documentserver-example/java/Java.Example.zip,
${{ github.workspace }}/web/documentserver-example/nodejs/Node.js.Example.zip,
${{ github.workspace }}/web/documentserver-example/php/PHP.Example.zip,
${{ github.workspace }}/web/documentserver-example/php-laravel/PHP.Laravel.Example.zip,
${{ github.workspace }}/web/documentserver-example/python/Python.Example.zip,
${{ github.workspace }}/web/documentserver-example/ruby/Ruby.Example.zip,
${{ github.workspace }}/web/documentserver-example/java-spring/Java.Spring.Example.zip
${{ github.workspace }}/web/documentserver-example/java-spring/Java.Spring.Example.zip,
${{ github.workspace }}/web/documentserver-example/go/Go.Example.zip
"
tag: v${{ steps.info.outputs.version }}

36
.gitmodules vendored
View File

@ -1,62 +1,64 @@
[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
path = web/documentserver-example/nodejs/public/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
path = web/documentserver-example/nodejs/public/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = feature/v8.0
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
path = web/documentserver-example/csharp-mvc/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"]
path = web/documentserver-example/csharp-mvc/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
[submodule "web/documentserver-example/php/assets/document-templates"]
path = web/documentserver-example/php/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/php/assets/document-formats"]
path = web/documentserver-example/php/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = master
[submodule "web/documentserver-example/python/assets/document-templates"]
path = web/documentserver-example/python/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
path = web/documentserver-example/java/src/main/resources/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/ruby/assets/document-templates"]
path = web/documentserver-example/ruby/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/go/static/assets/document-templates"]
path = web/documentserver-example/go/static/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/default
[submodule "web/documentserver-example/go/static/assets/document-formats"]
path = web/documentserver-example/go/static/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
[submodule "web/documentserver-example/python/assets/document-formats"]
path = web/documentserver-example/python/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = master
[submodule "web/documentserver-example/ruby/assets/document-formats"]
path = web/documentserver-example/ruby/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = master
[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
path = web/documentserver-example/java/src/main/resources/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = master
[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-formats"]
path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = master
[submodule "web/documentserver-example/csharp/assets/document-templates"]
path = web/documentserver-example/csharp/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/en
branch = main/default
[submodule "web/documentserver-example/csharp/assets/document-formats"]
path = web/documentserver-example/csharp/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
[submodule "web/documentserver-example/php-laravel/public/assets/document-templates"]
path = web/documentserver-example/php-laravel/public/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates
branch = main/default

View File

@ -1,6 +1,5 @@
Document Server integration example uses code from the following 3rd party projects.
web/documentserver-example/csharp
jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
@ -83,6 +82,37 @@ License: MICROSOFT .NET LIBRARY LICENSE
License File: WebGrease.license
web/documentserver-example/go
fx - An application framework for Go that makes dependency injection easy. (https://github.com/uber-go/fx).
License: MIT
License File: fx.license
golang-jwt - A go implementation of JSON Web Tokens. (https://github.com/golang-jwt/jwt).
License: MIT
License File: golang-jwt.license
gorilla/mux - Package gorilla/mux implements a request router and dispatcher for matching incoming requests to their respective handler. (https://github.com/gorilla/mux).
License: BSD-3-Clause License
License File: mux.license
mapstructure - Go library for decoding generic map values into native Go structures and vice versa. (https://github.com/mitchellh/mapstructure)
License: MIT
License File: mapstructure.license
schema - Package gorilla/schema fills a struct with form values. (https://github.com/gorilla/schema)
License: BSD-3-Clause License
License File: schema.license
viper - Viper is a complete configuration solution for Go applications including 12-Factor apps. It is designed to work within an application, and can handle all types of configuration needs and formats. (https://github.com/spf13/viper).
License: MIT
License File: viper.license
zap - Blazing fast, structured, leveled logging in Go. (https://github.com/uber-go/zap).
License: MIT
License File: zap.license
web/documentserver-example/java
jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
@ -132,6 +162,10 @@ Jackson Databind - General-purpose data-binding functionality and tree-model for
License: Apache 2.0
License File: jackson-databind.license
Jackson Dataformat Properties - Support for reading and writing content of "Java Properties" style configuration files as if there was implied nesting structure (by default using dots as separators). (https://github.com/FasterXML/jackson-dataformats-text/blob/master/LICENSE)
License: Apache 2.0
License File: jackson-dataformat-properties.license
jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
License: MIT, GPL
License File: jQuery.BlockUI.license
@ -156,6 +190,10 @@ jQuery.UI - jQuery UI is an open source library of interface components —
License: MIT
License File: jQuery.UI.license
JSON - JSON is a light-weight, language independent, data interchange format. (https://github.com/stleary/JSON-java/blob/master/LICENSE)
License Public Domain
License File: json.license
JSON.simple - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
License: Apache 2.0
License File: JSON.simple.license
@ -168,14 +206,14 @@ ModelMapper - ModelMapper is an intelligent object mapping library that automa
License: Apache 2.0
License File modelmapper.license
Prime JWT - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
License: Apache 2.0
License File: prime-jwt.license
Spring Boot - Helps create Spring-powered, production-grade applications and services. Has external dependencies on Spring Framework. (https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt)
License: Apache 2.0
License File: spring-boot.license
Spring Boot Web - Starter for building web, including RESTful, applications using Spring MVC. Uses Tomcat as the default embedded container. (https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt)
License: Apache 2.0
License File: spring-boot.license
Spring Boot Devtools - Provides fast application restarts, LiveReload, and configurations for enhanced development experience. (https://github.com/spring-projects/spring-boot/blob/main/LICENSE.txt)
License: Apache 2.0
License File: spring-boot.license
@ -271,6 +309,9 @@ urllib - Request HTTP URLs in a complex world — basic and digest authen
License: MIT
License File: urllib.license
utf7 - Encodes and decodes JavaScript (Unicode/UCS-2) strings to UTF-7 ASCII strings. (https://github.com/kkaefer/utf7/blob/master/LICENSE)
License: MIT
License File: utf7.license
web/documentserver-example/php
@ -320,6 +361,41 @@ License: MIT
License File: serializer.license
web/documentserver-example/php-laravel
jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
License: MIT, GPL
License File: jQuery.BlockUI.license
jQuery.FileUpload - File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads. (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
License: MIT
License File: jQuery.FileUpload.license
jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
License: MIT
License File: jQuery.iframe-transport.license
jQuery - jQuery is a new kind of JavaScript Library. jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript. NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
License: MIT
License File: jQuery.license
jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
License: OpenJS
License File: jQuery.Migrate.license
jQuery.UI - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
License: MIT
License File: jQuery.UI.license
JWT - PHP package for JWT (https://github.com/firebase/php-jwt/blob/main/LICENSE)
License: BSD-3-Clause
License File: jwt.license
Laravel - Laravel is a web application framework with expressive, elegant syntax. Weve already laid the foundation for your next big idea — freeing you to create without sweating the small things. (https://github.com/laravel/framework/blob/master/LICENSE.md)
License - MIT
License File - laravel.license
web/documentserver-example/python
django-stubs - PEP-484 stubs for Django. (https://github.com/typeddjango/django-stubs/blob/master/LICENSE.md)

View File

@ -1,10 +1,101 @@
# Change Log
- update demo files
- set users by parts
- open the conversion dialog box with a gray check mark on the type selection step
- preload frame moved from uploading popap
- change tab title on rename
- change uploaded file name in popap if converted
- php-laravel: fix custom jwt header
- features tips for anonymous
- view odg, md
- edit xlsb
- support vsdx in diagram editor
## 1.14.0
- nodejs: set users by parts
- nodejs: preload frame moved from uploading popap
- nodejs: view odg, md
- nodejs: edit xlsb
- nodejs: support vsdx in diagram editor
- nodejs: fix wopi verification
- nodejs: user role
- nodejs: start filling
- ur skin language
- change preload.html address
## 1.13.0
- nodejs: rename in wopi
- nodejs: using faviconUrl from WOPI discovery
- nodejs: wopi proof key verification
- golang: new integration example
- golang: upload files to the server
- golang: create blank files and files with sample content
- golang: edit uploaded files in onlyoffice editor
- golang: delete files on the server
- golang: show files history
- php-laravel: new integration example
- php-laravel: upload files to the server
- php-laravel: create blank files and files with sample content
- php-laravel: edit uploaded files in onlyoffice editor
- php-laravel: delete files on the server
- php-laravel: create, edit, and submit pdf forms
- php-laravel: show forgotten files on a seperate page
- php-laravel: fetch files
- php-laravel: integrate sdk
- jwt token lifetime from config
- onUserActionRequired
- support pages, numbers, key formats
- support hwp, hwpx formats
- restore by url
- refresh config
- on uploading xml convert to supported type only
- converting function on index page
- editing by default
- change reference source
- filename in editor page title
- close editor
## 1.12.0
- nodejs: refresh config
- nodejs: support pages, numbers, key formats
- nodejs: support hwp, hwpx formats
- sq-AL skin language
## 1.11.0
- he-IL skin language
- ConvertService.ashx address replaced with converter
- coauthoring/CommandService.ashx address replaced with command
- without submitForm in viewer
## 1.10.0
- nodejs: converting function on index page
- java-spring: using java docs-integration-sdk
- tabs menu
- creating and editing pdf instead docxf
- filling by default
- forgotten files
- delete all files
- save as for pdf
- handling conversion -9 error
- change inserted image
- different goback for users
## 1.9.0
- nodejs: filling by default
- nodejs: docxf, oform as pdf documentType
- nodejs: creating and editing pdf instead docxf
- nodejs: wopi formsubmit icon
- nodejs: close editor
- en-GB, sr-Cyrl-RS skin languages
- switching from filling to editing
- fill permission in embedded mode
## 1.8.0
- nodejs: pdf, djvu, xps, oxps as pdf documentType
- nodejs: filling pdf
- version number to page meta
- ar skin languages
- sr-Latn-CS skin languages
- ar, sr-Latn-RS skin languages
- getting history via api
- using a repo with a list of formats
- convert after uploading only tagged formats

View File

@ -1,23 +1,25 @@
## Integration examples
Test examples are simple document management systems that can be built into your application for testing.
These test examples are simple document management systems that can be built into your application for testing.
Do NOT use these integration examples on your own server without proper code modifications!
In case you enabled any of the test examples, disable it before going for production.
These examples show the way to integrate [ONLYOFFICE Docs][2] into your own website or application using one of the programming languages.
The package contains examples written in .Net (C# MVC), .Net (C#), Java, Node.js, PHP and Ruby.
The package contains examples written in .Net (C# MVC), .Net (C#), Go, Java, Java Spring, Node.js, PHP, PHP (Laravel), Python and Ruby.
You should change `http://documentserver` to your server address in these files:
* [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
* [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
* [Go](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/go) - `web\documentserver-example\go\config\configuration.json`
* [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
* [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.json`
* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/config.py`
* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/config/application.rb`
* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/src/configuration/ConfigurationManager.php`
* [PHP (Laravel)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php-laravel) - `web/documentserver-example/php-laravel/.env.example`
* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/src/configuration/configuration.py`
* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/app/configuration/configuration.rb`
More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")
More information on how to use these examples can be found here: [https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/)
## API methods for test examples

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -38,9 +38,15 @@ namespace OnlineEditorsExampleMVC
// create the main script bundle
bundles.Add(new ScriptBundle("~/bundles/scripts").Include(
"~/Scripts/formats.js",
"~/Scripts/jscript.js"
));
// create the forgotten page script bundle
bundles.Add(new ScriptBundle("~/bundles/forgotten").Include(
"~/Scripts/forgotten.js"
));
// create a style bundle
bundles.Add(new StyleBundle("~/Content/css").Include(
"~/Content/stylesheet.css",
@ -52,6 +58,11 @@ namespace OnlineEditorsExampleMVC
bundles.Add(new StyleBundle("~/Content/editor").Include(
"~/Content/editor.css"
));
// create the forgotten page style bundle
bundles.Add(new StyleBundle("~/Content/forgotten").Include(
"~/Content/forgotten.css"
));
}
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -0,0 +1,179 @@
/**
*
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
.center {
width: auto;
}
.left-panel {
width: 256px;
}
.main-panel {
width: 832px;
margin: 0 32px;
padding: 48px 0;
left: 0;
}
.tableRow {
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #E2E2E2;
}
.tableRow td:first-child {
width: 70%;
flex-grow: 0;
max-width: none;
}
.tableHeader td:first-child {
text-align: left;
}
.tableHeader td:last-child, .tableRow td:last-child {
width: 10%;
text-align: center;
padding: 0 !important;
}
.tableHeader {
width: 100%;
}
.stored-edit {
display: block;
padding-top: 0;
max-width: none;
}
menu.links {
width: 100%;
}
.scroll-table-body table {
table-layout: fixed;
}
.stored-edit span {
font-size: 12px;
line-height: normal;
position: static;
}
.scroll-table-body {
overflow-y: auto;
}
.stored-list {
height: calc(100% - 58px);
}
header {
min-width:auto;
}
header a {
display: block;
margin: 0 auto;
width: 1152px;
}
@media (max-width: 1279px) and (min-width: 1024px) {
.left-panel {
width: 208px;
}
.main-panel {
width: 688px;
}
header a {
width: 928px;
}
header img {
margin-left: 16px;
}
}
@media (max-width: 1023px) and (min-width: 593px) {
.center {
max-width: 768px;
width: calc(100% - 80px);
}
.table-main {
width: 100%;
}
.left-panel {
width: 208px;
}
.main-panel {
width: calc(100% - 32px);
}
.tableHeader td:last-child, .tableRow td:last-child {
width: 20%;
}
header a {
width: 768px;
}
header img {
margin-left: 40px;
}
}
@media (max-width: 592px) {
.center, .table-main {
width: 100%;
}
.left-panel {
display: none;
}
.main-panel {
width: 100%;
margin: 0;
padding: 28px 16px;
}
.tableHeader td:last-child, .tableRow td:last-child {
width: 25%;
}
header a {
width: auto;
}
.scroll-table-body {
top: 40px;
}
.tableRow {
padding: 8px 0;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4285 13C14.4102 13 14 13 14 13.5V15H6C5.44772 15 5 15.4477 5 16V17C5 17.5523 5.44771 18 6 18H14V19.5C14 20 14.3816 20 14.4285 20C14.6359 20 15.0099 19.9113 15.2172 19.7363L18.6207 17.0833C19.1264 16.6566 19.1264 16.3434 18.6207 15.9167L15.2172 13.2637C15.0099 13.0887 14.6359 13 14.4285 13Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.5715 4C9.58984 4 10 4 10 4.50002V6H18C18.5523 6 19 6.44772 19 7V8C19 8.55228 18.5523 9 18 9H10V10.5C10 11 9.61841 11 9.57151 11C9.36409 11 8.99012 10.9113 8.78279 10.7363L5.37934 8.08333C4.87356 7.65662 4.87356 7.34338 5.37934 6.91667L8.78279 4.26366C8.99012 4.08874 9.36409 4 9.5715 4Z" fill="#444444"/>
</svg>

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1 +1,7 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#287CA9"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="7" y="28" width="10" height="2" rx="1" fill="#fff"/>
<rect x="7" y="22" width="16" height="2" rx="1" fill="#fff"/>
<rect x="7" y="16" width="16" height="2" rx="1" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 503 B

View File

@ -1 +0,0 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 463 B

View File

@ -0,0 +1,8 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#E54D39"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="7" y="28" width="16" height="2" rx="1" fill="#fff"/>
<rect x="18" y="22" width="5" height="2" rx="1" fill="#fff"/>
<rect x="18" y="16" width="5" height="2" rx="1" fill="#fff"/>
<rect x="8" y="17" width="6" height="6" rx=".833" stroke="#fff" stroke-width="2"/>
</svg>

After

Width:  |  Height:  |  Size: 590 B

View File

@ -1 +1,8 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#F36700"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
<rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 570 B

View File

@ -1 +1,5 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#D1D5DA"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5zm-5.293 14.293a1 1 0 0 0-1.414 0l-4 4a1 1 0 1 0 1.414 1.414L14 17.414V25a1 1 0 1 0 2 0v-7.586l2.293 2.293a1 1 0 0 0 1.414-1.414z" fill="#646464"/>
<path d="M8.833 22H11a1 1 0 1 1 0 2H9v4h12v-4h-2a1 1 0 1 1 0-2h2.167c1.012 0 1.833.82 1.833 1.833v4.334C23 29.179 22.18 30 21.167 30H8.833A1.833 1.833 0 0 1 7 28.167v-4.334C7 22.821 7.82 22 8.833 22" fill="#646464"/>
</svg>

Before

Width:  |  Height:  |  Size: 797 B

After

Width:  |  Height:  |  Size: 638 B

View File

@ -1 +1,10 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#3AA133"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="22" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
<rect x="12" y="16" width="2" height="14" rx="1" fill="#fff"/>
<rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 703 B

View File

@ -0,0 +1,3 @@
<svg width="20" height="17" viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 17V11H12V17H17V9H20L10 0L0 9H3V17H8Z" fill="#444444"/>
</svg>

After

Width:  |  Height:  |  Size: 173 B

View File

@ -1,12 +1,5 @@
<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.84616 1H10.8462L14.8462 5V15H2.84616V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8462 5L10.8462 1H2.84616V15H14.8462V5ZM10.8462 0L15.8462 5V16H1.84616V0H10.8462Z" fill="#BFBFBF"/>
<rect x="3.84616" y="10" width="10" height="4" fill="#3779A6"/>
<path d="M3.84616 4H4.84616V5H3.84616V4Z" fill="#BFBFBF"/>
<path d="M3.84616 6H4.84616V7H3.84616V6Z" fill="#BFBFBF"/>
<path d="M4.84616 8H3.84616V9H4.84616V8Z" fill="#BFBFBF"/>
<path d="M12.8462 8H5.84616V9H12.8462V8Z" fill="#BFBFBF"/>
<path d="M7.84616 6H5.84616V7H7.84616V6Z" fill="#BFBFBF"/>
<path d="M12.8462 4H5.84616V5H12.8462V4Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M9.84616 1H10.8462V4H14.8462L15.8462 5H9.84616V1Z" fill="#333333"/>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path fill="#287CA9" d="M5 7h6v1H5zm0 2h6v1H5zm0 2h4v1H5z"/>
</svg>

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 394 B

View File

@ -0,0 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path d="M7.36 5.777c0 1.085-.31 2.363-.833 3.543-.526 1.185-1.235 2.198-1.974 2.796l.803 1.109c1.992-1.342 4.198-2.262 6.333-1.954L12 9.938c-1.819-.612-3.278-2.449-3.278-4.16zm.888 2.84a6.7 6.7 0 0 0 1.161 1.35c-.668.122-1.323.32-1.957.573q.17-.322.316-.657c.183-.41.344-.836.48-1.267" fill="#E54D39"/>
</svg>

After

Width:  |  Height:  |  Size: 637 B

View File

@ -1,12 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 1H10L14 5V15H2V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5L10 1H2V15H14V5ZM10 0L15 5V16H1V0H10Z" fill="#BFBFBF"/>
<rect x="3" y="10" width="10" height="4" fill="#F36700"/>
<path d="M3 4H4V5H3V4Z" fill="#BFBFBF"/>
<path d="M3 6H4V7H3V6Z" fill="#BFBFBF"/>
<path d="M4 8H3V9H4V8Z" fill="#BFBFBF"/>
<path d="M12 8H5V9H12V8Z" fill="#BFBFBF"/>
<path d="M7 6H5V7H7V6Z" fill="#BFBFBF"/>
<path d="M12 4H5V5H12V4Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M9 1H10V4H14L15 5H9V1Z" fill="#333333"/>
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path d="M5 10a3 3 0 1 0 3-3v3z" fill="#F36700"/>
<path d="M4.5 9A2.5 2.5 0 0 1 7 6.5V9z" fill="#F36700"/>
</svg>

Before

Width:  |  Height:  |  Size: 631 B

After

Width:  |  Height:  |  Size: 444 B

View File

@ -0,0 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path d="M5 8h6v1H5zm0 1h1v1H5zm5 0h1v1h-1zM7 6h2v2H7z" fill="#5951BB"/>
<path stroke="#5951BB" d="M4.5 10.5h2v2h-2zm5 0h2v2h-2z"/>
</svg>

After

Width:  |  Height:  |  Size: 469 B

View File

@ -1,12 +1,5 @@
<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.84592 1H10.8459L14.8459 5V15H2.84592V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8459 5L10.8459 1H2.84592V15H14.8459V5ZM10.8459 0L15.8459 5V16H1.84592V0H10.8459Z" fill="#BFBFBF"/>
<rect x="3.84592" y="10" width="10" height="4" fill="#78A73B"/>
<path d="M3.84592 4H4.84592V5H3.84592V4Z" fill="#BFBFBF"/>
<path d="M3.84592 6H4.84592V7H3.84592V6Z" fill="#BFBFBF"/>
<path d="M4.84592 8H3.84592V9H4.84592V8Z" fill="#BFBFBF"/>
<path d="M12.8459 8H5.84592V9H12.8459V8Z" fill="#BFBFBF"/>
<path d="M7.84592 6H5.84592V7H7.84592V6Z" fill="#BFBFBF"/>
<path d="M12.8459 4H5.84592V5H12.8459V4Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M9.84592 1H10.8459V4H14.8459L15.8459 5H9.84592V1Z" fill="#333333"/>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.207V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.793z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v1.9c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437c.214.109.494.109 1.054.109H13" stroke="#BBB"/>
<path fill="#3AA133" d="M8 7h3v2H8zm0 3h3v2H8zM5 7h2v2H5zm0 3h2v2H5z"/>
</svg>

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,5 @@
<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5332 22.2243L0.632544 17.5921C-0.210848 17.1877 -0.210848 16.5627 0.632544 16.1951L4.07945 14.5775L10.4966 17.5921C11.34 17.9965 12.6967 17.9965 13.5034 17.5921L19.9206 14.5775L23.3675 16.1951C24.2108 16.5995 24.2108 17.2245 23.3675 17.5921L13.4668 22.2243C12.6967 22.592 11.34 22.592 10.5332 22.2243Z" fill="#FF6F3D"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5011 16.4922L0.630617 11.8546C-0.210206 11.4497 -0.210206 10.824 0.630617 10.456L3.99391 8.87329L10.5011 11.9282C11.342 12.3331 12.6946 12.3331 13.4989 11.9282L20.0061 8.87329L23.3694 10.456C24.2102 10.8608 24.2102 11.4865 23.3694 11.8546L13.4989 16.4922C12.658 16.897 11.3054 16.897 10.5011 16.4922Z" fill="#95C038"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5011 10.8195L0.630617 6.24863C-0.210206 5.84959 -0.210206 5.23289 0.630617 4.87013L10.5011 0.299281C11.342 -0.0997605 12.6946 -0.0997605 13.4989 0.299281L23.3694 4.87013C24.2102 5.26917 24.2102 5.88587 23.3694 6.24863L13.4989 10.8195C12.658 11.1822 11.3054 11.1822 10.5011 10.8195Z" fill="#5DC0E8"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,5 @@
<svg width="20" height="14" viewBox="0 0 20 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="20" height="2" rx="1" fill="white"/>
<rect y="6" width="20" height="2" rx="1" fill="white"/>
<rect y="12" width="20" height="2" rx="1" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M13 17C13 17.5523 12.5523 18 12 18C11.4477 18 11 17.5523 11 17V13H7C6.44772 13 6 12.5523 6 12C6 11.4477 6.44772 11 7 11H11V7C11 6.44772 11.4477 6 12 6C12.5523 6 13 6.44772 13 7V11H17C17.5523 11 18 11.4477 18 12C18 12.5523 17.5523 13 17 13H13V17Z" fill="#444444"/>
</svg>

After

Width:  |  Height:  |  Size: 416 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -42,10 +42,14 @@
}
.tableHeaderCellViewers {
width: 29%;
width: 18%;
text-align: right;
}
.tableHeaderCellAction {
width: 23%;
}
.tableHeaderCellDownload {
width: 21%;
padding-right: 18px;
@ -79,7 +83,8 @@
margin-left: 0;
}
.tableRow {
.tableRow,
menu.links {
width: 90%;
}
@ -119,7 +124,8 @@
.contentCells-icon{
width: 5%;
}
.tableRow {
.tableRow,
menu.links {
width: 55%;
}
@ -175,7 +181,8 @@
}
@media (max-width: 715px) {
.tableRow {
.tableRow,
menu.links {
width: 45%;
}
}
@ -217,7 +224,7 @@
}
.tableHeaderCellFileName {
width: 16%;
width: 9%;
}
.tableHeaderCellEditors {
@ -226,7 +233,12 @@
.tableHeaderCellViewers {
text-align: right;
width: 37%;
width: 9%;
}
.tableHeaderCellAction{
width: 11%;
padding-right: 82px;
}
.tableHeaderCellDownload {
@ -241,19 +253,24 @@
}
.tableHeaderCellEditors {
width: 26%;
width: 15%;
text-align: left;
}
.tableHeaderCellFileName {
width: 17%;
width: 28%;
}
.tableHeaderCellViewers {
width: 27%;
width: 6%;
text-align: right;
}
.tableHeaderCellAction{
width: 18%;
padding-right: 54px;
}
.tableHeaderCellDownload {
padding-right: 18px;
width: 20%;
@ -263,7 +280,8 @@
padding-left: 0;
}
.tableRow {
.tableRow,
menu.links {
width: 75%;
}
@ -273,12 +291,17 @@
.tableRow td:first-child {
flex-grow: 0;
width: 15%;
width: 25%;
margin-right: auto;
}
.contentCells-icon {
width: 3%;
}
.firstContentCellViewers {
margin-left: 0;
}
}
@media (max-width: 890px) and (min-width: 769px ) {
@ -286,14 +309,15 @@
width: 20%;
}
.contentCells-shift {
padding-right: 28px;
padding-right: 27px;
}
.main-panel {
width: 580px;
}
.tableRow {
.tableRow,
menu.links {
width: 95%;
}
@ -318,11 +342,16 @@
.tableHeaderCellEditors {
text-align: left;
width: 31%;
width: 1%;
}
.tableHeaderCellViewers {
width: 18%;
width: 19%;
}
.tableHeaderCellAction {
width: 19%;
padding-right: 45px;
}
}
@ -407,7 +436,8 @@
padding: 16px 0 6px;
}
.tableRow {
.tableRow,
menu.links {
width: 40%;
}
@ -423,8 +453,8 @@
.downloadContentCellShift {
max-width: 7%;
margin-right: -11px;
margin-left: auto;
margin-right: 24px;
margin-left: 0;
}
.contentCells-icon {
@ -432,13 +462,13 @@
}
.tableRow td:last-child {
width: 12%;
padding-right: 40px;
width: 7%;
padding-right: 0px;
border: none;
}
.contentCells-shift {
padding-right: 35px;
padding-right: 0px;
}
.downloadContentCellShift:after {
@ -502,6 +532,17 @@
justify-content: space-between;
align-items: center;
}
.buttonsMobile.indent {
margin-bottom: 0;
flex-wrap: nowrap;
}
.button.file-type:hover,
.button.file-type {
height: 28px;
width: 100px;
margin-bottom: 10px !important;
font-size: 9px;
}
.button.gray{
margin: 0;
}
@ -513,6 +554,15 @@
height: 56px;
margin-bottom: 24px !important;
}
.button.hoar{
width: 18%;
height: 27px;
margin-bottom: 7px !important;
}
.button.converting{
width: 126px;
margin-top: 0;
}
}
@media (max-width: 560px) and (min-width: 510px) {
@ -521,13 +571,14 @@
}
.downloadContentCellShift {
padding-right: 45px;
padding-right: 16px;
max-width: 4%;
}
}
@media (max-width: 510px) and (min-width: 470px) {
.tableRow {
.tableRow,
menu.links {
width: 35%;
}
@ -540,7 +591,7 @@
.downloadContentCellShift {
max-width: 6%;
padding-right: 37px;
padding-right: 6px;
}
.firstContentCellShift {
@ -553,7 +604,8 @@
}
@media (max-width: 470px) and (min-width: 420px) {
.tableRow {
.tableRow,
menu.links {
width: 30%;
}
.tableRow td:first-child{
@ -565,12 +617,12 @@
.downloadContentCellShift {
max-width: 3%;
padding-right: 37px;
padding-right: 0px;
padding-left: 0;
}
.firstContentCellShift {
margin-left: 1px;
margin-left: 2px;
flex-basis: 14%;
}
@ -587,8 +639,9 @@
}
}
@media (max-width: 420px) and (min-width: 320px) {
.tableRow {
@media (max-width: 420px) {
.tableRow,
menu.links {
width: 25%;
}
@ -599,7 +652,7 @@
.downloadContentCellShift {
max-width: 4%;
margin-right: -18px;
margin-right: 18px;
margin-left: -1px;
}
@ -608,7 +661,7 @@
}
.contentCells-icon{
width: 10%;
width: 12%;
}
footer table td {
margin: 0;
@ -638,7 +691,8 @@
}
}
@media (max-width: 769px) and (min-width: 715px){
.tableRow{
.tableRow,
menu.links {
width: 50%;
}
}
@ -661,7 +715,7 @@
max-width: 45%;
}
}
@media (max-width: 600px) and (min-width: 320px) {
@media (max-width: 600px) {
.main-panel{
display: flex;
flex-direction: column;
@ -687,3 +741,216 @@
max-width: none;
}
}
@media (max-width: 592px) {
body.menu-open {
overflow: hidden;
}
header {
min-width: auto;
height: fit-content;
}
header a {
display: block;
}
header img {
margin: 0;
}
header, footer {
position: -webkit-sticky; /* Safari */
position: sticky;
top: 0;
z-index: 100;
}
.center {
width: 100%;
margin: 0;
}
.left-panel {
background-color: rgba(186, 186, 186, 0.6);
display: none;
flex-direction: row;
align-items: start;
max-width: none;
width: 100%;
margin: 0;
position: fixed;
left: 0;
height: calc(100% - 124px);
z-index:99;
}
.left-panel.active {
display: flex;
}
.help-block {
height: 100%;
margin: 0;
background-color: #F5F5F5;
width: 248px;
padding-left: 16px;
padding-top: 33px;
padding-bottom: 33px;
padding-right: 40px;
box-sizing: border-box;
overflow-y: auto;
overflow-x: hidden;
}
.table-main {
width: 100%;
}
.mobile-close-btn {
display: block;
width: 48px;
height: 48px;
background-color: #E2E2E2;
border-radius: 2px;
border-color: #E2E2E2;
color: #808080;
cursor: pointer;
outline: inherit;
border: none;
}
.main-panel {
width: 100%;
left: 0;
padding: 28px 16px;
}
#portal-info {
width: 100%;
max-width: fit-content;
}
menu.links {
width: 100%;
margin-top: 0;
padding: 0;
}
span.portal-name {
font-size: 16px;
}
span.portal-descr:first-child {
font-size: 13px;
}
span.portal-descr {
font-size: 12px;
}
.user-descr {
width: 100%;
max-width: none;
min-width: auto;
border-bottom: 1px solid #E5E5E5;
padding: 12px 0;
margin: 0;
cursor: pointer;
}
.user-descr ul {
display: none;
}
.user-descr ul.active {
display: block;
}
.user-descr b {
font-size: 13px;
display: flex;
align-items: center;
column-gap: 8px;
margin: 0;
}
.user-descr b::before {
content: url("images/plus.svg");
display: inline-block;
width: 24px;
height: 24px;
}
.storedHeader {
width: 100%;
}
.storedHeaderClearAll {
padding-right: 0;
}
.scroll-table-body {
top: 36px;
}
.scroll-table-body tr:first-child {
padding-top: 0;
}
.tableRow {
border-bottom: 1px solid #e5e5e5;
padding: 16px 0;
width: 100%;
}
.tableRow td:first-child {
width: 100%;
}
.stored-edit span {
font-size: 14px;
}
.header-list {
font-size: 16px;
}
.firstContentCellViewers {
border-bottom: none !important;
}
.firstContentCellViewers ~ td {
border-bottom: none !important;
}
.downloadContentCellShift:after {
display: none;
}
.main-nav {
display: none;
}
.responsive-nav {
height: 44px;
display: flex;
flex-direction: row;
margin: 0;
align-items: center;
column-gap: 16px;
padding: 10px 16px;
width: 100%;
box-sizing: border-box;
list-style: none;
}
.main {
height: calc(100% - 124px);
}
.user-block-table {
height: auto;
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -65,6 +65,14 @@ header img {
margin: 10px 0 22px 32px;
}
.responsive-nav {
display: none;
}
.mobile-close-btn {
display: none;
}
.center {
position:relative;
margin: 0 auto 0;
@ -164,7 +172,7 @@ label .checkbox {
}
.try-editor.form {
background-image: url("images/file_docxf.svg");
background-image: url("images/file_pdf.svg");
}
.side-option {
@ -230,6 +238,79 @@ label .checkbox {
color: #FF6F3D;
}
.button.converting {
margin-top: -20px;
padding: 16px 16px;
}
.button.converting.wide {
padding: 16px 29px;
}
.button.hoar {
background: #EFEFEF;
border: 1px solid #EFEFEF;
margin-right: 7px;
margin-bottom: 7px;
width: 13%;
padding-left: 0;
padding-right: 0;
font-size: 11px;
}
.button.hoar.disable {
opacity: 30%;
cursor: default;
}
.button.hoar:not(.disable):hover {
background: #FF6F3D;
border: 1px solid #FF6F3D;
color: #FFFFFF;
}
.button.hoar.orange {
background: #FF6F3D;
border: 1px solid #FF6F3D;
color: #FFFFFF;
cursor: default;
}
.button.hoar.orange.disable {
background: #444444;
border: 1px solid #444444;
color: #FFFFFF;
cursor: default;
opacity: 100%;
}
.button.file-type {
font-size: 11px;
color: #FFFFFF;
padding: 8px 8px;
margin-right: 10px;
}
.button.file-type.disable {
cursor: default;
}
.button.file-type.pale {
opacity: 30%;
}
.button.file-type.document {
background: #446995;
}
.button.file-type.spreadsheet {
background: #40865C;
}
.button.file-type.presentation {
background: #AA5252;
}
.upload-panel {
float: left;
padding: 24px 0;
@ -271,6 +352,43 @@ label .checkbox {
border-bottom: 1px solid #D0D5DA;
}
.links {
display: flex;
padding: 0;
column-gap: 30px;
align-items: center;
list-style: none;
border-bottom: 1px solid #E2E2E2;
margin: 0;
margin-bottom: 24px;
}
.links li {
padding: 4px;
border-bottom: 2px solid transparent;
margin-bottom: -1px;
}
.links li.active {
border-bottom: 2px solid #FF6F3D;
}
.links li.active a {
color: #FF6F3D;
}
.links li.active a img {
filter: invert(55%) sepia(67%) saturate(2727%) hue-rotate(335deg) brightness(104%) contrast(101%);
}
.links a {
display: inline-block;
padding: 2px 0;
line-height: 20px;
font-size: 13px;
text-decoration: none;
}
#mainProgress {
color: #333333;
display: none;
@ -308,6 +426,32 @@ label .checkbox {
display: none;
}
#convertingProgress {
color: #333333;
display: none;
font-size: 12px;
margin: 30px 35px;
}
#convertingProgress .convertFileName{
background-position: left center;
background-repeat: no-repeat;
display: block;
font-size: 14px;
line-height: 160%;
overflow: hidden;
padding-left: 28px;
margin-bottom: 16px;
text-overflow: ellipsis;
white-space: nowrap;
}
#convertingProgress .describeUpload {
line-height: 150%;
letter-spacing: -0.02em;
padding: 16px 0;
}
.error-message {
background: url("images/error.svg") no-repeat scroll 4px 10px;
color: #CB0000;
@ -329,6 +473,10 @@ label .checkbox {
padding-left: 35px;
}
.waiting {
opacity: 30%;
}
.current {
background-image: url("images/loader16.gif");
}
@ -341,6 +489,12 @@ label .checkbox {
background-image: url("images/notdone.svg");
}
.convertPercent {
color: #FF6F3D;
font-weight: 700;
display: inline;
}
.step-descr {
display: block;
margin-left: 35px;
@ -348,15 +502,15 @@ label .checkbox {
line-height: 188%;
}
.step-descr.disable {
display: none;
}
.progress-descr {
letter-spacing: -0.02em;
line-height: 150%;
}
#loadScripts {
display: none;
}
#iframeScripts {
position: absolute;
visibility: hidden;
@ -449,21 +603,35 @@ footer table tr td:first-child {
white-space: nowrap;
}
.convertFileName.word,
.stored-edit.word,
.uploadFileName.word {
background-image: url("images/icon_docx.svg");
}
.convertFileName.cell,
.stored-edit.cell,
.uploadFileName.cell {
background-image: url("images/icon_xlsx.svg");
}
.convertFileName.slide,
.stored-edit.slide,
.uploadFileName.slide {
background-image: url("images/icon_pptx.svg");
}
.convertFileName.pdf,
.stored-edit.pdf,
.uploadFileName.pdf {
background-image: url("images/icon_pdf.svg");
}
.stored-edit.diagram,
.uploadFileName.diagram {
background-image: url("images/icon_vsdx.svg");
}
.stored-edit span {
font-size: 12px;
line-height: 12px;
@ -515,6 +683,11 @@ footer table tr td:first-child {
visibility: hidden;
}
.convertTable {
margin-top: 10px;
margin-left: 35px;
}
.tableRow {
background: transparent;
-moz-transition: all 0.2s ease-in-out;
@ -561,6 +734,12 @@ footer table tr td:first-child {
width: 11%;
}
.tableHeaderCellAction{
width: 13%;
text-align: right;
padding-right: 88px;
}
.tableHeaderCellDownload {
width: 13%;
text-align: right;
@ -585,13 +764,36 @@ footer table tr td:first-child {
}
.contentCells-shift {
padding-right: 44px;
padding-right: 43px;
}
.contentCells-icon {
width: 4%;
}
.storedHeader {
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
}
.storedHeaderClearAll {
padding-right: 52px;
}
.clear-all {
display: inline-block;
width: 100px;
padding: 2px;
outline: 1px solid #E5E5E5;
text-align: center;
cursor:pointer;
text-transform: uppercase;
background-color: #F5F5F5;
color: #666666;
}
.select-user {
color: #444444;
font-family: Open Sans;
@ -626,7 +828,7 @@ footer table tr td:first-child {
width: 100%;
}
.icon-delete {
.icon-action {
cursor: pointer;
}
@ -705,6 +907,13 @@ html {
position: relative;
}
.typeButtonsRow {
width: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: row;
position: relative;
}
.tableRow td:first-child {
display: flex;
@ -713,11 +922,11 @@ html {
}
.tableHeaderCellFileName {
width: 30%;
width: 20%;
}
.tableHeaderCellEditors {
width: 28%;
width: 20%;
}
.tableHeaderCellViewers {
@ -741,6 +950,16 @@ html {
margin-left: 25px;
}
.buttonsMobile.indent{
padding-left: 35px;
margin-top: 10px;
margin-bottom: 10px;
}
.invisible {
display: none;
}
.tooltip {
background: #FFFFFF;
border-radius: 5px;

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,10 +17,13 @@
*/
using System;
using System.Collections.Generic;
using System.Collections;
using System.IO;
using System.Web.Mvc;
using OnlineEditorsExampleMVC.Helpers;
using OnlineEditorsExampleMVC.Models;
using System.Web.Configuration;
namespace OnlineEditorsExampleMVC.Controllers
{
@ -31,6 +34,46 @@ namespace OnlineEditorsExampleMVC.Controllers
return View();
}
public ActionResult Forgotten()
{
if (!bool.Parse(WebConfigurationManager.AppSettings["enable-forgotten"]))
{
ViewData["Message"] = "The forgotten page is disabled";
return View("~/Views/Shared/Error.aspx");
}
var files = new List<Dictionary<string, string>>();
try
{
var response = TrackManager.commandRequest("getForgottenList", null);
ArrayList keys = (ArrayList)response["keys"];
// fetch all the forgotten files from the document server
foreach (string key in keys)
{
var file = new Dictionary<string, string>();
var fileResult = TrackManager.commandRequest("getForgotten", key);
file.Add("key", fileResult["key"].ToString());
file.Add("url", fileResult["url"].ToString());
file.Add(
"type",
FileUtility.GetFileType(fileResult["url"].ToString())
.ToString()
.ToLower()
);
files.Add(file);
}
}
catch (Exception ex)
{
System.Diagnostics.Debug.WriteLine(ex.Message);
}
return View("Forgotten", new ForgottenFilesModel(files));
}
// viewing file in the editor
public ActionResult Editor(string fileName, string editorsMode, string editorsType, string directUrl)
{
@ -52,7 +95,7 @@ namespace OnlineEditorsExampleMVC.Controllers
var id = Request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id);
DocManagerHelper.CreateMeta(fileName, user.id, user.name); // create meta information for the sample document
Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName }));
Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName, editorsMode="edit" }));
return null;
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -217,7 +217,9 @@ namespace OnlineEditorsExampleMVC.Helpers
var directoryInfo = new DirectoryInfo(directory);
// take files from the root directory
List<FileInfo> storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly).ToList();
List<FileInfo> storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly)
.OrderByDescending(f => f.LastWriteTimeUtc)
.ToList();
return storedFiles;
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -83,7 +83,8 @@ namespace OnlineEditorsExampleMVC.Helpers
bool isAsync,
out Dictionary<string, string> convertedDocumentData,
string filePass = null,
string lang = null)
string lang = null,
string fileName = null)
{
convertedDocumentData = new Dictionary<string, string>();
@ -91,7 +92,7 @@ namespace OnlineEditorsExampleMVC.Helpers
fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri).ToLower() : fromExtension;
// check if the file name parameter is defined; if not, get random uuid for this file
var title = Path.GetFileName(documentUri);
var title = string.IsNullOrEmpty(fileName) ? Path.GetFileName(documentUri) : fileName;
title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
// get document key
@ -225,10 +226,14 @@ namespace OnlineEditorsExampleMVC.Helpers
private static void ProcessResponseError(int errorCode)
{
var errorMessage = string.Empty;
const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
const string errorMessageTemplate = "Error occurred in the ConvertService: {0}";
switch (errorCode)
{
case -9:
// public const int c_nErrorConversionOutputFormatError = -9;
errorMessage = String.Format(errorMessageTemplate, "Error conversion output format");
break;
case -8:
// public const int c_nErrorFileVKey = -8;
errorMessage = String.Format(errorMessageTemplate, "Error document VKey");

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -20,6 +20,7 @@ using JWT;
using JWT.Algorithms;
using JWT.Builder;
using JWT.Serializers;
using System;
using System.Collections.Generic;
using System.Web.Configuration;
@ -30,17 +31,25 @@ namespace OnlineEditorsExampleMVC.Helpers
private static readonly string Secret;
public static readonly bool Enabled;
public static readonly bool SignatureUseForRequest;
public static readonly int ExpiresIn;
static JwtManager()
{
Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? ""; // get token secret from the config parameters
Enabled = !string.IsNullOrEmpty(Secret); // check if the token is enabled
ExpiresIn = int.Parse(WebConfigurationManager.AppSettings["files.docservice.token.expires-in"]);
SignatureUseForRequest = bool.Parse(WebConfigurationManager.AppSettings["files.docservice.token.useforrequest"]);
}
// encode a payload object into a token using a secret key
public static string Encode(IDictionary<string, object> payload)
{
var now = (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
var expires = now + ExpiresIn * 60;
payload["iat"] = now;
payload["exp"] = expires;
var encoder = new JwtEncoder(new HMACSHA256Algorithm(),
new JsonNetSerializer(),
new JwtBase64UrlEncoder());

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -282,7 +282,7 @@ namespace OnlineEditorsExampleMVC.Helpers
}
// create a command request
public static void commandRequest(string method, string key, object meta = null)
public static Dictionary<string, object> commandRequest(string method, string key, object meta = null)
{
DocManagerHelper.VerifySSL();
@ -345,6 +345,7 @@ namespace OnlineEditorsExampleMVC.Helpers
{
throw new Exception(dataResponse);
}
return responseObj;
}
// save file

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -26,12 +26,12 @@ namespace OnlineEditorsExampleMVC.Helpers
static List<string> descr_user_1 = new List<string>()
{
"File author by default",
"Doesnt belong to any group",
"Doesn't belong to any group",
"Can review all the changes",
"Can perform all actions with comments",
"The file favorite state is undefined",
"Can create files from templates using data from the editor",
"Can see the information about all users",
"This file isn't marked as favorite",
"Can create files from templates using data from the editor",
"Has an avatar",
"Can submit forms"
};
@ -41,11 +41,11 @@ namespace OnlineEditorsExampleMVC.Helpers
"Belongs to Group2",
"Can review only his own changes or changes made by users with no group",
"Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
"Can see the information about users from Group2 and users who don't belong to any group",
"This file is marked as favorite",
"Can create new files from the editor",
"Can see the information about users from Group2 and users who dont belong to any group",
"Has an avatar",
"Cant submit forms"
"Can't submit forms"
};
static List<string> descr_user_3 = new List<string>()
@ -53,30 +53,34 @@ namespace OnlineEditorsExampleMVC.Helpers
"Belongs to Group3",
"Can review changes made by Group2 users",
"Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users",
"This file isnt marked as favorite",
"Cant copy data from the file to clipboard",
"Cant download the file",
"Cant print the file",
"Can create new files from the editor",
"Can see the information about Group2 users",
"Cant submit forms"
"The file favorite state is undefined",
"Can't copy data from the file to clipboard",
"Can't download the file",
"Can't print the file",
"Can create new files from the editor",
"Can't submit forms",
"Can't close history",
"Can't restore the file version"
};
static List<string> descr_user_0 = new List<string>()
{
"The name is requested when the editor is opened",
"Doesnt belong to any group",
"Doesn't belong to any group",
"Can review all the changes",
"Can perform all actions with comments",
"Can't see anyone's information",
"The file favorite state is undefined",
"Can't mention others in comments",
"Can't create new files from the editor",
"Cant see anyones information",
"Can't rename files from the editor",
"Can't view chat",
"Can't protect file",
"View file without collaboration",
"Cant submit forms"
"Can't refresh outdated file",
"Can't submit forms",
"Tour of tips when opening a document"
};
private static List<User> users = new List<User>() {
@ -88,11 +92,13 @@ namespace OnlineEditorsExampleMVC.Helpers
null,
new Dictionary<string, object>(),
null,
null,
false,
new List<string>(),
descr_user_1,
true,
true
true,
new Goback(null, false),
new Close(null, false)
),
new User(
"uid-2",
@ -111,7 +117,9 @@ namespace OnlineEditorsExampleMVC.Helpers
new List<string>(),
descr_user_2,
false,
true
true,
new Goback("Go to Documents", null),
new Close(null, true)
),
new User(
"uid-3",
@ -126,11 +134,13 @@ namespace OnlineEditorsExampleMVC.Helpers
{ "remove", new List<string>() { } }
},
new List<string>() { "group-2" },
false,
null,
new List<string>() { "copy", "download", "print" },
descr_user_3,
false,
false
false,
null,
new Close(null, true)
),
new User(
"uid-0",
@ -144,7 +154,9 @@ namespace OnlineEditorsExampleMVC.Helpers
new List<string>() { "protect" },
descr_user_0,
false,
false
false,
null,
null
)
};
@ -235,7 +247,10 @@ namespace OnlineEditorsExampleMVC.Helpers
public List<string> userInfoGroups;
public bool avatar;
public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
public Goback goback;
public Close close;
public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar, Goback goback, Close close)
{
this.id = id;
this.name = name;
@ -249,6 +264,36 @@ namespace OnlineEditorsExampleMVC.Helpers
this.templates = templates;
this.userInfoGroups = userInfoGroups;
this.avatar = avatar;
this.goback = goback;
this.close = close;
}
}
public class Goback
{
public string text;
public bool? blank;
public Goback(){}
public Goback(string text, bool? blank)
{
this.text = text;
this.blank = blank;
}
}
public class Close
{
public string text;
public bool visible;
public Close(){}
public Close(string text, bool visible)
{
this.text = text;
this.visible = visible;
}
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -88,7 +88,7 @@ namespace OnlineEditorsExampleMVC.Models
editorsMode = "fillForms";
canEdit = true;
}
var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1"); // check if the Submit form button is displayed or not
var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1"); // check if the Submit form button is displayed or not
var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // set the mode parameter: change it to view if the document can't be edited
// favorite icon state
@ -157,7 +157,7 @@ namespace OnlineEditorsExampleMVC.Models
{ "download", !user.deniedPermissions.Contains("download") },
{ "edit", canEdit && (editorsMode == "edit" || editorsMode == "view" || editorsMode == "filter" || editorsMode == "blockcontent") },
{ "print", !user.deniedPermissions.Contains("print") },
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
{ "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "blockcontent" },
{ "modifyFilter", editorsMode != "filter" },
{ "modifyContentControl", editorsMode != "blockcontent" },
{ "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },
@ -214,9 +214,24 @@ namespace OnlineEditorsExampleMVC.Models
{ "forcesave", false }, // adds the request for the forced file saving to the callback handler
{ "submitForm", submitForm }, // if the Submit form button is displayed or not
{
"goback", new Dictionary<string, object> // settings for the Open file location menu button and upper right corner button
"goback", user.goback != null ? new Dictionary<string, object> // settings for the Open file location menu button and upper right corner button
{
{ "url", DocManagerHelper.GetServerUrl(false) } // the absolute URL to the website address which will be opened when clicking the Open file location menu button
{ "url", DocManagerHelper.GetServerUrl(false) }, // the absolute URL to the website address which will be opened when clicking the Open file location menu button
{ "text", user.goback.text },
{ "blank", user.goback.blank }
} : new Dictionary<string, object>{}
},
{
"close", user.close != null ? new Dictionary<string, object>
{
{ "text", user.close.text },
{ "visible", user.close. visible }
} : new Dictionary<string, object>{}
},
{
"features", new Dictionary<string, object>
{
{ "featuresTips", user.id.Equals("uid-0") }
}
}
}
@ -289,20 +304,20 @@ namespace OnlineEditorsExampleMVC.Models
{
Path = HttpRuntime.AppDomainAppVirtualPath
+ (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+ "Content\\images\\logo.png"
+ "Content\\images\\logo.svg"
};
var directMailMergeUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
{
Path = HttpRuntime.AppDomainAppVirtualPath
+ (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+ "Content\\images\\logo.png"
+ "Content\\images\\logo.svg"
};
// create a logo config
var logoConfig = new Dictionary<string, object>
{
{ "fileType", "png"},
{ "fileType", "svg"},
{ "url", mailMergeUrl.ToString()}
};
@ -371,7 +386,7 @@ namespace OnlineEditorsExampleMVC.Models
var jss = new JavaScriptSerializer();
var id = request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id);
usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null;
usersForMentions = jss.Serialize(!user.id.Equals("uid-0") ? Users.getUsersForMentions(user.id) : null);
}
public void GetUsersInfo(HttpRequest request, out string usersInfo)
@ -388,7 +403,7 @@ namespace OnlineEditorsExampleMVC.Models
var jss = new JavaScriptSerializer();
var id = request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id);
usersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForProtect(user.id)) : null;
usersForProtect = jss.Serialize(!user.id.Equals("uid-0") ? Users.getUsersForProtect(user.id) : null);
}
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -23,6 +23,7 @@ using System.IO;
using static OnlineEditorsExampleMVC.Models.FileUtility;
using System.Linq;
using System.Text;
using Newtonsoft.Json.Converters;
namespace OnlineEditorsExampleMVC.Models
{
@ -30,9 +31,12 @@ namespace OnlineEditorsExampleMVC.Models
{
public enum FileType
{
Null,
Word,
Cell,
Slide
Slide,
Pdf,
Diagram
}
// get file type
@ -40,17 +44,31 @@ namespace OnlineEditorsExampleMVC.Models
{
var ext = Path.GetExtension(fileName).ToLower();
if (FormatManager.PdfExtensions().Contains(ext)) return FileType.Pdf; // pdf type for document extensions
if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word; // word type for document extensions
if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell; // cell type for spreadsheet extensions
if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide; // slide type for presentation extensions
if (FormatManager.DiagramExtensions().Contains(ext)) return FileType.Diagram; // diagram type for diagram extensions
return FileType.Word; // the default type is word
return FileType.Null; // the default type is word
}
}
public class EmptyTolerantStringEnumConverter : StringEnumConverter
{
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
if (reader.TokenType == JsonToken.String && string.IsNullOrWhiteSpace(reader.Value.ToString()))
return Activator.CreateInstance(objectType);
return base.ReadJson(reader, objectType, existingValue, serializer);
}
}
public class Format
{
public string Name { get; }
[JsonConverter(typeof(EmptyTolerantStringEnumConverter))]
public FileType Type { get; }
public List<string> Actions { get; }
public List<string> Convert { get; }
@ -172,6 +190,34 @@ namespace OnlineEditorsExampleMVC.Models
.ToList();
}
public static List<string> PdfExtensions()
{
return Pdfs()
.Select(format => format.Extension())
.ToList();
}
public static List<Format> Pdfs()
{
return All()
.Where(format => format.Type == FileType.Pdf)
.ToList();
}
public static List<string> DiagramExtensions()
{
return Diagrams()
.Select(format => format.Extension())
.ToList();
}
public static List<Format> Diagrams()
{
return All()
.Where(format => format.Type == FileType.Diagram)
.ToList();
}
public static List<string> AllExtensions()
{
return All()

View File

@ -0,0 +1,30 @@
/**
*
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
using System.Collections.Generic;
namespace OnlineEditorsExampleMVC.Models
{
// create file model
public class ForgottenFilesModel
{
public List<Dictionary<string, string>> files { get; set; }
public ForgottenFilesModel(List<Dictionary<string, string>> files) { this.files = files; }
}
}

View File

@ -116,6 +116,7 @@
<Compile Include="Helpers\Utils.cs" />
<Compile Include="Models\FileModel.cs" />
<Compile Include="Models\FileUtility.cs" />
<Compile Include="Models\ForgottenFilesModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WebEditor.ashx.cs">
<DependentUpon>WebEditor.ashx</DependentUpon>
@ -123,6 +124,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Content\editor.css" />
<Content Include="Content\forgotten.css" />
<Content Include="Content\images\block-content.svg" />
<Content Include="Content\images\cell.ico" />
<Content Include="Content\images\close.svg" />
@ -140,18 +142,20 @@
<Content Include="Content\images\file_xlsx.svg" />
<Content Include="Content\images\fill-forms.svg" />
<Content Include="Content\images\filter.svg" />
<Content Include="Content\images\home.svg" />
<Content Include="Content\images\icon_docx.svg" />
<Content Include="Content\images\icon_pptx.svg" />
<Content Include="Content\images\icon_xlsx.svg" />
<Content Include="Content\images\info.svg" />
<Content Include="Content\images\loader16.gif" />
<Content Include="Content\images\logo.png" />
<Content Include="Content\images\logo.svg" />
<Content Include="Content\images\mobile-fill-forms.svg" />
<Content Include="Content\images\mobile.svg" />
<Content Include="Content\images\notdone.svg" />
<Content Include="Content\images\review.svg" />
<Content Include="Content\images\slide.ico" />
<Content Include="Content\images\uid-1.png" />
<Content Include="Content\images\uid-2.png" />
<Content Include="Content\images\word.ico" />
<Content Include="Content\jquery-ui.css" />
<Content Include="Content\media.css" />
@ -159,6 +163,10 @@
<Content Include="favicon.ico" />
<Content Include="Global.asax" />
<Content Include="LICENSE" />
<Content Include="Scripts\forgotten.js" />
<Content Include="Scripts\formats.js" />
<Content Include="Scripts\jquery-3.6.4.js" />
<Content Include="Scripts\jquery-migrate-3.4.1.js" />
<Content Include="Scripts\jquery-ui.js" />
<Content Include="Scripts\jquery.blockUI.js" />
<Content Include="Scripts\jquery.dropdownToggle.js" />
@ -166,17 +174,13 @@
<Content Include="Scripts\jquery.iframe-transport.js" />
<Content Include="Scripts\jscript.js" />
<Content Include="Views\Home\Editor.aspx" />
<Content Include="Views\Home\Forgotten.aspx" />
<Content Include="Views\Home\Index.aspx" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Views\Web.config" />
<Content Include="Views\Shared\Error.aspx" />
<Content Include="licenses\EntityFramework.license" />
<Content Include="licenses\Microsoft.Web.Infrastructure.license" />
<Content Include="licenses\Newtonsoft.Json.license" />
<Content Include="licenses\jquery.license" />
<Content Include="licenses\WebGrease.license" />
<Content Include="web.appsettings.config" />
<Content Include="WebEditor.ashx" />
</ItemGroup>

View File

@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Ascensio System SIA")]
[assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
[assembly: AssemblyCopyright("Ascensio System SIA 2023")]
[assembly: AssemblyCopyright("Ascensio System SIA 2025")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@ -12,7 +12,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
## Step 2. Download the .Net (C# MVC) code for the editors integration
Download the [.Net (C# MVC) example](https://api.onlyoffice.com/editors/demopreview) from our site.
Download the [.Net (C# MVC) example](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/) from our site.
To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *web.appsettings.config* file:
```
@ -21,7 +21,7 @@ To connect the editors to your website, specify the path to the editors installa
```
where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-path** is the path where files will be created and stored. You can set an absolute path.
If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) in the *DocEditor.aspx* file.
If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/docs/docs-api/usage-api/advanced-parameters/) in the *DocEditor.aspx* file.
## Step 3. Install the prerequisites
Сheck if your system meets the system requirements:
@ -38,7 +38,15 @@ Configure the IIS components for the server to work correctly:
* **Common HTTP Features**: Default Document,
* **Security**: Request Filtering.
## Step 4. Run your website with the editors
## Step 4. Configure JWT
Open the *web.appsettings.config* file and [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT:
```
<add key="files.docservice.secret" value="secret" />
```
## Step 5. Run your website with the editors
1. Run the Internet Information Service (IIS) Manager:
**Start** -> **Control Panel** -> **System and Security** -> **Administrative Tools** -> **Internet Information Services (IIS) Manager**
@ -65,7 +73,7 @@ Configure the IIS components for the server to work correctly:
![browse](screenshots/browse.png)
## Step 5. Check accessibility
## Step 6. Check accessibility
In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,17 +16,22 @@
*
*/
package com.onlyoffice.integration.documentserver.callbacks;
function deleteFile(event) {
let filename = event.currentTarget.getAttribute("data");
filename = encodeURIComponent(filename);
let url = `webeditor.ashx?type=removeforgotten&filename=${filename}`;
import com.onlyoffice.integration.dto.Track;
import org.springframework.beans.factory.annotation.Autowired;
// specify the callback handler functions
public interface Callback {
int handle(Track body, String fileName); // handle the callback
int getStatus(); // get document status
@Autowired
default void selfRegistration(CallbackHandler callbackHandler) { // register a callback handler
callbackHandler.register(getStatus(), this);
}
fetch(url, {
headers: {
"Content-Type": "application/json",
}
}).then(result => {
if(result.status == 204) {
document.location.reload(true);
}
});
}
document.querySelectorAll('.delete-file').forEach(el => {
el.addEventListener('click', deleteFile);
});

View File

@ -0,0 +1,66 @@
/**
*
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
class Format {
constructor(name, type, actions, convert, mime) {
this.name = name;
this.type = type;
this.actions = actions;
this.convert = convert;
this.mime = mime;
}
isAutoConvertible() {
return this.actions.includes('auto-convert');
}
isEditable() {
return this.actions.includes('edit') || this.actions.includes('lossy-edit');
}
isFillable() {
return this.actions.includes('fill');
}
}
class FormatManager {
formats = [];
constructor(formats) {
if(Array.isArray(formats)) this.formats = formats;
}
findByExtension(extension) {
return this.formats.find(format => format.name == extension);
}
isAutoConvertible(extension) {
let format = this.findByExtension(extension);
return format !== undefined && format.isAutoConvertible();
}
isEditable(extension) {
let format = this.findByExtension(extension);
return format !== undefined && format.isEditable();
}
isFillable(extension) {
let format = this.findByExtension(extension);
return format !== undefined && format.isFillable();
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,6 +17,27 @@
*/
var directUrl;
var formatManager;
window.onload = function () {
fetch("webeditor.ashx?type=formats")
.then((response) => response.json())
.then((data) => {
if (data.formats) {
let formats = [];
data.formats.forEach(format => {
formats.push(new Format(
format.Name,
format.Type,
format.Actions,
format.Convert,
format.Mime
));
});
formatManager = new FormatManager(formats);
}
})
}
if (typeof jQuery != "undefined") {
jq = jQuery.noConflict();
@ -87,8 +108,8 @@ if (typeof jQuery != "undefined") {
});
var timer = null;
var checkConvert = function (filePass) {
filePass = filePass ? filePass : null;
var checkConvert = function (filePass, fileType) {
filePass = filePass ? filePass : null;
if (timer != null) {
clearTimeout(timer);
}
@ -100,12 +121,12 @@ if (typeof jQuery != "undefined") {
jq("#filePass").val("");
var fileName = jq("#hiddenFileName").val();
var posExt = fileName.lastIndexOf('.');
var posExt = fileName.lastIndexOf('.') + 1;
posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
if (ConverExtList.indexOf(posExt) == -1) {
if (!formatManager.isAutoConvertible(posExt)) {
jq("#step2").addClass("done").removeClass("current");
loadScripts();
onuploaded();
return;
}
@ -116,7 +137,7 @@ if (typeof jQuery != "undefined") {
contentType: "text/xml",
type: "post",
dataType: "json",
data: JSON.stringify({ filename: fileName, filePass: filePass }),
data: JSON.stringify({ filename: fileName, filePass: filePass, fileExt: fileType }),
url: UrlConverter,
complete: function (data) {
var responseText = data.responseText;
@ -132,6 +153,22 @@ if (typeof jQuery != "undefined") {
}
return;
} else {
if (response.error.includes("Error conversion output format")) {
let format = formatManager.findByExtension(fileName.split(".").pop());
if (!format.convert.includes("docx")) {
jq(".document").addClass("invisible")
}
if (!format.convert.includes("xlsx")) {
jq(".spreadsheet").addClass("invisible")
}
if (!format.convert.includes("pptx")) {
jq(".presentation").addClass("invisible")
}
jq("#select-file-type").removeClass("invisible");
jq("#step2").removeClass("current");
jq("#hiddenFileName").attr("placeholder", filePass);
return;
}
jq(".current").removeClass("current");
jq(".step:not(.done)").addClass("error");
jq("#mainProgress .error-message").show().find("span").text(response.error);
@ -143,45 +180,25 @@ if (typeof jQuery != "undefined") {
jq("#hiddenFileName").val(response.filename);
if (response.step && response.step < 100) {
checkConvert(filePass);
checkConvert(filePass, fileType);
} else {
jq("#uploadFileName").text(response.filename);
jq("#step2").addClass("done").removeClass("current");
loadScripts();
onuploaded();
}
}
});
}, 1000);
};
var loadScripts = function () {
if (!jq("#mainProgress").is(":visible")) {
return;
}
jq("#step3").addClass("current");
if (jq("#loadScripts").is(":empty")) {
var urlScripts = jq("#loadScripts").attr("data-docs");
var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
jq("#loadScripts").html(frame);
document.getElementById("iframeScripts").onload = onloadScripts;
jq("#loadScripts iframe").attr("src", urlScripts);
} else {
onloadScripts();
}
};
var onloadScripts = function () {
if (!jq("#mainProgress").is(":visible")) {
return;
}
jq("#step3").addClass("done").removeClass("current");
var onuploaded = function () {
jq("#beginView, #beginEmbedded").removeClass("disable");
var fileName = jq("#hiddenFileName").val();
var posExt = fileName.lastIndexOf('.');
var posExt = fileName.lastIndexOf('.') + 1;
posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : '';
if (EditedExtList.indexOf(posExt) != -1 || FillExtList.indexOf(posExt) != -1) {
if (formatManager.isEditable(posExt) || formatManager.isFillable(posExt)) {
jq("#beginEdit").removeClass("disable");
}
};
@ -213,6 +230,15 @@ if (typeof jQuery != "undefined") {
});
};
jq(document).on("click", ".file-type:not(.disable)", function () {
const currentElement = jq(this);
var fileType = currentElement.attr("data");
var filePass = jq("#hiddenFileName").attr("placeholder");
jq('.file-type').addClass(["disable", "pale"]);
currentElement.removeClass("pale");
checkConvert(filePass, fileType);
});
jq(document).on("click", "#enterPass", function () {
var filePass = jq("#filePass").val();
if (filePass) {
@ -227,7 +253,7 @@ if (typeof jQuery != "undefined") {
jq(document).on("click", "#skipPass", function () {
jq("#blockPassword").hide();
loadScripts();
onuploaded();
});
jq(document).on("click", "#beginEdit:not(.disable)", function () {
@ -258,6 +284,133 @@ if (typeof jQuery != "undefined") {
jq("#embeddedView").attr("src", url);
});
jq(document).on("click", "#beginEditConverted:not(.disable)", function () {
var fileId = encodeURIComponent(jq('#hiddenFileName').attr("data"));
var url = UrlEditor + "?fileName=" + fileId;
window.open(url, "_blank");
jq('#hiddenFileName').val("");
jq.unblockUI();
document.location.reload();
});
jq(document).on("click", "#beginViewConverted:not(.disable)", function () {
var fileId = encodeURIComponent(jq('#hiddenFileName').attr("data"));
var url = UrlEditor + "?editorsMode=view&fileName=" + fileId;
window.open(url, "_blank");
jq('#hiddenFileName').val("");
jq.unblockUI();
document.location.reload();
});
jq(document).on("click", "#downloadConverted:not(.disable)", function () {
var fileId = jq('#hiddenFileName').attr("data");
if (jq("#downloadConverted").attr("data") == "fromConverter") window.location.assign(fileId);
else window.open("webeditor.ashx?type=download&fileName=" + encodeURIComponent(fileId), "_blank");
});
jq(document).on("click", ".convert-file", function () {
const currentElement = jq(this);
var fileName = currentElement.attr("data");
var type = currentElement.attr("data-type");
jq.blockUI({
theme: true,
title: "Converting file" + "<div class=\"dialog-close\"></div>",
message: jq("#convertingProgress"),
overlayCSS: { "background-color": "#aaa" },
themedCSS: { width: "539px", top: "20%", left: "50%", marginLeft: "-269px" }
});
jq("#convertFileName").text(decodeURIComponent(fileName));
jq("#convertFileName").removeClass("word slide cell");
jq("#convertFileName").addClass(type);
jq("#convTypes").empty();
let format = formatManager.findByExtension(fileName.split('.').pop());
if (format) {
format.convert.forEach(ext => {
jq("#convTypes").append(jq(`<td name="convertingTypeButton" id="wordTo${ext}" class="button hoar" data="${ext}">${ext}</td>`));
});
}
jq("#hiddenFileName").val(fileName);
jq("#convertStep1").addClass("error");
jq("#convertStep2").addClass("waiting");
});
jq(document).on("click", "td[name='convertingTypeButton']:not(.disable, .orange)", function () {
const currentElement = jq(this);
let id = currentElement[0].id;
let fileExt = jq(`#${id}`).attr("data");
jq(`#${id}`).addClass("orange");
jq("td[name='convertingTypeButton']").addClass("disable");
jq("#convertStep1").removeClass("error").addClass("done");
jq("#convertStep2").removeClass("waiting").removeClass("done").addClass("current");
jq("#convertStep2").text('2. File conversion');
jq("#convert-descr").removeClass("disable");
jq("#convertPercent").text("0 %");
jq("#hiddenFileName").attr("placeholder",fileExt);
jq("#downloadConverted").addClass("disable");
jq("#beginEditConverted").addClass("disable");
jq("#beginViewConverted").addClass("disable");
mustReload = true;
convertFile();
});
function convertFile (filePass) {
let fileName = decodeURIComponent(jq("#hiddenFileName").val());
let fileExt = jq("#hiddenFileName").attr("placeholder");
filePass = filePass ? filePass : null;
if (timer != null) {
clearTimeout(timer);
}
timer = setTimeout(function () {
jq.ajax({
async: true,
contentType: "text/xml",
type: "post",
dataType: "json",
data: JSON.stringify({filename: fileName, filePass: filePass, lang: language, fileExt: fileExt, keepOriginal: true}),
url: UrlConverter,
complete: function (data) {
try {
var response = jq.parseJSON(data.responseText);
} catch (e) {
response = { error: e };
}
if (!response.filename && !response.step && response.error) {
jq("#convertStep2").removeClass("current").addClass("error");
jq("#convertStep2").text(`2. File conversion to ${fileExt}`);
jq("#convert-error").removeClass("hidden");
jq("#convert-error").text(`${response.error}`);
jq("td[name='convertingTypeButton']").removeClass("disable orange");
return;
}
if (response.step != undefined && response.step != 100) {
jq("#convertPercent").text(`${response.step} %`);
convertFile();
} else {
jq("#convertPercent").text(`${response.step} %`);
jq("#convertStep2").removeClass("current").addClass("done");
jq("#convertStep2").text(`2. File conversion to ${fileExt}`);
jq("#downloadConverted").removeClass("disable");
jq("#hiddenFileName").attr("data",response.filename);
if (response.error !== "FileTypeIsNotSupported") {
jq("#beginEditConverted").removeClass("disable");
jq("#beginViewConverted").removeClass("disable");
jq("#downloadConverted").attr("data","fromStorage");
} else {
jq("#downloadConverted").attr("data","fromConverter");
}
jq("td[name='convertingTypeButton']").removeClass("disable orange");
}
}
});
}, 1000);
}
jq(document).on("click", "#cancelEdit, .dialog-close", function () {
jq('#hiddenFileName').val("");
jq("#embeddedView").attr("src", "");
@ -294,6 +447,23 @@ if (typeof jQuery != "undefined") {
});
});
jq(document).on("click", ".clear-all", function () {
if (confirm("Delete all the files?")) {
var requestAddress = "webeditor.ashx"
+ "?type=remove";
jq.ajax({
async: true,
contentType: "text/xml",
url: requestAddress,
complete: function (data) {
if (JSON.parse(data.responseText).success) {
window.location.reload(true);
}
}
});
}
});
function showUserTooltip (isMobile) {
if ( jq("div#portal-info").is(":hidden") ) {
jq("div#portal-info").show();
@ -368,4 +538,27 @@ if (typeof jQuery != "undefined") {
}).mouseout(function () {
jq("div.tooltip").remove();
});
}
}
function toggleSidePanel(event) {
event.preventDefault();
let sidePanel = document.querySelector(".left-panel");
let body = document.querySelector("body");
if (sidePanel.classList.contains("active")) {
sidePanel.classList.remove("active");
body.classList.remove("menu-open");
} else {
sidePanel.classList.add("active")
body.classList.add("menu-open");
}
}
function toggleUserDescr(event) {
let list = event.currentTarget.querySelector("ul");
let cursor = window.getComputedStyle(event.currentTarget).getPropertyValue("cursor");
if (cursor === "pointer") {
if (list.classList.contains("active")) list.classList.remove("active");
else list.classList.add("active");
}
}

View File

@ -14,7 +14,7 @@
<meta name="mobile-web-app-capable" content="yes" />
<!--
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -62,13 +62,13 @@
// the document is modified
var onDocumentStateChange = function (event) {
var title = document.title.replace(/\*$/g, "");
document.title = title + (event.data ? "*" : "");
var title = document.title.replace(/^\*/g, "");
document.title = (event.data ? "*" : "") + title;
};
// the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), "");
location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
};
// an error or some other specific event occurs
@ -106,9 +106,22 @@
docEditor.setActionLink(replaceActionLink(location.href, linkParam)); // set the link to the document which contains a bookmark
};
var onRequestClose = function () { // close editor
docEditor.destroyEditor();
innerAlert("Document editor closed successfully");
};
var onUserActionRequired = function () {
console.log("User action required");
};
// the meta information of the document is changed via the meta command
var onMetaChange = function (event) {
if (event.data.favorite) {
if (event.data.title !== undefined) {
document.title = event.data.title + " - ONLYOFFICE";
}
if (event.data.favorite !== undefined) {
var favorite = !!event.data.favorite;
var title = document.title.replace(/^\☆/g, "");
document.title = (favorite ? "☆" : "") + title;
@ -182,6 +195,18 @@
}
};
var onRequestRefreshFile = function(event) {
let xhr = new XMLHttpRequest();
xhr.open("GET", "webeditor.ashx?type=config&fileName=" + encodeURIComponent(config.document.title) +
"&directUrl=" + !!config.document.directUrl +
"&permissions=" + encodeURIComponent(JSON.stringify(config.document.permissions)));
xhr.send();
xhr.onload = function () {
innerAlert(xhr.responseText);
docEditor.refreshFile(JSON.parse(xhr.responseText));
};
};
var onRequestOpen = function (event) { // user open external data source
innerAlert("onRequestOpen");
var windowName = event.data.windowName;
@ -218,6 +243,52 @@
}
};
var onRequestReferenceSource = function (event) {
innerAlert("onRequestReferenceSource");
let xhr = new XMLHttpRequest();
xhr.open("GET", "webeditor.ashx?type=files");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.send();
xhr.onload = function () {
if (xhr.status === 200) {
innerAlert(JSON.parse(xhr.responseText));
let fileList = JSON.parse(xhr.responseText);
let firstXlsxName;
let file;
for (file of fileList) {
if (file["title"]) {
if (getFileExt(file["title"]) === "xlsx")
{
firstXlsxName = file["title"];
break;
}
}
}
if (firstXlsxName) {
let data = {
directUrl : !!config.document.directUrl,
path : firstXlsxName
};
let xhr = new XMLHttpRequest();
xhr.open("POST", "webeditor.ashx?type=reference");
xhr.setRequestHeader("Content-Type", "application/json");
xhr.send(JSON.stringify(data));
xhr.onload = function () {
if (xhr.status === 200) {
docEditor.setReferenceSource(JSON.parse(xhr.responseText));
} else {
innerAlert("/reference - bad status");
}
}
} else {
innerAlert("No *.xlsx files");
}
} else {
innerAlert("/files - bad status");
}
}
};
var onRequestHistory = function () {
let xhr = new XMLHttpRequest();
xhr.open("GET", "webeditor.ashx?type=gethistory&filename=<%= Model.FileName %>");
@ -245,9 +316,11 @@
var onRequestRestore = function (event) {
var fileName = "<%= Model.FileName %>";
var version = event.data.version;
var url = event.data.url;
var data = {
fileName: fileName,
version: version
version: version,
url: url
};
let xhr = new XMLHttpRequest();
@ -259,6 +332,71 @@
}
}
<% string usersForMentions; %>
<% Model.GetUsersMentions(Request, out usersForMentions); %>
<% string usersInfo; %>
<% Model.GetUsersInfo(Request, out usersInfo); %>
<% string usersForProtect; %>
<% Model.GetUsersProtect(Request, out usersForProtect); %>
var onRequestUsers = function (event) {
if (event && event.data){
var c = event.data.c;
}
switch (c) {
case "info":
users = [];
var allUsers = <%= usersInfo %>;
for (var i = 0; i < event.data.id.length; i++) {
for (var j = 0; j < allUsers.length; j++) {
if (allUsers[j].id == event.data.id[i]) {
users.push(allUsers[j]);
break;
}
}
}
break;
case "protect":
var users = <%= usersForProtect %>;
break;
default:
users = <%= usersForMentions %>;
}
if ((c === "protect" || c === "mention") && users && event.data.count) {
let from = event.data.from;
let count = event.data.count;
let search = event.data.search;
if (from != 0) users = [];
var resultCount = 234;
for (var i = Math.max(users.length, from); i < Math.min(from + count, resultCount); i++){
users.push({
email: "test@test.test" + (i + 1),
id: "id" + (i + 1),
name: "test_" + search + (i + 1)
});
}
}
var result = {
"c": c,
"users": users,
};
if (resultCount) {
// support v9.0
result.total = 1 + (!event.data.count || users.length < event.data.count ? 0 : (event.data.from + event.data.count));
// since v9.0.1
result.isPaginated = true;
}
docEditor.setUsers(result);
};
var onRequestSendNotify = function (event) {
event.data.actionLink = replaceActionLink(location.href, JSON.stringify(event.data.actionLink));
var data = JSON.stringify(event.data);
innerAlert("onRequestSendNotify: " + data);
};
config = <%= Model.GetDocConfig(Request, Url) %>;
config.width = "100%";
@ -267,6 +405,7 @@
config.events = {
'onAppReady': onAppReady,
'onDocumentStateChange': onDocumentStateChange,
'onUserActionRequired': onUserActionRequired,
'onError': onError,
'onOutdatedVersion': onOutdatedVersion,
"onMakeActionLink": onMakeActionLink,
@ -276,83 +415,48 @@
"onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
};
<% string usersForMentions; %>
<% Model.GetUsersMentions(Request, out usersForMentions); %>
<% string usersInfo; %>
<% Model.GetUsersInfo(Request, out usersInfo); %>
<% string usersForProtect; %>
<% Model.GetUsersProtect(Request, out usersForProtect); %>
if (config.editorConfig.user.id) {
config.events['onRequestRefreshFile'] = onRequestRefreshFile;
config.events['onRequestClose'] = onRequestClose;
// the user is trying to show the document version history
config.events['onRequestHistory'] = onRequestHistory;
// the user is trying to click the specific document version in the document version history
config.events['onRequestHistoryData'] = onRequestHistoryData;
// the user is trying to go back to the document from viewing the document version history
config.events['onRequestHistoryClose'] = function () {
document.location.reload();
};
config.events['onRequestRestore'] = onRequestRestore;
if (config.editorConfig.user.id !== "uid-3") {
config.events['onRequestHistoryClose'] = function () {
document.location.reload();
};
config.events['onRequestRestore'] = onRequestRestore;
}
// add mentions for not anonymous users
<% if (!string.IsNullOrEmpty(usersForMentions))
{ %>
config.events['onRequestUsers'] = function (event) {
if (event && event.data){
var c = event.data.c;
}
switch (c) {
case "info":
users = [];
var allUsers = <%= usersInfo %>;
for (var i = 0; i < event.data.id.length; i++) {
for (var j = 0; j < allUsers.length; j++) {
if (allUsers[j].id == event.data.id[i]) {
users.push(allUsers[j]);
break;
}
}
}
break;
case "protect":
var users = <%= usersForProtect %>;
break;
default:
users = <%= usersForMentions %>;
}
docEditor.setUsers({
"c": c,
"users": users,
});
};
config.events['onRequestUsers'] = onRequestUsers;
<% } %>
config.events['onRequestSaveAs'] = onRequestSaveAs;
// the user is mentioned in a comment
config.events['onRequestSendNotify'] = function (event) {
event.data.actionLink = replaceActionLink(location.href, JSON.stringify(event.data.actionLink));
var data = JSON.stringify(event.data);
innerAlert("onRequestSendNotify: " + data);
};
config.events['onRequestSendNotify'] = onRequestSendNotify;
// prevent file renaming for anonymous users
config.events['onRequestRename'] = onRequestRename;
config.events['onRequestReferenceData'] = onRequestReferenceData;
// prevent switch the document from the viewing into the editing mode for anonymous users
config.events['onRequestEditRights'] = onRequestEditRights;
config.events['onRequestOpen'] = onRequestOpen;
config.events['onRequestReferenceSource'] = onRequestReferenceSource;
}
if (config.editorConfig.createUrl) {
config.events.onRequestSaveAs = onRequestSaveAs;
var сonnectEditor = function () {
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
};
var сonnectEditor = function () {
if ((config.document.fileType === "docxf" || config.document.fileType === "oform")
&& DocsAPI.DocEditor.version().split(".")[0] < 7) {
innerAlert("Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online.");
return;
}
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
const getFileExt = function (fileName) {
if (fileName.indexOf(".")) {
return fileName.split('.').reverse()[0];
}
return false;
};
if (window.addEventListener) {

View File

@ -0,0 +1,144 @@
<%@ Page Title="ONLYOFFICE" Language="C#" Inherits="System.Web.Mvc.ViewPage<OnlineEditorsExampleMVC.Models.ForgottenFilesModel>" %>
<%@ Import Namespace="System.IO" %>
<%@ Import Namespace="System.Web.Configuration" %>
<%@ Import Namespace="OnlineEditorsExampleMVC.Helpers" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="en">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width" />
<meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
<!--
*
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
-->
<title>ONLYOFFICE</title>
<link href="<%: Url.Content("~/favicon.ico") %>" rel="shortcut icon" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
<%: Styles.Render("~/Content/css") %>
<%: Styles.Render("~/Content/forgotten") %>
</head>
<body>
<header>
<div class="center main-nav">
<a href="./">
<img src ="content/images/logo.svg" alt="ONLYOFFICE" />
</a>
</div>
<menu class="responsive-nav">
<li>
<a href="#" onclick="toggleSidePanel(event)">
<img src="content/images/mobile-menu.svg" alt="ONLYOFFICE" />
</a>
</li>
<li>
<a href="./">
<img src ="content/images/mobile-logo.svg" alt="ONLYOFFICE" />
</a>
</li>
</menu>
</header>
<div class="center main">
<table class="table-main">
<tbody>
<tr>
<td class="left-panel section"></td>
<td class="section">
<div class="main-panel">
<menu class="links">
<li class="home-link" >
<a href="./">
<img src="content/images/home.svg" alt="Home"/>
</a>
</li>
<li class="active">
<a href="/Forgotten">Forgotten files</a>
</li>
</menu>
<div class="stored-list">
<div class="storedHeader">
<div class="storedHeaderText">
<span class="header-list">Forgotten files</span>
</div>
</div>
<table class="tableHeader" cellspacing="0" cellpadding="0" width="100%">
<thead>
<tr>
<td class="tableHeaderCell">Filename</td>
<td class="tableHeaderCell">Action</td>
</tr>
</thead>
</table>
<div class="scroll-table-body">
<table cellspacing="0" cellpadding="0" width="100%">
<tbody>
<% foreach (var file in Model.files) { %>
<tr class="tableRow" title="<%= file["key"] %>">
<td>
<a class="stored-edit action-link <%= file["type"] %>" href="<%= file["url"] %>" target="_blank">
<span><%= file["key"] %></span>
</a>
</td>
<td>
<a href="<%= file["url"] %>">
<img class="icon-download" src="content/images/download.svg" alt="Download" title="Download" /></a>
<a class="delete-file" data="<%= file["key"] %>">
<img class="icon-action" src="content/images/delete.svg" alt="Delete" title="Delete" /></a>
</td>
</tr>
<% } %>
</tbody>
</table>
</div>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<footer>
<div class="center">
<table>
<tbody>
<tr>
<td>
<a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
</td>
<td>
<a href="mailto:sales@onlyoffice.com">Submit your request</a>
</td>
<td class="copy">
&copy; Ascensio System SIA <%= DateTime.Now.Year.ToString() %>. All rights reserved.
</td>
</tr>
</tbody>
</table>
</div>
</footer>
<%: Scripts.Render("~/bundles/jquery", "~/bundles/forgotten") %>
</body>
</html>

View File

@ -16,7 +16,7 @@
<meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
<!--
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -41,11 +41,23 @@
</head>
<body>
<header>
<div class="center">
<a href="">
<div class="center main-nav">
<a href="./">
<img src ="content/images/logo.svg" alt="ONLYOFFICE" />
</a>
</div>
<menu class="responsive-nav">
<li>
<a href="#" onclick="toggleSidePanel(event)">
<img src="content/images/mobile-menu.svg" alt="ONLYOFFICE" />
</a>
</li>
<li>
<a href="./">
<img src ="content/images/mobile-logo.svg" alt="ONLYOFFICE" />
</a>
</li>
</menu>
</header>
<div class="center main">
@ -68,7 +80,7 @@
<a class="try-editor slide" data-type="pptx">Presentation</a>
</li>
<li>
<a class="try-editor form" data-type="docxf">Form template</a>
<a class="try-editor form" data-type="pdf">PDF form</a>
</li>
</ul>
<label class="side-option">
@ -122,9 +134,24 @@
</tbody>
</table>
</div>
<button class="mobile-close-btn" onclick="toggleSidePanel(event)">
<img src="content/images/close.svg" alt="">
</button>
</td>
<td class="section">
<div class="main-panel">
<menu class="links">
<li class="home-link active" >
<a href="./">
<img src="content/images/home.svg" alt="Home"/>
</a>
</li>
<% if (bool.Parse(WebConfigurationManager.AppSettings["enable-forgotten"])) { %>
<li>
<a href="/Forgotten">Forgotten files</a>
</li>
<% } %>
</menu>
<% var storedFiles = DocManagerHelper.GetStoredFiles(); %>
<div id="portal-info" style="display: <%= storedFiles.Any() ? "none" : "table-cell" %>">
<span class="portal-name">ONLYOFFICE Document Editors Welcome!</span>
@ -136,7 +163,7 @@
<span class="portal-descr">You can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</span>
<% foreach (User user in Users.getAllUsers())
{ %>
<div class="user-descr">
<div class="user-descr" onclick="toggleUserDescr(event)">
<b><%= user.name.IsEmpty() ? "Anonymous" : user.name %></b>
<ul>
<% foreach (string description in user.descriptions)
@ -151,15 +178,21 @@
if (storedFiles.Any())
{ %>
<div class="stored-list">
<span class="header-list">Your documents</span>
<div class="storedHeader">
<div class="storedHeaderText">
<span class="header-list">Your documents</span>
</div>
<div class="storedHeaderClearAll">
<div class="clear-all">Clear all</div>
</div>
</div>
<table class="tableHeader" cellspacing="0" cellpadding="0" width="100%">
<thead>
<tr>
<td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
<td class="tableHeaderCell tableHeaderCellEditors contentCells-shift">Editors</td>
<td class="tableHeaderCell tableHeaderCellViewers">Viewers</td>
<td class="tableHeaderCell tableHeaderCellDownload">Download</td>
<td class="tableHeaderCell tableHeaderCellRemove">Remove</td>
<td class="tableHeaderCell tableHeaderCellAction">Action</td>
</tr>
</thead>
</table>
@ -193,11 +226,13 @@
<img src="content/images/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
</a>
</td>
<td class="contentCells contentCells-icon">
<a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "comment", directUrl = isEnabledDirectUrl }) %>" target="_blank">
<img src="content/images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
</a>
</td>
<% if (docType != "pdf") { %>
<td class="contentCells contentCells-icon">
<a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "comment", directUrl = isEnabledDirectUrl }) %>" target="_blank">
<img src="content/images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
</a>
</td>
<% } %>
<% if (docType == "word") { %>
<td class="contentCells contentCells-icon">
<a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "review", directUrl = isEnabledDirectUrl }) %>" target="_blank">
@ -265,14 +300,22 @@
<img src="content/images/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
</a>
</td>
<td class="contentCells contentCells-icon contentCells-shift downloadContentCellShift">
<% if (docType != null ) { %>
<td class="contentCells contentCells-icon">
<a class="convert-file" data="<%= storedFile.Name %>" data-type="<%= docType %>">
<img class="icon-action" src="content/images/convert.svg" alt="Convert" title="Convert" /></a>
</td>
<% } else { %>
<td class="contentCells contentCells-icon downloadContentCellShift"></td>
<% } %>
<td class="contentCells contentCells-icon downloadContentCellShift">
<a href="webeditor.ashx?type=download&fileName=<%= HttpUtility.UrlEncode(storedFile.Name) %>">
<img class="icon-download" src="content/images/download.svg" alt="Download" title="Download" />
</a>
</td>
<td class="contentCells contentCells-icon contentCells-shift">
<a class="delete-file" data-filename="<%= storedFile.Name %>">
<img class="icon-delete" src="content/images/delete.svg" alt="Delete" title="Delete" />
<img class="icon-action" src="content/images/delete.svg" alt="Delete" title="Delete" />
</a>
</td>
</tr>
@ -295,6 +338,15 @@
<div class="describeUpload">After these steps are completed, you can work with your document.</div>
<span id="step1" class="step">1. Loading the file.</span>
<span class="step-descr">The loading speed depends on file size and additional elements it contains.</span>
<div id="select-file-type" class="invisible">
<br />
<span class="step">Please select the current document type</span>
<div class="buttonsMobile indent">
<div class="button file-type document" data="docx">Document</div>
<div class="button file-type spreadsheet" data="xlsx">Spreadsheet</div>
<div class="button file-type presentation" data="pptx">Presentation</div>
</div>
</div>
<br />
<span id="step2" class="step">2. Conversion.</span>
<span class="step-descr">The file is converted to OOXML so that you can edit it.</span>
@ -310,10 +362,7 @@
<span class="errorPass"></span>
<br />
</div>
<span id="step3" class="step">3. Loading editor scripts.</span>
<span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
<input type="hidden" name="hiddenFileName" id="hiddenFileName" />
<br />
<span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
<br />
<div class="error-message">
@ -332,7 +381,33 @@
</div>
</div>
<span id="loadScripts" data-docs="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>"></span>
<div id="convertingProgress">
<div id="convertingSteps">
<span id="convertFileName" class="convertFileName"></span>
<span id="convertStep1" class="step">1. Select a format file to convert</span>
<span class="step-descr">The converting speed depends on file size and additional elements it contains.</span>
<table cellspacing="0" cellpadding="0" width="100%" class="convertTable">
<tbody>
<tr class="typeButtonsRow" id="convTypes"></tr>
</tbody>
</table>
<br />
<span id="convertStep2" class="step">2. File conversion</span>
<span class="step-descr disable" id="convert-descr">The file is converted <div class="convertPercent" id="convertPercent">0 %</div></span>
<span class="step-error hidden" id="convert-error"></span>
<div class="describeUpload">Note the speed of all operations depends on your connection quality and server location.</div>
<input type="hidden" name="hiddenFileName" id="hiddenFileName" />
</div>
<br />
<div class="buttonsMobile">
<div id="downloadConverted" class="button converting orange disable">DOWNLOAD</div>
<div id="beginViewConverted" class="button converting wide gray disable">VIEW</div>
<div id="beginEditConverted" class="button converting wide gray disable">EDIT</div>
<div id="cancelEdit" class="button converting gray">CANCEL</div>
</div>
</div>
<iframe id="iframeScripts" src="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
<footer>
<div class="center">
@ -340,7 +415,7 @@
<tbody>
<tr>
<td>
<a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
<a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
</td>
<td>
<a href="mailto:sales@onlyoffice.com">Submit your request</a>
@ -357,9 +432,6 @@
<%: Scripts.Render("~/bundles/jquery", "~/bundles/scripts") %>
<script language="javascript" type="text/javascript">
var FillExtList = '<%= string.Join(",", DocManagerHelper.FillFormExts.ToArray()) %>';
var ConverExtList = '<%= string.Join(",", DocManagerHelper.ConvertExts.ToArray()) %>';
var EditedExtList = '<%= string.Join(",", DocManagerHelper.EditedExts.ToArray()) %>';
var UrlConverter = '<%= Url.Content("~/webeditor.ashx?type=convert") %>';
var UrlEditor = '<%= Url.Action("editor", "Home") %>';
</script>

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width" />
<!--
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -26,6 +26,7 @@
<hgroup>
<h1>Error.</h1>
<h2>An error occurred while processing your request.</h2>
<p><%= ViewData["Message"] %></p>
</hgroup>
</body>
</html>

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2023
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -69,6 +69,9 @@ namespace OnlineEditorsExampleMVC
case "remove":
Remove(context);
break;
case "removeforgotten":
RemoveForgotten(context);
break;
case "assets":
Assets(context);
break;
@ -87,6 +90,12 @@ namespace OnlineEditorsExampleMVC
case "reference":
Reference(context);
break;
case "formats":
Formats(context);
break;
case "config":
Config(context);
break;
}
}
@ -240,10 +249,23 @@ namespace OnlineEditorsExampleMVC
var fileUri = DocManagerHelper.GetDownloadUrl(fileName);
var extension = (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
var internalExtension = "ooxml";
string conversionExtension = "ooxml";
object fileExt;
if (body.TryGetValue("fileExt", out fileExt) && !String.IsNullOrEmpty(fileExt.ToString()))
{
conversionExtension = fileExt.ToString();
}
object keepOriginal;
bool removeOriginal = true;
if (body.TryGetValue("keepOriginal", out keepOriginal) && !String.IsNullOrEmpty(keepOriginal.ToString()))
{
removeOriginal = keepOriginal.ToString().ToLower() != "true";
}
// check if the file with such an extension can be converted
if (DocManagerHelper.ConvertExts.Contains("." + extension))
if (DocManagerHelper.ConvertExts.Contains("." + extension) || conversionExtension != "ooxml")
{
// generate document key
var key = ServiceConverter.GenerateRevisionId(fileUri);
@ -258,7 +280,7 @@ namespace OnlineEditorsExampleMVC
// get the url and file type of the converted file
Dictionary<string, string> newFileData;
var result = ServiceConverter.GetConvertedData(downloadUri.ToString(), extension, internalExtension, key, true, out newFileData, filePass, lang);
var result = ServiceConverter.GetConvertedData(downloadUri.ToString(), extension, conversionExtension, key, true, out newFileData, filePass, lang, fileName);
if (result != 100)
{
context.Response.Write("{ \"step\" : \"" + result + "\", \"filename\" : \"" + fileName + "\"}");
@ -266,9 +288,14 @@ namespace OnlineEditorsExampleMVC
}
var newFileUri = newFileData["fileUrl"];
var newFileType = "." + newFileData["fileType"];
var newFileType = newFileData["fileType"];
if (!FormatManager.All().Any(f => f.Name == newFileType && f.Type != FileUtility.FileType.Null))
{
context.Response.Write("{\"step\": \"" + result + "\", \"filename\": \"" + newFileUri + "\", \"error\": \"FileTypeIsNotSupported\"}");
return;
}
// get a file name of an internal file extension with an index if the file with such a name already exists
var correctName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + newFileType);
var correctName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + "." + newFileType);
var req = (HttpWebRequest)WebRequest.Create(newFileUri);
@ -290,11 +317,14 @@ namespace OnlineEditorsExampleMVC
}
}
Remove(fileName); // remove the original file and its history if it exists
if (removeOriginal) Remove(fileName); // remove the original file and its history if it exists
fileName = correctName; // create meta information about the converted file with user id and name specified
var id = context.Request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id);
DocManagerHelper.CreateMeta(fileName, user.id, user.name);
context.Response.Write("{ \"filename\" : \"" + fileName + "\", \"step\": \"" + result + "\" }");
return;
}
var documentType = FileUtility.GetFileType(fileName).ToString().ToLower();
@ -393,8 +423,17 @@ namespace OnlineEditorsExampleMVC
context.Response.ContentType = "text/plain";
try
{
var fileName = Path.GetFileName(context.Request["fileName"]);
Remove(fileName); // remove a file and its history if it exists
string fileName = context.Request["fileName"];
if (!String.IsNullOrEmpty(fileName))
{
fileName = Path.GetFileName(context.Request["fileName"]);
Remove(fileName); // remove a file and its history if it exists
}
else
{
RemoveUserDirectory(); // remove the user's directory
}
context.Response.Write("{ \"success\": true }");
}
@ -414,6 +453,14 @@ namespace OnlineEditorsExampleMVC
if (Directory.Exists(histDir)) Directory.Delete(histDir, true);
}
// remove the user's directory
private static void RemoveUserDirectory()
{
var path = DocManagerHelper.StoragePath("", null); // get the path to the user directory
if (Directory.Exists(path)) Directory.Delete(path, true);
}
// get files information
private static void Files(HttpContext context)
{
@ -658,6 +705,7 @@ namespace OnlineEditorsExampleMVC
var fileName = (string)body["fileName"];
var version = (int)body["version"];
var url = body.ContainsKey("url") ? (string)body["url"] : null;
var key = ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
+ "/" + fileName + "/"
@ -679,9 +727,19 @@ namespace OnlineEditorsExampleMVC
{
File.Copy(changesPath, Path.Combine(currentVersionDir, "changes.json"));
}
File.Copy(Path.Combine(verDir, "prev" + ext), DocManagerHelper.StoragePath(fileName, null), true);
if (url != null)
{
var req = (HttpWebRequest)WebRequest.Create(url);
req.Method = "GET";
var stream = req.GetResponse().GetResponseStream();
var memoryStream = new MemoryStream();
stream.CopyTo(memoryStream);
File.WriteAllBytes(DocManagerHelper.StoragePath(fileName, null), memoryStream.ToArray());
}
else
{
File.Copy(Path.Combine(verDir, "prev" + ext), DocManagerHelper.StoragePath(fileName, null), true);
}
var fileInfo = new FileInfo(DocManagerHelper.StoragePath(fileName, null));
fileInfo.LastWriteTimeUtc = DateTime.UtcNow;
@ -932,7 +990,7 @@ namespace OnlineEditorsExampleMVC
var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
var changesArray = (ArrayList)changes["changes"];
var change = changesArray.Count > 0
? (Dictionary<string, object>)changesArray[0]
? (Dictionary<string, object>)changesArray[changesArray.Count - 1]
: new Dictionary<string, object>();
// write information about changes to the object
@ -951,6 +1009,119 @@ namespace OnlineEditorsExampleMVC
return history;
}
// return all the supported formats
private static void Formats(HttpContext context)
{
try
{
Dictionary<string, object> data = new Dictionary<string, object>
{
{ "formats", FormatManager.All() }
};
context.Response.ContentType = "application/json";
var jss = new JavaScriptSerializer();
context.Response.Write(jss.Serialize(data));
}
catch (Exception e)
{
context.Response.Write("{ \"error\": \"" + e.Message + "\"}");
}
}
private static void Config(HttpContext context)
{
try
{
var fileName = context.Request.QueryString.Get("fileName");
var directUrl = context.Request.QueryString.Get("directUrl").ToLower() == "true";
var permissions = context.Request.QueryString.Get("permissions") != null
? context.Request.QueryString.Get("permissions")
: "{}";
if (string.IsNullOrEmpty(fileName) || !File.Exists(DocManagerHelper.StoragePath(fileName)))
{
context.Response.Write("{ \"error\": \"File is not exist\"}");
return;
}
var id = context.Request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id);
var jss = new JavaScriptSerializer();
var config = new Dictionary<string, object>
{
{
"document", new Dictionary<string, object>
{
{"key", ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress() + "/" + fileName
+ "/"+ File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode())},
{"title", fileName},
{"url", DocManagerHelper.GetDownloadUrl(fileName)},
{"permissions", jss.Deserialize<Dictionary<string, object>>(permissions)},
{"directUrl", directUrl ? DocManagerHelper.GetDownloadUrl(fileName, false) : null},
{
"referenceData", new Dictionary<string, object>
{
{"fileKey", !user.id.Equals("uid-0") ?
jss.Serialize(new Dictionary<string, object>{
{"fileName", fileName},
{"userAddress", HttpUtility.UrlEncode(DocManagerHelper.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))}
}) : null },
{"instanceId", DocManagerHelper.GetServerUrl(false)}
}
}
}
},
{
"editorConfig", new Dictionary<string, object>
{
{"callbackUrl", DocManagerHelper.GetCallback(fileName)},
{"mode", "edit"}
}
}
};
if (JwtManager.Enabled)
{
var token = JwtManager.Encode(config);
config.Add("token", token);
}
context.Response.Write(jss.Serialize(config));
}
catch (Exception e)
{
context.Response.Write("{ \"error\": \"" + e.Message + "\"}");
}
}
// delete a forgotten file from the document server
private static void RemoveForgotten(HttpContext context)
{
try
{
if (!bool.Parse(WebConfigurationManager.AppSettings["enable-forgotten"]))
{
throw new HttpException(403, "The forgotten page is disabled");
}
string filename = context.Request["filename"];
if (!String.IsNullOrEmpty(filename))
{
TrackManager.commandRequest("deleteForgotten", filename);
}
context.Response.StatusCode = 204;
}
catch (Exception e)
{
context.Response.StatusCode = 500;
context.Response.Write("{ \"error\": \"" + e.Message + "\"}");
}
}
}
}

View File

@ -1,28 +1,30 @@
<?xml version="1.0"?>
<appSettings>
<clear />
<add key="version" value="1.7.0"/>
<add key="version" value="1.14.0"/>
<add key="filesize-max" value="52428800"/>
<add key="storage-path" value=""/>
<add key="filename-max" value="50"/>
<add key="enable-forgotten" value="true"/>
<add key="files.docservice.timeout" value="120000" />
<add key="files.docservice.secret" value="" />
<add key="files.docservice.header" value="Authorization" />
<add key="files.docservice.token.useforrequest" value="true" />
<add key="files.docservice.token.expires-in" value="5"/>
<add key="files.docservice.verify-peer-off" value="true"/>
<add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-CS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
<add key="files.docservice.languages" value="en:English|sq-AL:Albanian (Albania)|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|ur:Urdu|vi:Vietnamese|aa-AA:Test Language"/>
<add key="files.docservice.url.site" value="http://documentserver/"/>
<add key="files.docservice.url.converter" value="ConvertService.ashx"/>
<add key="files.docservice.url.converter" value="converter"/>
<add key="files.docservice.url.api" value="web-apps/apps/api/documents/api.js"/>
<add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/cache-scripts.html"/>
<add key="files.docservice.url.command" value="coauthoring/CommandService.ashx"/>
<add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/preload.html"/>
<add key="files.docservice.url.command" value="command"/>
<add key="files.docservice.url.example" value=""/>

View File

@ -0,0 +1,179 @@
/**
*
* (c) Copyright Ascensio System SIA 2025
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
.center {
width: auto;
}
.left-panel {
width: 256px;
}
.main-panel {
width: 832px;
margin: 0 32px;
padding: 48px 0;
left: 0;
}
.tableRow {
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
border-bottom: 1px solid #E2E2E2;
}
.tableRow td:first-child {
width: 70%;
flex-grow: 0;
max-width: none;
}
.tableHeader td:first-child {
text-align: left;
}
.tableHeader td:last-child, .tableRow td:last-child {
width: 10%;
text-align: center;
padding: 0 !important;
}
.tableHeader {
width: 100%;
}
.stored-edit {
display: block;
padding-top: 0;
max-width: none;
}
menu.links {
width: 100%;
}
.scroll-table-body table {
table-layout: fixed;
}
.stored-edit span {
font-size: 12px;
line-height: normal;
position: static;
}
.scroll-table-body {
overflow-y: auto;
}
.stored-list {
height: calc(100% - 58px);
}
header {
min-width:auto;
}
header a {
display: block;
margin: 0 auto;
width: 1152px;
}
@media (max-width: 1279px) and (min-width: 1024px) {
.left-panel {
width: 208px;
}
.main-panel {
width: 688px;
}
header a {
width: 928px;
}
header img {
margin-left: 16px;
}
}
@media (max-width: 1023px) and (min-width: 593px) {
.center {
max-width: 768px;
width: calc(100% - 80px);
}
.table-main {
width: 100%;
}
.left-panel {
width: 208px;
}
.main-panel {
width: calc(100% - 32px);
}
.tableHeader td:last-child, .tableRow td:last-child {
width: 20%;
}
header a {
width: 768px;
}
header img {
margin-left: 40px;
}
}
@media (max-width: 592px) {
.center, .table-main {
width: 100%;
}
.left-panel {
display: none;
}
.main-panel {
width: 100%;
margin: 0;
padding: 28px 16px;
}
.tableHeader td:last-child, .tableRow td:last-child {
width: 25%;
}
header a {
width: auto;
}
.scroll-table-body {
top: 40px;
}
.tableRow {
padding: 8px 0;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.4285 13C14.4102 13 14 13 14 13.5V15H6C5.44772 15 5 15.4477 5 16V17C5 17.5523 5.44771 18 6 18H14V19.5C14 20 14.3816 20 14.4285 20C14.6359 20 15.0099 19.9113 15.2172 19.7363L18.6207 17.0833C19.1264 16.6566 19.1264 16.3434 18.6207 15.9167L15.2172 13.2637C15.0099 13.0887 14.6359 13 14.4285 13Z" fill="#444444"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.5715 4C9.58984 4 10 4 10 4.50002V6H18C18.5523 6 19 6.44772 19 7V8C19 8.55228 18.5523 9 18 9H10V10.5C10 11 9.61841 11 9.57151 11C9.36409 11 8.99012 10.9113 8.78279 10.7363L5.37934 8.08333C4.87356 7.65662 4.87356 7.34338 5.37934 6.91667L8.78279 4.26366C8.99012 4.08874 9.36409 4 9.5715 4Z" fill="#444444"/>
</svg>

After

Width:  |  Height:  |  Size: 821 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -1 +1,7 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#287CA9"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="7" y="28" width="10" height="2" rx="1" fill="#fff"/>
<rect x="7" y="22" width="16" height="2" rx="1" fill="#fff"/>
<rect x="7" y="16" width="16" height="2" rx="1" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 503 B

View File

@ -1 +0,0 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 463 B

View File

@ -0,0 +1,8 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#E54D39"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="7" y="28" width="16" height="2" rx="1" fill="#fff"/>
<rect x="18" y="22" width="5" height="2" rx="1" fill="#fff"/>
<rect x="18" y="16" width="5" height="2" rx="1" fill="#fff"/>
<rect x="8" y="17" width="6" height="6" rx=".833" stroke="#fff" stroke-width="2"/>
</svg>

After

Width:  |  Height:  |  Size: 590 B

View File

@ -1 +1,8 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#F36700"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
<rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 570 B

View File

@ -1 +1,5 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#D1D5DA"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5zm-5.293 14.293a1 1 0 0 0-1.414 0l-4 4a1 1 0 1 0 1.414 1.414L14 17.414V25a1 1 0 1 0 2 0v-7.586l2.293 2.293a1 1 0 0 0 1.414-1.414z" fill="#646464"/>
<path d="M8.833 22H11a1 1 0 1 1 0 2H9v4h12v-4h-2a1 1 0 1 1 0-2h2.167c1.012 0 1.833.82 1.833 1.833v4.334C23 29.179 22.18 30 21.167 30H8.833A1.833 1.833 0 0 1 7 28.167v-4.334C7 22.821 7.82 22 8.833 22" fill="#646464"/>
</svg>

Before

Width:  |  Height:  |  Size: 797 B

After

Width:  |  Height:  |  Size: 638 B

View File

@ -1 +1,10 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#3AA133"/>
<path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
<rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="22" width="18" height="2" rx="1" fill="#fff"/>
<rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
<rect x="12" y="16" width="2" height="14" rx="1" fill="#fff"/>
<rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 703 B

View File

@ -0,0 +1,3 @@
<svg width="20" height="17" viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 17V11H12V17H17V9H20L10 0L0 9H3V17H8Z" fill="#444444"/>
</svg>

After

Width:  |  Height:  |  Size: 173 B

View File

@ -1,12 +1,5 @@
<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.84616 1H10.8462L14.8462 5V15H2.84616V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8462 5L10.8462 1H2.84616V15H14.8462V5ZM10.8462 0L15.8462 5V16H1.84616V0H10.8462Z" fill="#BFBFBF"/>
<rect x="3.84616" y="10" width="10" height="4" fill="#3779A6"/>
<path d="M3.84616 4H4.84616V5H3.84616V4Z" fill="#BFBFBF"/>
<path d="M3.84616 6H4.84616V7H3.84616V6Z" fill="#BFBFBF"/>
<path d="M4.84616 8H3.84616V9H4.84616V8Z" fill="#BFBFBF"/>
<path d="M12.8462 8H5.84616V9H12.8462V8Z" fill="#BFBFBF"/>
<path d="M7.84616 6H5.84616V7H7.84616V6Z" fill="#BFBFBF"/>
<path d="M12.8462 4H5.84616V5H12.8462V4Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M9.84616 1H10.8462V4H14.8462L15.8462 5H9.84616V1Z" fill="#333333"/>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path fill="#287CA9" d="M5 7h6v1H5zm0 2h6v1H5zm0 2h4v1H5z"/>
</svg>

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 394 B

View File

@ -0,0 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path d="M7.36 5.777c0 1.085-.31 2.363-.833 3.543-.526 1.185-1.235 2.198-1.974 2.796l.803 1.109c1.992-1.342 4.198-2.262 6.333-1.954L12 9.938c-1.819-.612-3.278-2.449-3.278-4.16zm.888 2.84a6.7 6.7 0 0 0 1.161 1.35c-.668.122-1.323.32-1.957.573q.17-.322.316-.657c.183-.41.344-.836.48-1.267" fill="#E54D39"/>
</svg>

After

Width:  |  Height:  |  Size: 637 B

View File

@ -1,12 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 1H10L14 5V15H2V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5L10 1H2V15H14V5ZM10 0L15 5V16H1V0H10Z" fill="#BFBFBF"/>
<rect x="3" y="10" width="10" height="4" fill="#F36700"/>
<path d="M3 4H4V5H3V4Z" fill="#BFBFBF"/>
<path d="M3 6H4V7H3V6Z" fill="#BFBFBF"/>
<path d="M4 8H3V9H4V8Z" fill="#BFBFBF"/>
<path d="M12 8H5V9H12V8Z" fill="#BFBFBF"/>
<path d="M7 6H5V7H7V6Z" fill="#BFBFBF"/>
<path d="M12 4H5V5H12V4Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M9 1H10V4H14L15 5H9V1Z" fill="#333333"/>
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path d="M5 10a3 3 0 1 0 3-3v3z" fill="#F36700"/>
<path d="M4.5 9A2.5 2.5 0 0 1 7 6.5V9z" fill="#F36700"/>
</svg>

Before

Width:  |  Height:  |  Size: 631 B

After

Width:  |  Height:  |  Size: 444 B

View File

@ -0,0 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
<path d="M5 8h6v1H5zm0 1h1v1H5zm5 0h1v1h-1zM7 6h2v2H7z" fill="#5951BB"/>
<path stroke="#5951BB" d="M4.5 10.5h2v2h-2zm5 0h2v2h-2z"/>
</svg>

After

Width:  |  Height:  |  Size: 469 B

View File

@ -1,12 +1,5 @@
<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.84592 1H10.8459L14.8459 5V15H2.84592V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8459 5L10.8459 1H2.84592V15H14.8459V5ZM10.8459 0L15.8459 5V16H1.84592V0H10.8459Z" fill="#BFBFBF"/>
<rect x="3.84592" y="10" width="10" height="4" fill="#78A73B"/>
<path d="M3.84592 4H4.84592V5H3.84592V4Z" fill="#BFBFBF"/>
<path d="M3.84592 6H4.84592V7H3.84592V6Z" fill="#BFBFBF"/>
<path d="M4.84592 8H3.84592V9H4.84592V8Z" fill="#BFBFBF"/>
<path d="M12.8459 8H5.84592V9H12.8459V8Z" fill="#BFBFBF"/>
<path d="M7.84592 6H5.84592V7H7.84592V6Z" fill="#BFBFBF"/>
<path d="M12.8459 4H5.84592V5H12.8459V4Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M9.84592 1H10.8459V4H14.8459L15.8459 5H9.84592V1Z" fill="#333333"/>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5 3.207V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.793z" fill="#fff" stroke="#BBB"/>
<path d="M9.5 1v1.9c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437c.214.109.494.109 1.054.109H13" stroke="#BBB"/>
<path fill="#3AA133" d="M8 7h3v2H8zm0 3h3v2H8zM5 7h2v2H5zm0 3h2v2H5z"/>
</svg>

Before

Width:  |  Height:  |  Size: 832 B

After

Width:  |  Height:  |  Size: 408 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,5 @@
<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5332 22.2243L0.632544 17.5921C-0.210848 17.1877 -0.210848 16.5627 0.632544 16.1951L4.07945 14.5775L10.4966 17.5921C11.34 17.9965 12.6967 17.9965 13.5034 17.5921L19.9206 14.5775L23.3675 16.1951C24.2108 16.5995 24.2108 17.2245 23.3675 17.5921L13.4668 22.2243C12.6967 22.592 11.34 22.592 10.5332 22.2243Z" fill="#FF6F3D"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5011 16.4922L0.630617 11.8546C-0.210206 11.4497 -0.210206 10.824 0.630617 10.456L3.99391 8.87329L10.5011 11.9282C11.342 12.3331 12.6946 12.3331 13.4989 11.9282L20.0061 8.87329L23.3694 10.456C24.2102 10.8608 24.2102 11.4865 23.3694 11.8546L13.4989 16.4922C12.658 16.897 11.3054 16.897 10.5011 16.4922Z" fill="#95C038"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5011 10.8195L0.630617 6.24863C-0.210206 5.84959 -0.210206 5.23289 0.630617 4.87013L10.5011 0.299281C11.342 -0.0997605 12.6946 -0.0997605 13.4989 0.299281L23.3694 4.87013C24.2102 5.26917 24.2102 5.88587 23.3694 6.24863L13.4989 10.8195C12.658 11.1822 11.3054 11.1822 10.5011 10.8195Z" fill="#5DC0E8"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@ -0,0 +1,5 @@
<svg width="20" height="14" viewBox="0 0 20 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="20" height="2" rx="1" fill="white"/>
<rect y="6" width="20" height="2" rx="1" fill="white"/>
<rect y="12" width="20" height="2" rx="1" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Some files were not shown because too many files have changed in this diff Show More