Compare commits

...

578 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
ceecd1af09 php-laravel: create config class 2024-06-17 18:02:24 +05: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
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
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
982a853058 fix(go): posExt without dot 2024-05-21 14:05:22 +07:00
61f20f5ddd feat(go): update users 2024-05-16 16:39:45 +07:00
c3a5c15781 feat(go): add document-formats submodule 2024-05-14 15:02:42 +07:00
7620eb1f8e Merge branch 'develop' into feature/golang-update 2024-05-07 14:28:46 +07:00
e25ca233ee deps: bump gomod dependencies 2024-01-18 10:05:48 +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
838 changed files with 42138 additions and 1509 deletions

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

@ -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

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:

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,7 @@ name: Release
on:
push:
branches: [master,main]
branches: [master]
permissions:
contents: write
@ -63,6 +63,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 +95,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 +115,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 +136,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 }}

39
.gitmodules vendored
View File

@ -1,57 +1,72 @@
[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/diagram
[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
branch = feature/diagram
[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
branch = feature/diagram
[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
branch = feature/diagram
[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
branch = feature/diagram
[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
branch = feature/diagram
[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
branch = feature/diagram
[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
branch = feature/diagram
[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

@ -82,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/)

View File

@ -1,5 +1,56 @@
# Change Log
- ruby: support vsdx in diagram editor
- python: support vsdx in diagram editor
- php: support vsdx in diagram editor
- java: support vsdx in diagram editor
- go: support vsdx in diagram editor
- csharp-mvc: support vsdx in diagram editor
- csharp: support vsdx in diagram editor
- nodejs: support vsdx in diagram editor
## 1.13.0
- nodejs: rename in wopi
- nodejs: using faviconUrl from WOPI discovery
- 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
- 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
@ -27,8 +78,7 @@
- nodejs: pdf, djvu, xps, oxps as pdf documentType
- nodejs: filling pdf
- version number to page meta
- ar skin languages
- sr-Latn-RS 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

@ -10,6 +10,7 @@ The package contains examples written in .Net (C# MVC), .Net (C#), Java, Java Sp
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`

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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 2024
* (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 2024
* (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 2024
* (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 2024
* (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,4 +1,22 @@
.center {
/**
*
* (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;
}

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,5 +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.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
<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>

Before

Width:  |  Height:  |  Size: 558 B

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

@ -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

@ -1 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>
<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>

Before

Width:  |  Height:  |  Size: 441 B

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.

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

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 2024
* (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;
@ -220,7 +224,7 @@
}
.tableHeaderCellFileName {
width: 16%;
width: 9%;
}
.tableHeaderCellEditors {
@ -229,7 +233,12 @@
.tableHeaderCellViewers {
text-align: right;
width: 37%;
width: 9%;
}
.tableHeaderCellAction{
width: 11%;
padding-right: 82px;
}
.tableHeaderCellDownload {
@ -244,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%;
@ -277,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 ) {
@ -290,7 +309,7 @@
width: 20%;
}
.contentCells-shift {
padding-right: 28px;
padding-right: 27px;
}
.main-panel {
@ -323,11 +342,16 @@
.tableHeaderCellEditors {
text-align: left;
width: 31%;
width: 1%;
}
.tableHeaderCellViewers {
width: 18%;
width: 19%;
}
.tableHeaderCellAction {
width: 19%;
padding-right: 45px;
}
}
@ -429,8 +453,8 @@
.downloadContentCellShift {
max-width: 7%;
margin-right: -11px;
margin-left: auto;
margin-right: 24px;
margin-left: 0;
}
.contentCells-icon {
@ -438,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 {
@ -530,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) {
@ -538,7 +571,7 @@
}
.downloadContentCellShift {
padding-right: 45px;
padding-right: 16px;
max-width: 4%;
}
}
@ -558,7 +591,7 @@
.downloadContentCellShift {
max-width: 6%;
padding-right: 37px;
padding-right: 6px;
}
.firstContentCellShift {
@ -584,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%;
}
@ -619,7 +652,7 @@
.downloadContentCellShift {
max-width: 4%;
margin-right: -18px;
margin-right: 18px;
margin-left: -1px;
}
@ -628,7 +661,7 @@
}
.contentCells-icon{
width: 10%;
width: 12%;
}
footer table td {
margin: 0;

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -238,6 +238,52 @@ 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;
@ -380,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;
@ -401,6 +473,10 @@ label .checkbox {
padding-left: 35px;
}
.waiting {
opacity: 30%;
}
.current {
background-image: url("images/loader16.gif");
}
@ -413,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;
@ -420,6 +502,10 @@ label .checkbox {
line-height: 188%;
}
.step-descr.disable {
display: none;
}
.progress-descr {
letter-spacing: -0.02em;
line-height: 150%;
@ -521,26 +607,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;
@ -592,6 +687,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;
@ -638,6 +738,12 @@ footer table tr td:first-child {
width: 11%;
}
.tableHeaderCellAction{
width: 13%;
text-align: right;
padding-right: 88px;
}
.tableHeaderCellDownload {
width: 13%;
text-align: right;
@ -662,7 +768,7 @@ footer table tr td:first-child {
}
.contentCells-shift {
padding-right: 44px;
padding-right: 43px;
}
.contentCells-icon {
@ -726,7 +832,7 @@ footer table tr td:first-child {
width: 100%;
}
.icon-delete {
.icon-action {
cursor: pointer;
}
@ -805,6 +911,13 @@ html {
position: relative;
}
.typeButtonsRow {
width: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: row;
position: relative;
}
.tableRow td:first-child {
display: flex;
@ -813,11 +926,11 @@ html {
}
.tableHeaderCellFileName {
width: 30%;
width: 20%;
}
.tableHeaderCellEditors {
width: 28%;
width: 20%;
}
.tableHeaderCellViewers {

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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 2024
* (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 2024
* (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 2024
* (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.
@ -225,7 +225,7 @@ 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)
{

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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 2024
* (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 2024
* (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.
@ -78,7 +78,8 @@ namespace OnlineEditorsExampleMVC.Helpers
"Can't view chat",
"Can't protect file",
"View file without collaboration",
"Cant submit forms"
"Cant submit forms",
"Cant refresh outdated file"
};
private static List<User> users = new List<User>() {
@ -95,7 +96,8 @@ namespace OnlineEditorsExampleMVC.Helpers
descr_user_1,
true,
true,
new Goback(null, false)
new Goback(null, false),
new Close(null, false)
),
new User(
"uid-2",
@ -115,7 +117,8 @@ namespace OnlineEditorsExampleMVC.Helpers
descr_user_2,
false,
true,
new Goback("Go to Documents", null)
new Goback("Go to Documents", null),
new Close(null, true)
),
new User(
"uid-3",
@ -135,7 +138,8 @@ namespace OnlineEditorsExampleMVC.Helpers
descr_user_3,
false,
false,
null
null,
new Close(null, true)
),
new User(
"uid-0",
@ -150,6 +154,7 @@ namespace OnlineEditorsExampleMVC.Helpers
descr_user_0,
false,
false,
null,
null
)
};
@ -242,8 +247,9 @@ namespace OnlineEditorsExampleMVC.Helpers
public 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)
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;
@ -258,6 +264,7 @@ namespace OnlineEditorsExampleMVC.Helpers
this.userInfoGroups = userInfoGroups;
this.avatar = avatar;
this.goback = goback;
this.close = close;
}
}
@ -274,4 +281,18 @@ namespace OnlineEditorsExampleMVC.Helpers
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 2024
* (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 2024
* (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.
@ -77,19 +77,18 @@ namespace OnlineEditorsExampleMVC.Models
var jss = new JavaScriptSerializer();
var ext = Path.GetExtension(FileName).ToLower(); // get file extension
var canFill = DocManagerHelper.FillFormExts.Contains(ext);
var editorsMode = Mode ?? (canFill ? "fillForms" : "edit"); // get editor mode
var editorsMode = Mode ?? "edit"; // get editor mode
var canEdit = DocManagerHelper.EditedExts.Contains(ext); // check if the file with such an extension can be edited
var id = request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id); // get the user
if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && canFill) {
if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && DocManagerHelper.FillFormExts.Contains(ext)) {
editorsMode = "fillForms";
canEdit = true;
}
var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.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
@ -221,6 +220,13 @@ namespace OnlineEditorsExampleMVC.Models
{ "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>{}
}
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -31,10 +31,12 @@ namespace OnlineEditorsExampleMVC.Models
{
public enum FileType
{
Null,
Word,
Cell,
Slide,
Pdf
Pdf,
Diagram
}
// get file type
@ -46,8 +48,9 @@ namespace OnlineEditorsExampleMVC.Models
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
}
}
@ -201,6 +204,20 @@ namespace OnlineEditorsExampleMVC.Models
.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

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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

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

View File

@ -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,3 +1,21 @@
/**
*
* (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.
*
*/
function deleteFile(event) {
let filename = event.currentTarget.getAttribute("data");
filename = encodeURIComponent(filename);

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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 2024
* (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 2024
* (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.
@ -109,7 +109,7 @@ if (typeof jQuery != "undefined") {
var timer = null;
var checkConvert = function (filePass, fileType) {
filePass = filePass ? filePass : null;
filePass = filePass ? filePass : null;
if (timer != null) {
clearTimeout(timer);
}
@ -121,7 +121,7 @@ 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 (!formatManager.isAutoConvertible(posExt)) {
@ -154,6 +154,16 @@ 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);
@ -294,6 +304,134 @@ 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("done");
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("#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");
if (response.error !== "FileTypeIsNotSupported") {
jq("#hiddenFileName").attr("data",response.filename);
jq("#beginEditConverted").removeClass("disable");
jq("#beginViewConverted").removeClass("disable");
jq("#downloadConverted").attr("data","fromStorage");
} else {
let newFilename = fileName.split('.').slice(0,-1).join('.')
jq("#hiddenFileName").attr("data",response.filename.split("&filename=download").join(`&filename=${newFilename}`));
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", "");

View File

@ -14,7 +14,7 @@
<meta name="mobile-web-app-capable" content="yes" />
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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,8 +62,8 @@
// 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
@ -106,6 +106,15 @@
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 !== undefined) {
@ -182,6 +191,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 +239,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 +312,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();
@ -309,6 +378,7 @@
config.events = {
'onAppReady': onAppReady,
'onDocumentStateChange': onDocumentStateChange,
'onUserActionRequired': onUserActionRequired,
'onError': onError,
'onOutdatedVersion': onOutdatedVersion,
"onMakeActionLink": onMakeActionLink,
@ -319,6 +389,8 @@
};
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
@ -346,12 +418,20 @@
// 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;
}
var сonnectEditor = function () {
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
};
const getFileExt = function (fileName) {
if (fileName.indexOf(".")) {
return fileName.split('.').reverse()[0];
}
return false;
};
if (window.addEventListener) {
window.addEventListener("load", сonnectEditor);
} else if (window.attachEvent) {

View File

@ -14,7 +14,7 @@
<meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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

@ -16,7 +16,7 @@
<meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -192,8 +192,7 @@
<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>
@ -301,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>
@ -377,6 +384,32 @@
</div>
</div>
<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>
<span id="loadScripts" data-docs="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>"></span>
<footer>

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width" />
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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 2024
* (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.
@ -93,6 +93,9 @@ namespace OnlineEditorsExampleMVC
case "formats":
Formats(context);
break;
case "config":
Config(context);
break;
}
}
@ -254,8 +257,15 @@ namespace OnlineEditorsExampleMVC
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);
@ -278,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);
@ -302,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();
@ -687,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 + "/"
@ -708,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;
@ -1000,6 +1029,74 @@ namespace OnlineEditorsExampleMVC
}
}
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)
{

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<appSettings>
<clear />
<add key="version" value="1.10.0"/>
<add key="version" value="1.13.0"/>
<add key="filesize-max" value="52428800"/>
<add key="storage-path" value=""/>
@ -16,14 +16,14 @@
<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|en-GB:English (United Kingdom)|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-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|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|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.command" value="command"/>
<add key="files.docservice.url.example" value=""/>

View File

@ -1,4 +1,22 @@
.center {
/**
*
* (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;
}

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,5 +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.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
<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>

Before

Width:  |  Height:  |  Size: 558 B

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

@ -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

@ -1 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>
<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>

Before

Width:  |  Height:  |  Size: 441 B

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.

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

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 2024
* (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;
@ -220,7 +224,7 @@
}
.tableHeaderCellFileName {
width: 16%;
width: 9%;
}
.tableHeaderCellEditors {
@ -229,7 +233,12 @@
.tableHeaderCellViewers {
text-align: right;
width: 37%;
width: 9%;
}
.tableHeaderCellAction{
width: 11%;
padding-right: 82px;
}
.tableHeaderCellDownload {
@ -244,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%;
@ -277,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 ) {
@ -290,7 +309,7 @@
width: 20%;
}
.contentCells-shift {
padding-right: 28px;
padding-right: 27px;
}
.main-panel {
@ -323,11 +342,16 @@
.tableHeaderCellEditors {
text-align: left;
width: 31%;
width: 1%;
}
.tableHeaderCellViewers {
width: 18%;
width: 19%;
}
.tableHeaderCellAction {
width: 19%;
padding-right: 45px;
}
}
@ -429,8 +453,8 @@
.downloadContentCellShift {
max-width: 7%;
margin-right: -11px;
margin-left: auto;
margin-right: 24px;
margin-left: 0;
}
.contentCells-icon {
@ -438,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 {
@ -530,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) {
@ -538,7 +571,7 @@
}
.downloadContentCellShift {
padding-right: 45px;
padding-right: 16px;
max-width: 4%;
}
}
@ -558,7 +591,7 @@
.downloadContentCellShift {
max-width: 6%;
padding-right: 37px;
padding-right: 6px;
}
.firstContentCellShift {
@ -584,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%;
}
@ -619,7 +652,7 @@
.downloadContentCellShift {
max-width: 4%;
margin-right: -18px;
margin-right: 18px;
margin-left: -1px;
}
@ -628,7 +661,7 @@
}
.contentCells-icon{
width: 10%;
width: 12%;
}
footer table td {
margin: 0;

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -238,6 +238,52 @@ 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;
@ -380,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;
@ -401,6 +473,10 @@ label .checkbox {
padding-left: 35px;
}
.waiting {
opacity: 30%;
}
.current {
background-image: url("images/loader16.gif");
}
@ -413,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;
@ -420,6 +502,10 @@ label .checkbox {
line-height: 188%;
}
.step-descr.disable {
display: none;
}
.progress-descr {
letter-spacing: -0.02em;
line-height: 150%;
@ -525,26 +611,35 @@ footer a:hover {
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;
@ -596,6 +691,11 @@ footer a:hover {
visibility: hidden;
}
.convertTable {
margin-top: 10px;
margin-left: 35px;
}
.tableRow {
background: transparent;
-moz-transition: all 0.2s ease-in-out;
@ -642,6 +742,12 @@ footer a:hover {
width: 11%;
}
.tableHeaderCellAction{
width: 13%;
text-align: right;
padding-right: 88px;
}
.tableHeaderCellDownload {
width: 13%;
text-align: right;
@ -666,7 +772,7 @@ footer a:hover {
}
.contentCells-shift {
padding-right: 44px;
padding-right: 43px;
}
.contentCells-icon {
@ -730,7 +836,7 @@ footer a:hover {
width: 100%;
}
.icon-delete {
.icon-action {
cursor: pointer;
}
@ -809,6 +915,13 @@ html {
position: relative;
}
.typeButtonsRow {
width: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: row;
position: relative;
}
.tableRow td:first-child {
display: flex;
@ -817,11 +930,11 @@ html {
}
.tableHeaderCellFileName {
width: 30%;
width: 20%;
}
.tableHeaderCellEditors {
width: 28%;
width: 20%;
}
.tableHeaderCellViewers {

View File

@ -17,7 +17,7 @@
<title>ONLYOFFICE</title>
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -194,8 +194,7 @@
<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>
@ -303,14 +302,22 @@
<img src="app_themes/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="app_themes/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="app_themes/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="app_themes/images/delete.svg" alt="Delete" title="Delete" />
<img class="icon-action" src="app_themes/images/delete.svg" alt="Delete" title="Delete" />
</a>
</td>
</tr>
@ -379,6 +386,32 @@
</div>
</div>
<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>
<span id="loadScripts" data-docs="<%= UrlPreloadScripts %>"></span>
<footer>

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -254,6 +254,7 @@ namespace OnlineEditorsExample
if (FormatManager.DocumentExtensions().Contains(ext)) return "word"; // word for text document extensions
if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell"; // cell for spreadsheet extensions
if (FormatManager.PresentationExtensions().Contains(ext)) return "slide"; // slide for presentation extensions
if (FormatManager.DiagramExtensions().Contains(ext)) return "diagram"; // diagram for diagram extensions
return "word"; // the default document type is word
}
@ -447,8 +448,15 @@ namespace OnlineEditorsExample
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 (ConvertExts.Contains("." + extension))
if (ConvertExts.Contains("." + extension) || conversionExtension != "ooxml")
{
// generate document key
var key = ServiceConverter.GenerateRevisionId(FileUri(_fileName, true));
@ -469,9 +477,13 @@ namespace OnlineEditorsExample
}
var newFileUri = newFileData["fileUrl"];
var newFileType = "." + newFileData["fileType"];
var newFileType = newFileData["fileType"];
if (!FormatManager.All().Any(f => f.Name == newFileType && f.Type != ""))
{
return "{\"step\": \"" + result + "\", \"filename\": \"" + newFileUri + "\", \"error\": \"FileTypeIsNotSupported\"}";
}
// get a file name of an internal file extension with an index if the file with such a name already exists
var fileName = GetCorrectName(Path.GetFileNameWithoutExtension(_fileName) + newFileType);
var fileName = GetCorrectName(Path.GetFileNameWithoutExtension(_fileName) + "." + newFileType);
var req = (HttpWebRequest)WebRequest.Create(newFileUri);
@ -493,17 +505,21 @@ namespace OnlineEditorsExample
}
}
// remove the original file and its history if it exists
var storagePath = StoragePath(_fileName, null);
var histDir = HistoryDir(storagePath);
File.Delete(storagePath);
if (Directory.Exists(histDir)) Directory.Delete(histDir, true);
if (removeOriginal)
{
// remove the original file and its history if it exists
var storagePath = StoragePath(_fileName, null);
var histDir = HistoryDir(storagePath);
File.Delete(storagePath);
if (Directory.Exists(histDir)) Directory.Delete(histDir, true);
}
// create meta information about the converted file with user id and name specified
_fileName = fileName;
var id = context.Request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id); // get the user
DocEditor.CreateMeta(_fileName, user.id, user.name, null);
return "{\"step\": \"" + result + "\", \"filename\": \"" + _fileName + "\"}";
}
return "{ \"filename\" : \"" + _fileName + "\"}";

View File

@ -12,10 +12,10 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-capable" content="yes" />
<link rel="icon" href="<%= "app_themes/images/" + DocumentType + ".ico" %>" type="image/x-icon" />
<title>ONLYOFFICE</title>
<title><%= FileName + " - ONLYOFFICE" %></title>
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -80,8 +80,8 @@
// 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
@ -124,6 +124,15 @@
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 !== undefined) {
@ -194,6 +203,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;
@ -233,6 +254,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 onRequestUsers = function (event) {
if (event && event.data){
var c = event.data.c;
@ -276,6 +343,7 @@
config.events = {
'onAppReady': onAppReady,
'onDocumentStateChange': onDocumentStateChange,
'onUserActionRequired': onUserActionRequired,
'onError': onError,
'onOutdatedVersion': onOutdatedVersion,
'onMakeActionLink': onMakeActionLink,
@ -286,7 +354,8 @@
};
if (config.editorConfig.user.id) {
config.events['onRequestRefreshFile'] = onRequestRefreshFile;
config.events['onRequestClose'] = onRequestClose;
config.events['onRequestHistory'] = function (event) { // the user is trying to show the document version history
let xhr = new XMLHttpRequest();
@ -317,9 +386,11 @@
config.events['onRequestRestore'] = function (event) {
var fileName = "<%= 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();
@ -347,12 +418,20 @@
// 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;
}
var сonnectEditor = function () {
docEditor = new DocsAPI.DocEditor("iframeEditor", config);
};
const getFileExt = function (fileName) {
if (fileName.indexOf(".")) {
return fileName.split('.').reverse()[0];
}
return false;
};
if (window.addEventListener) {
window.addEventListener("load", сonnectEditor);
} else if (window.attachEvent) {

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -140,9 +140,8 @@ namespace OnlineEditorsExample
// get file extension
var ext = Path.GetExtension(FileName).ToLower();
var canFill = _Default.FillFormsExts.Contains(ext);
// get editor mode or set the default one (edit)
var editorsMode = Request.GetOrDefault("editorsMode", canFill ? "fillForms" : "edit");
var editorsMode = Request.GetOrDefault("editorsMode", "edit");
var canEdit = _Default.EditedExts.Contains(ext); // check if this file can be edited
var editorsType = Request.GetOrDefault("editorsType", "desktop");
@ -150,11 +149,11 @@ namespace OnlineEditorsExample
var id = Request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id); // get the user
if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && canFill) {
if ((!canEdit && editorsMode.Equals("edit") || editorsMode.Equals("fillForms")) && _Default.FillFormsExts.Contains(ext)) {
editorsMode = "fillForms";
canEdit = true;
}
var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.id.Equals("uid-1"); // check if the Submit form button is displayed or hidden
var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1"); // check if the Submit form button is displayed or hidden
var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // get the editor opening mode (edit or view)
var jss = new JavaScriptSerializer();
@ -288,6 +287,13 @@ namespace OnlineEditorsExample
{ "text", user.goback.text },
{ "blank", user.goback.blank }
} : new Dictionary<string, object>{}
},
{
"close", user.close != null ? new Dictionary<string, object>
{
{ "visible", user.close.visible },
{ "text", user.close.text }
} : new Dictionary<string, object>{}
}
}
}

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -227,7 +227,7 @@ namespace ASC.Api.DocumentConverter
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)
{

View File

@ -13,7 +13,7 @@
<title>ONLYOFFICE</title>
<!--
*
* (c) Copyright Ascensio System SIA 2024
* (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 2024
* (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.
@ -46,6 +46,7 @@ namespace OnlineEditorsExample
{
var ext = Path.GetExtension(fileName).ToLower();
if (FormatManager.PdfExtensions().Contains(ext)) return "pdf"; // pdf for pdf extensions
if (FormatManager.DocumentExtensions().Contains(ext)) return "word"; // word for text document extensions
if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell"; // cell for spreadsheet extensions
if (FormatManager.PresentationExtensions().Contains(ext)) return "slide"; // slide for presentation extensions

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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.
@ -164,6 +164,20 @@ namespace OnlineEditorsExample
.ToList();
}
public static List<string> DiagramExtensions()
{
return Diagrams()
.Select(format => format.Extension())
.ToList();
}
public static List<Format> Diagrams()
{
return All()
.Where(format => format.Type == "diagram")
.ToList();
}
public static List<string> AllExtensions()
{
return All()

View File

@ -1,6 +1,6 @@
/**
*
* (c) Copyright Ascensio System SIA 2024
* (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

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

View File

@ -39,7 +39,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 *settings.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**
@ -67,7 +75,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 2024
* (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 2024
* (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.
@ -77,7 +77,8 @@ namespace OnlineEditorsExample
"Can't view chat",
"Can't protect file",
"View file without collaboration",
"Cant submit forms"
"Cant submit forms",
"Cant refresh outdated file"
};
private static List<User> users = new List<User>() {
@ -94,7 +95,8 @@ namespace OnlineEditorsExample
descr_user_1,
true,
true,
new Goback(null, false)
new Goback(null, false),
new Close(null, false)
),
new User(
"uid-2",
@ -114,7 +116,8 @@ namespace OnlineEditorsExample
descr_user_2,
false,
true,
new Goback("Go to Documents",null)
new Goback("Go to Documents",null),
new Close(null, true)
),
new User(
"uid-3",
@ -134,7 +137,8 @@ namespace OnlineEditorsExample
descr_user_3,
false,
false,
null
null,
new Close(null, true)
),
new User(
"uid-0",
@ -149,6 +153,7 @@ namespace OnlineEditorsExample
descr_user_0,
false,
false,
null,
null
)
};
@ -242,8 +247,9 @@ namespace OnlineEditorsExample
public List<string> userInfoGroups;
public 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)
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;
@ -258,6 +264,7 @@ namespace OnlineEditorsExample
this.userInfoGroups = userInfoGroups;
this.avatar = avatar;
this.goback = goback;
this.close = close;
}
}
@ -274,4 +281,18 @@ namespace OnlineEditorsExample
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 2024
* (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 2024
* (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.
@ -93,6 +93,9 @@ namespace OnlineEditorsExample
case "formats":
Formats(context);
break;
case "config":
Config(context);
break;
}
}
@ -486,6 +489,7 @@ namespace OnlineEditorsExample
var fileName = (string)body["fileName"];
var version = (int)body["version"];
var url = body.ContainsKey("url") ? (string)body["url"] : null;
var lastVersionUri = _Default.FileUri(fileName, true);
var key = ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
@ -509,7 +513,19 @@ namespace OnlineEditorsExample
File.Copy(changesPath, Path.Combine(currentVersionDir, "changes.json"));
}
File.Copy(Path.Combine(verDir, "prev" + ext), _Default.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(_Default.StoragePath(fileName, null), memoryStream.ToArray());
}
else
{
File.Copy(Path.Combine(verDir, "prev" + ext), _Default.StoragePath(fileName, null), true);
}
var fileInfo = new FileInfo(_Default.StoragePath(fileName, null));
fileInfo.LastWriteTimeUtc = DateTime.UtcNow;
@ -815,6 +831,83 @@ namespace OnlineEditorsExample
}
}
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")
: "{}";
var userAdress = HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
if (string.IsNullOrEmpty(fileName) || !File.Exists(_Default.StoragePath(fileName, userAdress)))
{
context.Response.Write("{ \"error\": \"File is not exist\"}");
return;
}
var id = context.Request.Cookies.GetOrDefault("uid", null);
var user = Users.getUser(id);
var callbackUrl = new UriBuilder(_Default.GetServerUrl(true));
callbackUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+ (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+ "webeditor.ashx";
callbackUrl.Query = "type=track" + "&fileName="
+ HttpUtility.UrlEncode(fileName)
+ "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
var callback = callbackUrl.ToString();
var jss = new JavaScriptSerializer();
var config = new Dictionary<string, object>
{
{
"document", new Dictionary<string, object>
{
{"key", ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
+ "/" + Path.GetFileName(_Default.FileUri(fileName, true))
+ "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode())},
{"title", fileName},
{"url", DocEditor.getDownloadUrl(fileName)},
{"permissions", JsonConvert.DeserializeObject<Dictionary<string, object>>(permissions)},
{"directUrl", directUrl ? DocEditor.getDownloadUrl(fileName, false) : null},
{
"referenceData", new Dictionary<string, object>
{
{"fileKey", !user.id.Equals("uid-0") ?
jss.Serialize(new Dictionary<string, object>{
{"fileName", fileName},
{"userAddress", userAdress}
}) : null },
{"instanceId", _Default.GetServerUrl(false)}
}
}
}
},
{
"editorConfig", new Dictionary<string, object>
{
{"callbackUrl", callback},
{"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)
{

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