Commit Graph

910 Commits

Author SHA1 Message Date
92325894f9 build(ruby): add nokogiri for linux-musl to gemfile.lock to run using docker. Fix Bug 73519 2025-03-19 15:27:04 +07:00
0d2fb178fa build(ruby): bump rack to 2.2.13 2025-03-19 11:16:23 +03:00
ab0993f09f feat(ruby): add jwt token lifetime from config 2025-02-24 17:18:52 +03:00
c2d01c68fb build(ruby): bump nokogiri to 1.18.3 2025-02-24 15:07:27 +03:00
08fe615b93 fix(ruby): support for mobile screens with width less than 320px 2025-02-20 13:16:45 +03:00
bde7dd1ae5 build(ruby): bump rack to 2.2.11 2025-02-17 09:31:23 +03:00
81bb9e22e0 build(ruby): bump net-imap to 0.4.19 2025-02-17 09:31:23 +03:00
f57fa79ce2 1.13.0 2025-02-11 18:09:50 +03: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
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
13d5d38abc support hwp, hwpx, pages, numbers, key formats 2025-02-07 11:54:56 +03:00
ed1759181a update submodules 2025-02-06 18:24:39 +03:00
a53fa55a89 feat(ruby): onUserActionRequired 2025-02-06 15:29:19 +07: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
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
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
b7d863b0e1 Revert "feat: add kurdish language"
This reverts commit a0da50d123.

# Conflicts:
#	CHANGELOG.md
2025-01-29 14:14:29 +03: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
b3de340b66 Merge remote-tracking branch 'remotes/origin/develop' into feature/restore-by-url
# Conflicts:
#	CHANGELOG.md
2025-01-27 11:47:12 +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
afb8ab651c fix(ruby): update tab icons 2025-01-27 15:12:25 +07:00
a0da50d123 feat: add kurdish language 2025-01-27 13:58:41 +07:00
63d9a4fb56 feat(ruby): restore file by url 2025-01-27 12:55:48 +07:00
2f8306e725 update submodules 2025-01-21 15:27:03 +03:00
f715ed454d sq-AL skin language 2025-01-10 16:33:00 +03:00
31649e7203 feat(ruby): refresh file config 2024-12-13 15:01:44 +07:00
c1d98d9df9 build(ruby): bump rails-html-sanitizer from 1.6.0 to 1.6.1 2024-12-04 15:16:35 +07:00
3186245cc8 update file type icons 2024-11-26 17:19:28 +03: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
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
02adb6cdca copyright to forgotten 2024-11-21 13:14:37 +03:00
c28aec0c0f fix(ruby): public url for unsupported converted files 2024-11-21 15:54:56 +07:00
321e60b17d fix(ruby): available formats for forced conversion 2024-11-21 13:19:06 +07:00
5dc7ffdecd update submodules 2024-11-08 17:13:49 +03:00
e8e42b6632 build(ruby): bump rexml from 3.3.3 to 3.3.9 2024-11-07 14:50:29 +07:00
d2eb17607d feat(ruby): convert button 2024-10-30 16:32:35 +07: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
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
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
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
4bdae5d83b fix(ruby): revert filling by default 2024-10-16 15:00:21 +07:00