Commit Graph

21517 Commits

Author SHA1 Message Date
630250b439 fix tests 2022-06-30 12:07:30 +03:00
adc789eaf6
Merge pull request #694 from ONLYOFFICE/feature/get-thumbnail-from-thirdparty
Feature/get thumbnail from thirdparty
2022-06-29 20:55:27 +03:00
de068f869e thumb: fix 2022-06-29 20:55:01 +03:00
75be0827d7 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
#	products/ASC.Files/Service/GlobalUsings.cs
2022-06-29 20:01:27 +03:00
00359fa4cc
Merge pull request #703 from ONLYOFFICE/fix/order_endponts
fix order endpoints
2022-06-29 19:44:11 +03:00
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
9bea14405c Merge branch 'develop' into fix/order_endponts 2022-06-29 18:45:50 +03:00
94224eb6c3
Merge pull request #704 from ONLYOFFICE/feature/delete_expired_service
first version: delete expired service
2022-06-29 18:35:20 +03:00
5ccd9d01a5 DeleteExpiredService: launch frequency 2022-06-29 18:34:50 +03:00
21ea7ec019 first version: delete expired service 2022-06-29 11:55:54 +03:00
fa815c6254 fix order endpoints 2022-06-28 15:53:06 +03:00
83bb63ff0c remove waste 2022-06-28 15:33:22 +03:00
d1063df40c Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-28 15:32:06 +03:00
772b42f636
Merge pull request #702 from ONLYOFFICE/feature/settings-docspace-mode
feature/settings-docspace-mode
2022-06-28 14:51:57 +03:00
933b0696ef WebApi: added docspace in settings 2022-06-28 14:47:28 +03:00
5cc38b95df add fFmpegFormats and imageFormatsCanBeCrop 2022-06-28 14:39:20 +03:00
2b48707f5c sso: fix 2022-06-28 12:36:34 +03:00
dd52a695e5 fix build 2022-06-27 23:18:23 +03:00
de51c8e1db box: fix GetThumbnail 2022-06-27 16:40:26 +03:00
716c188457
Merge pull request #697 from ONLYOFFICE/feature/branding
Feature/branding
2022-06-24 19:08:22 +03:00
b58422cfee Merge branch 'develop' into feature/branding 2022-06-24 18:51:33 +03:00
594babd0f1
Merge pull request #700 from ONLYOFFICE/feature/fix-sso
fixed sso path
2022-06-24 18:45:45 +03:00
e8cf4e7906 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-24 16:24:26 +03:00
4ad4c34b34 fix 2022-06-24 16:23:56 +03:00
fef096b0a5 fix generating thumbnails for video 2022-06-24 16:22:52 +03:00
237519c75c
Merge pull request #701 from ONLYOFFICE/feature/comunity-compatibility
Feature/comunity compatibility
2022-06-24 16:20:18 +03:00
6bb9d054c7 Sql: fix 2022-06-24 16:18:37 +03:00
38371beac6 Sql: added comunity compatibility 2022-06-24 16:16:02 +03:00
30d0ca4b97 Files: added comunity compability 2022-06-24 15:46:59 +03:00
d85c4dac29 fix 2022-06-24 12:15:56 +03:00
09612d377d box: add check can create thumbnail 2022-06-24 11:53:12 +03:00
27694eb157 fixed sso path 2022-06-24 10:32:04 +03:00
45e791a092 removed unused code 2022-06-23 16:00:24 +03:00
96775f7a0a fix for eb896018d4 2b19ec7997 2022-06-23 15:43:22 +03:00
20deb4458a thumbnails: adaptive size 2022-06-23 15:18:15 +03:00
af252cc949 fix 2022-06-23 12:24:20 +03:00
c9eaeed719 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
2022-06-23 12:09:13 +03:00
5bcbae5711 fix 2022-06-23 11:48:31 +03:00
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
2022-06-22 11:55:36 +04:00
1ae8636021 Sql: added docspace_upgrade.sql 2022-06-22 10:50:55 +03:00
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00
5e491a6849 Common: fix 2022-06-21 20:32:29 +03:00
b30ec3c1bd Files: added room api docs 2022-06-21 18:43:54 +03:00
1aadf26fe2 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 17:05:04 +03:00
b78feb8ae9 refactoring 2022-06-21 12:57:20 +03:00
494b2bc1e0 merge 2022-06-21 10:53:05 +03:00
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
72f0ac4f9b file converter server: fixed bugs 2022-06-20 19:58:08 +03:00
c3faf982c5 Files: fix download 2022-06-20 18:29:07 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00