40e7935d68
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
...
Feature/quota via websocket
2023-04-07 21:51:32 +04:00
351a2dbbd4
SignupAccountRequestDto: EmplType -> EmployeeType
2023-04-07 18:33:28 +03: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
bcb12080fa
fix async
2023-04-07 10:33:06 +03:00
b1e7c1d0e6
fix merge
2023-04-06 17:24:14 +03:00
07d847fdd1
Merge branch 'develop' into feature/optimization-ef
2023-04-06 17:24:05 +03:00
138544c86c
remove CreateExecutionStrategy
2023-04-05 19:30:35 +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
6309d9530c
fix async
2023-03-30 15:11:45 +03: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
27c7804aba
fix methods with task and without async
2023-03-28 13:49:31 +03:00
e1b01e2d81
fix methods with task and without async
2023-03-28 13:13:13 +03:00
57bba9e400
thumbnail: separate settings for image/video
2023-03-28 12:57:01 +03:00
aac1896a0f
remove CreateDbContextAsync and fix ExecuteAsync
2023-03-28 00:25:55 +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
d39c28046c
add CustomSynchronizationContext
2023-03-27 15:04:50 +03:00
e2b38bdb18
fix auto clean up
2023-03-27 12:51:39 +03:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
410dd4f7d0
refactoring
2023-03-24 12:29:28 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +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
fc78a0508d
TenantDbContext -async part2
2023-03-22 11:27:01 +03:00
18cc3d09c6
fix async
2023-03-21 17:28:06 +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
a3800de721
TenantDbContext -async part1
2023-03-20 19:16:00 +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
603fc8cc0f
MessagesContext - async
2023-03-16 18:23:59 +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
393887f67b
FilesDbContext- async
2023-03-15 16:24:02 +03:00
405ed839bb
CoreDbContext -async
2023-03-14 23:44:44 +03:00
1d87baec93
AccountLinkContext - async
2023-03-13 23:07:37 +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
f95c56198e
thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring
2023-03-03 22:49:36 +03:00
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
ab716af522
InternalMoveFileAsync fixed
2023-03-02 13:15:35 +03:00
e73df55f3c
Bug 61218
2023-03-01 20:32:44 +03:00
803f48d0ac
fix search by title?
2023-03-01 19:05:17 +03:00
8b500ae37d
Merge pull request #1257 from ONLYOFFICE/bugfix/60605
...
bugfix/60605
2023-03-01 17:41:31 +03:00
Vashchuk Nikita
082c5f968c
fix mentions letter format, added roomsNotificationSettings check
2023-03-01 19:15:35 +05:00
6c428d9bbb
fix Bug 61111
2023-03-01 14:53:55 +03:00
308802eeb6
optional size in api method /people/${profileId}/photo/thumbnails.json
2023-03-01 14:46:26 +03:00
Vashchuk Nikita
07999f1997
fix method for getting users for mentions
2023-03-01 13:30:08 +05:00
887926f852
fixed ChunkedUploader with external uploader url
2023-02-28 22:32:56 +03:00
Vashchuk Nikita
d9dd2c6fcb
modified the method for getting users for mentions
2023-03-01 00:11:24 +05:00
Vashchuk Nikita
b367233f32
fix the method for getting roomInfo
2023-03-01 00:04:12 +05:00
Vashchuk Nikita
7c8b0916b6
fix new attribute in rootMethod
2023-02-28 19:19:18 +05:00
18274f9a99
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
...
Feature/colloborator
2023-02-28 17:27:05 +04:00
e1a6b2bd8d
refactoring
2023-02-28 16:24:00 +03:00
27900054a0
Merge pull request #1242 from ONLYOFFICE/feature/ef-batch
...
EF: batch operations
2023-02-28 15:48:05 +03:00
c932d935fa
Merge branch 'develop' into feature/colloborator
2023-02-28 13:48:08 +04:00
d6962eb442
Files: fixed room invitation
2023-02-28 11:02:16 +03:00
78a2e20edb
refactoring
2023-02-27 18:38:01 +03:00
beb1834a0a
EF: batch operations
2023-02-27 16:39:52 +03:00
75281090c7
fix merge
2023-02-27 15:41:53 +03:00
d847ac0827
Merge branch 'develop' into refactoring/generic-classes
2023-02-27 15:41:40 +03:00
Timofey Boyko
8e59451b4a
Merge branch 'develop' into feature/colloborator
2023-02-27 15:22:21 +03:00
052728f969
refactoring thirdparty
2023-02-27 14:57:54 +03:00
ead94f371e
Merge branch 'develop' into feature/notifications
2023-02-27 10:29:50 +03:00
2c140b97df
refactoring thirdparty
2023-02-27 10:16:32 +03:00
03a4dc89dc
Settings: refactoring
2023-02-24 17:19:10 +03:00
216a6480c8
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
2023-02-22 15:50:55 +03:00
c8150ac4b0
People: fixed user type filter
2023-02-22 12:54:43 +03:00
a8a67d3180
fix build
2023-02-22 12:22:40 +03:00
38c28bce91
Merge branch 'develop' into bugfix/60994
2023-02-22 11:50:39 +03:00
ca2c9e8b57
Files: refactor
2023-02-21 19:39:00 +03:00
f1d98ce6fd
Files: fixed invitation in room
2023-02-21 19:38:47 +03:00
abbd2b837e
File: fixed user in room count
2023-02-21 19:38:26 +03:00
3401abb21a
Merge branch 'develop' into feature/colloborator
2023-02-21 17:11:39 +03:00
071456c9f3
Files: refactor, fixed for docspace admin
2023-02-21 17:09:28 +03:00
be2bd8d1ac
Files: fixed rights for docspace admin
2023-02-21 17:08:26 +03:00
ca5d711c36
People: refactor
2023-02-21 16:53:48 +03:00
6d3cda4b7f
Files: refactor
2023-02-21 16:53:35 +03:00
fafc8b567d
Files: added collaborator role
2023-02-21 16:34:06 +03:00
306f08b123
Files: added collaborator role, added rights rules, refactor
2023-02-21 16:33:41 +03:00
24178d9a13
Files: changed error message
2023-02-21 16:23:50 +03:00
007733dfeb
Files: removed unnecessary
2023-02-21 16:23:28 +03:00
cb398c0a51
Files: changed error message
2023-02-21 16:20:44 +03:00
1c3d3bf132
Merge branch 'develop' into feature/fix-webhooks-second
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
3269d48e15
added new table
2023-02-21 14:22:34 +03:00
Vashchuk Nikita
d84d7aa430
fix notification filtration
2023-02-21 14:21:30 +05:00
Vashchuk Nikita
cc77f6d2f4
added mute security attribute
2023-02-21 14:20:29 +05:00
Vashchuk Nikita
9e0a5e91cb
fix letter format, mute attribute, tags counter
2023-02-21 14:19:26 +05:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
5e9f12a797
backend: refactoring
2023-02-20 23:10:49 +03:00
bcc0866830
Files: ban on creating rooms fro collaborator
2023-02-20 12:12:29 +03:00
6f34d873ee
People: refactor
2023-02-20 11:16:44 +03:00
c32ab68e63
Files: refactor
2023-02-20 11:16:37 +03:00
047df24bf4
fix Bug 60994
2023-02-20 09:47:40 +03:00
2be40a9c50
People: refactor
2023-02-17 17:53:30 +03:00
07dc7dab20
People: refactor, added collaborator
2023-02-17 17:40:25 +03:00
25859e5d4e
refactoring
2023-02-17 15:56:40 +03:00
10c637e822
Root folders renamed
2023-02-16 19:36:47 +03:00
858e0dc300
refactoring thirdParty
2023-02-16 18:16:41 +03:00
f738a8b830
Merge branch 'develop' into feature/entries-trash-origin
2023-02-15 17:29:23 +03:00
2a12f4ca0a
Files: added 30 days gap
2023-02-15 13:27:01 +03:00
