Commit Graph

10937 Commits

Author SHA1 Message Date
a733c29c2b Merge branch 'develop' into refactoring/generic-classes 2023-04-04 12:33:26 +03:00
91373783c2 fix thirdparty 2023-04-04 12:10:20 +03:00
84e7a7b298 fix di 2023-04-03 12:44:23 +03:00
4218529601 Files: thirdparty. fix DI 2023-03-31 00:30:08 +03:00
87234ea2bf
Merge pull request #1314 from ONLYOFFICE/features/formats
Features/formats
2023-03-30 13:09:48 +05:00
b02c9685c4 Thirdparty: removed FolderDao 2023-03-27 19:46:07 +03:00
186937af19 ThirdPArty: removed tagdao 2023-03-27 19:42:47 +03:00
e2b38bdb18 fix auto clean up 2023-03-27 12:51:39 +03:00
410dd4f7d0 refactoring 2023-03-24 12:29:28 +03:00
1b9ce8a84b ffmpeg: change params for generate thumbnails 2023-03-24 00:14:18 +03:00
8d54748d55 fixed room deletion 2023-03-23 16:53:33 +03:00
0abe404476 invitation link: added tariff/quota/permissions check, refactoring 2023-03-23 16:22:01 +03:00
56d877eed2 fixed Bug 61717 2023-03-22 14:56:37 +03:00
c8cb5d087a convert ooxml(pr 1304) 2023-03-21 13:42:19 +03:00
ebd4f7d17c Merge branch 'develop' into refactoring/generic-classes
# Conflicts:
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Service/Startup.cs
2023-03-20 21:10:08 +03:00
c6a9716141 ffmpeg: added WaitToExit() 2023-03-20 21:03:35 +03:00
a1ad11020d Thumb: fix. 2023-03-20 18:53:35 +03:00
42330090cf thumbnail: the best quality 2023-03-17 17:03:17 +03:00
ee22721d46 thumbnail: the best quality 2023-03-17 15:40:21 +03:00
26243d75ac Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-17 15:19:23 +03:00
c993ad4986 ffmpeg: fixed paths 2023-03-17 15:19:09 +03:00
1fa7a1569a Files: added additional information for audit 2023-03-17 14:35:35 +03:00
4353f8f432 fix Bug 61186 2023-03-17 12:27:56 +03:00
d073a3795c thumbnails: added setup resize mode 2023-03-16 18:59:46 +03:00
b64e35f6e1 Files: blocked creating rooms with types: view, filling forms, review 2023-03-16 11:27:31 +03:00
7f24a0ee38 thumbnails: AnchorPositionMode.Top for docs 2023-03-15 19:39:53 +03:00
2ff1ba77a3 filehandler: added preview images 2023-03-13 20:11:15 +03:00
8b33140c65 Files: audit edits 2023-03-13 19:03:50 +03:00
0c7410814d Files: added new audit actions, refactor 2023-03-13 19:00:16 +03:00
f053663499 fixed DeleteExpiredService 2023-03-10 22:32:30 +03:00
47e14d50fb async/await: added new instance dbcontext 2023-03-10 19:49:46 +03:00
132bc6792b
Merge pull request #1297 from ONLYOFFICE/feature/notifications
Feature/notifications
2023-03-10 17:06:55 +03:00
722df36493 async: fixed 2023-03-10 16:09:32 +03:00
Vashchuk Nikita
2d92da7c0c Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
#	web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
Vashchuk Nikita
473cecc4db cleaning up resources, refactoring 2023-03-10 16:16:58 +05:00
5dc1d703e2 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-10 11:42:26 +03:00
e5f733c771 fix Bug 61076 2023-03-10 11:39:54 +03:00
340e1d51d2 fix bug 61527 and bug 61526
now when move/copy folder markAsNew only files in this folders
2023-03-10 11:37:16 +03:00
61351f089f thubmnail: change resize alg 2023-03-10 00:54:17 +03:00
f1bfefe9c1 thubmnail: change resize alg 2023-03-09 22:16:15 +03:00
Vashchuk Nikita
f3f1cd1adc fix userName, added collaborator as portals Role resource 2023-03-09 20:57:21 +05:00
Vashchuk Nikita
492d8765cb added collaborator resources 2023-03-09 17:39:38 +05:00
7220d0227c thumbnailBuilder: removed replace background color 2023-03-09 14:58:05 +03:00
Vashchuk Nikita
8bbdeffa46 changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName 2023-03-09 16:40:36 +05:00
Vashchuk Nikita
5860c24c84 enable RoomsActivity subscription for all new users 2023-03-08 21:01:44 +05:00
7d57ec8a1a thumbnails: optimization, refactoring 2023-03-08 14:34:09 +03:00
Vashchuk Nikita
4d95d7c848 added roomRemoved as instant action 2023-03-07 19:37:04 +05:00
Vashchuk Nikita
4f4b4c06c2 added check roomsActivity subscription when send mentions,
added check general notification settings to determine mute attribute
2023-03-07 15:23:07 +05:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
6934ee79bc thumbnails: refactoring, optimization 2023-03-04 19:58:45 +03:00