Commit Graph

631 Commits

Author SHA1 Message Date
3e4b1b509b feat(java): refresh file config 2024-12-13 14:14:44 +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
4eecbdeb3d fix(java): available formats for forced conversion 2024-11-20 16:50:50 +07:00
5dc7ffdecd update submodules 2024-11-08 17:13:49 +03:00
55b709f87c feat(java): convert button 2024-10-30 16:32:34 +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
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
cf9bc29986 fix(java): 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
c039a8a94e feat(java): onRequestReferenceSource 2024-10-15 16:25:30 +07:00
00f43b6ecd feat(java): close editor. Fix Bug 69915 2024-10-10 15:32:42 +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
35cf2fb0b0 submit for all modes 2024-10-07 14:54:16 +03:00
353e1b9ea6 feat(java): filename in editor page title 2024-10-07 16:00:12 +07: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
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
596d445439 revert empty files (For Bug 70101) 2024-09-24 15:06:16 +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
581f2aaef6 he-IL skin language 2024-09-23 10:51:25 +03: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
14df5fcfa0 fix: add file existence check before save 2024-09-17 14:17:00 +03:00
4c6e6dc235 fix(java): not blank page goback for uid-2. Fix Bug 69945 2024-09-13 16:31:05 +07:00
f55beaa8ac update empty files (Fix Bug 70100) 2024-09-10 18:11:50 +03:00
4be1abca19 update submodule with tiff ext 2024-09-09 09:24:36 +03:00
1e6465aef7 update templates 2024-08-26 11:06:04 +03:00
c46b4e16d5 fix remove favorite status (0e1a580a86) 2024-07-31 14:28:21 +03:00
8d7767e4a7 1.10.0 2024-07-25 09:50:41 +03:00
d0b1cc9900 feat(java): creating and editing pdf instead docxf 2024-07-16 16:21:15 +07:00
e088efe744 fix link in readme 2024-07-02 11:02:08 +03:00
d564e78b2c Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-design 2024-06-14 13:31:31 +03:00
0561a1068c Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-06-07 09:46:26 +03:00
d6309505ff 1.9.0 2024-06-07 09:43:21 +03:00
95e7aff092 Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/wopiIndex.ejs
2024-06-07 08:49:20 +03:00
8207aec7a5 sr-Cyrl-RS skin language
# Conflicts:
#	CHANGELOG.md
2024-06-06 17:26:17 +03:00
a5fa0096e8 en-GB skin language
# Conflicts:
#	CHANGELOG.md
2024-06-06 17:25:51 +03:00
0c886264ba fix sr-Latn-RS
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/csharp/settings.config
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/java/src/main/resources/settings.properties
2024-06-06 17:25:23 +03:00
cfd010cc99 sr-Cyrl-RS skin language 2024-05-27 13:22:33 +03:00
a37fee7192 feat(java): implement design for mobile devices 2024-05-20 19:09:26 +05:00
354b500077 Merge branch 'develop' into feature/forgotten-page 2024-05-13 14:02:51 +05:00
107459cf19 en-GB skin language 2024-04-24 13:22:57 +03:00
3fc658b0f8 feat(java): control access to forgotten page using config variable 2024-04-22 22:52:06 +05:00