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
b0b3e6df71
Web: refactor
2023-02-17 17:53:41 +03:00
13fbd58dc8
Web: added collaborator, refactor
2023-02-17 17:51:55 +03:00
25859e5d4e
refactoring
2023-02-17 15:56:40 +03:00
1133a84671
fix header
2023-02-15 21:26:28 +03:00
4c92d947e8
removed unused migrations
2023-02-09 14:36:16 +03:00
afe82d599d
ASC.Webhooks.Service moved to ASC.Web.Studio
2023-02-08 20:31:58 +03:00
6d363d4abd
Webhooks: settings
2023-02-08 14:46:33 +03:00
e58175f69e
WebHooks: added resources, new methods and settings for disable webhook
2023-02-08 14:17:06 +03:00
d49ee80fd8
Merge branch 'develop' into feature/fix-webhooks-second
2023-02-08 13:18:59 +03:00
ca2906ebee
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
f52f32a6af
Merge branch 'develop' into feature/asc.apicache
...
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
c89b8ca427
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.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/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
2023-02-07 14:31:22 +03:00
Vashchuk Nikita
a8a633c2e8
small fix
2023-02-06 17:42:11 +05:00
Vashchuk Nikita
b928966550
added settings for configure RoomsNotification, added mute field for files and folders
2023-02-06 16:15:51 +05:00
Vashchuk Nikita
ab7f24a68b
Merge branch 'release/rc-v1.2.0' into feature/notifications
2023-02-02 18:48:48 +05:00
Vashchuk Nikita
d8b9fada67
added functionality for disable SSL verification on WebhookSender requests
2023-01-31 00:25:51 +05:00
Vashchuk Nikita
cf37c1704d
remove name from returned parameters
2023-01-30 21:31:31 +05:00
51d88c1e5a
api/settings: return Standalone
2023-01-30 11:15:57 +03:00
40b15cc06e
Merge branch 'develop' into feature/asc.apicache
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
2023-01-26 22:31:26 +03:00
Vashchuk Nikita
f6ca8e3c78
added methods for configuring notifications
2023-01-26 19:12:12 +05:00
dc71761710
Settings: TenantDomainValidator
2023-01-26 15:31:06 +03:00
aae6f4bff4
healthcheck: update dll
2023-01-24 20:48:33 +03:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
Vashchuk Nikita
596a85a318
fix GetJournal
2023-01-24 13:40:26 +05:00
Vashchuk Nikita
592c672c34
added name to returned parameters
2023-01-24 12:03:57 +05:00
Vashchuk Nikita
de94226794
fix
2023-01-23 18:15:46 +05:00
Vashchuk Nikita
1c32151a77
Revert "fix create, update methods", added id to returned parameters
2023-01-23 16:53:03 +05:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
...
Feature/dotnet7
2023-01-19 22:00:57 +03:00
4ddf7d521c
update external dependency
2023-01-19 19:05:07 +03:00
9937ecccee
fix
2023-01-19 18:32:37 +03:00
fccdbed5a8
fix 60659
2023-01-19 18:20:50 +03:00
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
bff2128b5f
Resources renamed
2023-01-18 18:53:09 +03:00
Vashchuk Nikita
bfe7524dde
fix create, update methods
2023-01-18 11:24:44 +05:00
2f29eb444f
fix 60163
2023-01-13 14:28:44 +03:00
92f786c572
fix 60163
2023-01-12 12:09:01 +03:00
a8bcc8e558
Payment: fix
2023-01-10 20:56:38 +03:00
0090561fb6
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
2023-01-10 14:47:27 +03:00
44804e34db
fixed cache room logo/user photo
2022-12-29 11:31:22 +03:00
9f198ef31d
fixed user avatar/room logo cache
2022-12-27 18:20:05 +03:00
5c828d4124
upload .ico for favicon
2022-12-27 13:49:07 +03:00
846aa53583
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
2022-12-26 12:19:54 +03:00
1ae54147ce
Files: added warning message, added demotion on invitation
2022-12-26 12:19:37 +03:00
0d4000df46
fixed warning
2022-12-25 20:11:06 +03:00
00b32e638a
fix Bug 60214
2022-12-23 21:00:05 +03:00
62cec7b7c5
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
2022-12-22 14:17:24 +03:00
a1daacb4d0
fix
2022-12-21 12:38:47 +03:00
d35120e501
fix SendToApiAsync
2022-12-21 11:16:11 +03:00
045d61c0bf
add bat for asc.apicache
2022-12-20 13:04:21 +03:00
0cf90e45be
Poeple: simplified time cutting
2022-12-14 10:10:46 +03:00
905fae583f
Web.Core: fix pattern
2022-12-13 17:55:12 +03:00
