265a27a320
fixed notify pattern resource
2023-04-17 17:40:44 +03:00
232c6bbdf1
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 15:20:10 +03:00
95ca8e7811
added bg
2023-04-17 15:19:46 +03:00
759fe5624a
fix
2023-04-17 14:24:59 +03:00
7ba38a4a4e
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
2023-04-17 14:18:44 +03:00
177c79fc79
added az
2023-04-17 14:18:22 +03:00
e54aafd480
Merge branch 'release/v1.0.0' into develop
2023-04-17 13:49:15 +04:00
61011b759d
fix Bug 62120
2023-04-17 12:27:56 +03:00
100bddeb4a
Merge branch 'release/v1.0.0' into develop
2023-04-17 11:38:48 +04:00
NikitaVashchuk
476cbb6f2b
fix bug 62015
2023-04-14 20:03:33 +05:00
496085fa48
fix Bug 62023
2023-04-14 15:49:41 +03:00
7df9ee8f8b
Merge pull request #1358 from ONLYOFFICE/bugfix/notifications
...
Bugfix/notifications
2023-04-14 15:27:09 +03:00
41483c51be
add base-domain in api method "settings"
2023-04-14 10:49:00 +03:00
5ef5fbded9
UserPhotoManager: fixed problem with cache
2023-04-13 18:53:23 +03:00
5fcd3e166b
Merge branch 'release/v1.0.0' into develop
2023-04-13 16:44:51 +04:00
2b17d2eed0
people: fixed generate thumbnails
2023-04-13 14:44:22 +03:00
18bf4167f7
Merge branch 'release/v1.0.0' into develop
2023-04-13 13:27:58 +04:00
4f12380445
people: update last_modified in core_user table after set user photo
2023-04-12 22:27:16 +03:00
c85caa5651
people: fixed response for POST {userid}/photo/thumbnails method
2023-04-12 19:18:40 +03:00
1458715cb2
ApiSystem: hack
2023-04-12 16:39:19 +03:00
ed96fe2bdb
refresh quota
2023-04-11 18:58:44 +03:00
42e8b739f3
fix Bug 61992
2023-04-11 17:52:39 +03:00
NikitaVashchuk
336f340cd0
fix bug 62015(expired link)
2023-04-11 17:29:35 +05:00
d88fd2c2b2
fix merge
2023-04-10 23:20:16 +03:00
4dad1d6067
Merge branch 'develop' into feature/optimization-ef
2023-04-10 23:19:56 +03:00
2a736e7c64
Settings: legalterms
2023-04-10 19:10:30 +03:00
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
e2dc7c8381
create CustomSynchronizationContext in UserPhotoManager
2023-04-10 14:25:43 +03:00
NikitaVashchuk
9340e0432f
fixed invite notification format
2023-04-10 16:23:09 +05:00
6ed8cebb5f
fix
2023-04-10 11:41:12 +03:00
64c44bed2a
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-07 16:14:11 +04:00
7b1101b50c
add "documentation-email" in config
2023-04-07 14:18:22 +03:00
bcb12080fa
fix async
2023-04-07 10:33:06 +03:00
6780c7da49
translations
2023-04-06 21:32:15 +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
8d6e51a16f
fix
2023-04-05 12:54:02 +03:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05:00
32f5d3dc2f
fix
2023-04-04 14:35:22 +03:00
3e2de4cb75
add ZendeskKey and BookTrainingEmail in SettingsDto
2023-04-04 13:20:59 +03: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
Vashchuk Nikita
91606f1962
small fix
2023-04-03 16:38:23 +05: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
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
04f6fe5db4
api method "whitelabel/logos" AllowSuspended
2023-03-30 13:49:52 +03:00
76b68d74f8
fix: hidden _usersInRoomFeature and fix portal/payment/quota
2023-03-29 17:48:52 +03:00
4bda4e2d79
revert 9b7c765f19
2023-03-29 15:19:32 +03:00
9b7c765f19
fix quota: ignore visible for api method payment/quota
2023-03-29 12:20:31 +03:00
a79c5420b6
fixed user deleting
2023-03-29 09:43:09 +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
0bcd45f0ce
fix async
2023-03-28 10:43:46 +03:00
aac1896a0f
remove CreateDbContextAsync and fix ExecuteAsync
2023-03-28 00:25:55 +03:00
d39c28046c
add CustomSynchronizationContext
2023-03-27 15:04:50 +03:00
44317ee151
WebstudioDbContext -async
2023-03-24 19:24:59 +03:00
7504e20f63
Merge pull request #1316 from ONLYOFFICE/feature/notification-fixes
...
Feature/notification fixes
2023-03-24 14:41:20 +03:00
240d60c8b6
guest welcome letter changed (Bug 60658)
2023-03-24 14:14:17 +03:00
6bafdc2343
user welcome letter changed
2023-03-24 13:28:55 +03:00
cab3582bcf
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
...
Bugfix/notification image format
2023-03-24 12:39:32 +03:00
1324f349a1
docs tips letter changed
2023-03-24 12:36:31 +03:00
63ee0ca117
UserDbContext - async
2023-03-24 10:53:49 +03:00
Vashchuk Nikita
a9284faf1d
added logo.png as embedded resource
2023-03-23 21:33:33 +05:00
Vashchuk Nikita
7d7f537317
added converting from png, jpg
2023-03-23 20:18:37 +05:00
0abe404476
invitation link: added tariff/quota/permissions check, refactoring
2023-03-23 16:22:01 +03:00
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
fc78a0508d
TenantDbContext -async part2
2023-03-22 11:27:01 +03:00
18cc3d09c6
fix async
2023-03-21 17:28:06 +03:00
a3800de721
TenantDbContext -async part1
2023-03-20 19:16:00 +03: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
dde9cac96e
TelegramDbContext - async
2023-03-17 11:47:17 +03:00
603fc8cc0f
MessagesContext - async
2023-03-16 18:23:59 +03:00
e5749eb986
FirebaseDbContext - async
2023-03-15 16:39:41 +03:00
e4acd2776c
FeedDbContext - async
2023-03-15 13:04:34 +03:00
e98784fd42
CustomDbContext - async
2023-03-15 12:22:30 +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
405ed839bb
CoreDbContext -async
2023-03-14 23:44:44 +03:00
1d87baec93
AccountLinkContext - async
2023-03-13 23:07:37 +03:00
9a1404a401
BackupsContext - async
2023-03-13 19:29:42 +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
