Commit Graph

10369 Commits

Author SHA1 Message Date
Vashchuk Nikita
ca6e1d1553 returned old images 2023-03-23 02:26:07 +05:00
Vashchuk Nikita
2b94d5dfa5 changed notification image format to png,
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
2023-03-23 00:25:15 +05:00
20e5829e13
Merge pull request #1311 from ONLYOFFICE/feature/payment-notify
Feature/payment notify
2023-03-20 13:52:15 +03:00
c547e4af1a fixed the path to the payment page 2023-03-20 11:54:19 +03:00
69165762db Web.Api: renamed room to context 2023-03-20 10:36:54 +03:00
9175233546 payment emails added 2023-03-19 12:25:31 +03:00
939efe37d5 Web.Api: added audit context 2023-03-17 14:34:43 +03:00
f771315c7c
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
backup chunk-size
2023-03-15 11:58:32 +03:00
e223b54a63 Web.Api: fixed getting audit 2023-03-15 11:45:32 +03:00
cad10c140b Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 19:16:26 +03:00
434ece42ed Web.Api: added room in dto 2023-03-13 18:53:49 +03:00
9762e4eaca Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 11:45:30 +03:00
2fee97df3d Added 'AllowNotPayment'. 2023-03-13 11:43:58 +03:00
03a0ed298e fix Bug 61558 2023-03-13 10:47:39 +03:00
633c6d122a Quota: fix title 2023-03-12 18:46:58 +03:00
e84356411d fix 2023-03-10 18:30:34 +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
e5f733c771 fix Bug 61076 2023-03-10 11:39:54 +03:00
Vashchuk Nikita
f3f1cd1adc fix userName, added collaborator as portals Role resource 2023-03-09 20:57:21 +05:00
4d0ed3d7db
Merge pull request #1284 from ONLYOFFICE/bugfix/61465
Bugfix/61465
2023-03-09 15:36:31 +03:00
92539449c4 backup chunk-size 2023-03-09 15:34:47 +03:00
05571943dc backend: refactoring. replace sync methods to async within ExecutionStrategy block 2023-03-09 14:42:18 +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
30dc57380e fix Bug 60163 2023-03-07 20:53:31 +03:00
Vashchuk Nikita
4d95d7c848 added roomRemoved as instant action 2023-03-07 19:37:04 +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
84d102c1af fix Bug 61465 - Accounts. Two-factor authentication. 2023-03-04 00:57:15 +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
Vashchuk Nikita
082c5f968c fix mentions letter format, added roomsNotificationSettings check 2023-03-01 19:15:35 +05:00
308802eeb6 optional size in api method /people/${profileId}/photo/thumbnails.json 2023-03-01 14:46:26 +03:00
c932d935fa Merge branch 'develop' into feature/colloborator 2023-02-28 13:48:08 +04:00
78a2e20edb refactoring 2023-02-27 18:38:01 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
Vashchuk Nikita
f5918e9772 fix roomsNotificationSettings after merge with develop 2023-02-27 12:40:46 +05: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
068be391cd Web.Core: fixed invite 2023-02-21 19:00:12 +03:00
3401abb21a Merge branch 'develop' into feature/colloborator 2023-02-21 17:11:39 +03:00
94062792d5 People: added collaborator, refactor 2023-02-21 16:35:57 +03:00
3269d48e15 added new table 2023-02-21 14:22:34 +03: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
814f697047 Web.Api: refactor 2023-02-20 11:16:17 +03:00
c1e3d9fb95 Web.Core: refactor 2023-02-20 11:16:03 +03:00
53b3a580fd Web: added count of collaborators, refactor 2023-02-20 11:11:16 +03:00