Commit Graph

10884 Commits

Author SHA1 Message Date
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
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
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
ead94f371e Merge branch 'develop' into feature/notifications 2023-02-27 10:29:50 +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