df62b3862f
Merge branch 'release/v1.0.0' into develop
...
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
2023-04-10 17:24:09 +03:00
3130276715
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-09 23:29:30 +03:00
8a2ad6b27f
revert old sample documents creating
2023-04-09 23:29:19 +03:00
40e7935d68
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
...
Feature/quota via websocket
2023-04-07 21:51:32 +04:00
a6869cce18
si-LK empty files
2023-04-07 19:23:00 +05:00
8d9b4404cf
fix Bug 61978
2023-04-07 16:53:30 +03:00
64c44bed2a
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-07 16:14:11 +04:00
ecc4f73c54
fixed feed time zone
2023-04-07 11:57:02 +03:00
d06c04eccf
fixed first visit
2023-04-05 18:07:35 +03:00
cd87de9540
fixed date format in room history
2023-04-05 16:54:33 +03:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
NikitaVashchuk
bcdab67ba0
fix notify webSocket about rooms count
2023-04-04 18:10:15 +05:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05:00
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
b54dd7c4f3
optimization first visit
2023-04-04 11:33:16 +03:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
84e7a7b298
fix di
2023-04-03 12:44:23 +03:00
137ae55648
fixed Bug 61882
2023-04-03 12:21:36 +03:00
1fa94b04a8
fixed duplicating virtual rooms folder
2023-04-03 11:31:58 +03:00
4218529601
Files: thirdparty. fix DI
2023-03-31 00:30:08 +03:00
5aacc82904
fixed room history
2023-03-30 18:36:22 +03:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
87234ea2bf
Merge pull request #1314 from ONLYOFFICE/features/formats
...
Features/formats
2023-03-30 13:09:48 +05:00
0af471a215
fixed history
2023-03-29 13:46:54 +03:00
57bba9e400
thumbnail: separate settings for image/video
2023-03-28 12:57:01 +03: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
