18cc3d09c6
fix async
2023-03-21 17:28:06 +03:00
a3800de721
TenantDbContext -async part1
2023-03-20 19:16:00 +03:00
b96030c0b2
Quota: fix
2023-03-20 15:39:35 +03:00
9175233546
payment emails added
2023-03-19 12:25:31 +03:00
2032329753
fix quota
2023-03-17 13:55:21 +03:00
dde9cac96e
TelegramDbContext - async
2023-03-17 11:47:17 +03:00
7d6feae7cd
NotifyDbContext- async
2023-03-17 11:32:55 +03:00
603fc8cc0f
MessagesContext - async
2023-03-16 18:23:59 +03:00
5de3a26365
Quota: contentsearch
2023-03-16 12:24:56 +03:00
71073f4e88
InstanceRegistrationContext - async
2023-03-15 18:59:19 +03:00
e5749eb986
FirebaseDbContext - async
2023-03-15 16:39:41 +03:00
e98784fd42
CustomDbContext - async
2023-03-15 12:22:30 +03:00
405ed839bb
CoreDbContext -async
2023-03-14 23:44:44 +03:00
4d929ef43e
Core: added new action audit messages
2023-03-13 18:57:14 +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
d2d67f5060
fix
2023-03-09 20:18:18 +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
Vashchuk Nikita
5860c24c84
enable RoomsActivity subscription for all new users
2023-03-08 21:01:44 +05:00
13a82767ac
DbQuotaService: optimization work
2023-03-08 14:27:19 +03: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
Vashchuk Nikita
ca8c737b4f
small fix MessageAction after merge
2023-03-06 19:17:39 +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
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
e73df55f3c
Bug 61218
2023-03-01 20:32:44 +03:00
e2f90e5367
fix set quota row
2023-02-28 16:51:37 +03:00
18274f9a99
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
...
Feature/colloborator
2023-02-28 17:27:05 +04: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
5a65b42177
Core: fixed invite
2023-02-21 19:00:25 +03:00
582c6a602b
Core: added new helper methods
2023-02-21 16:37:33 +03: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
e171ee44e5
Core: refactor
2023-02-20 11:15:18 +03:00
c7792abb1d
Core: fixed sorting users by type
2023-02-17 18:46:43 +03:00
068004ed28
Core: fix
2023-02-17 18:11:02 +03:00
19899d14e9
Core: added collaborator, refactor
2023-02-17 17:53:18 +03:00
9801433fd0
Core: fix security
2023-02-17 16:30:48 +03:00
90fdd58d1c
Core: added collaborator group and type
2023-02-17 11:27:27 +03:00
5e76441b64
fix
2023-02-07 19:12:09 +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
8577c9fa2f
Common: changed message action for room invitation link
2023-02-02 11:31:27 +03:00
442e57c092
fix
2023-02-01 14:24:30 +03:00
dc71761710
Settings: TenantDomainValidator
2023-01-26 15:31:06 +03:00
4a79cc5174
Bug 60770
2023-01-25 15:58:30 +03:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
c51e7a189b
fix 60214
2023-01-20 20:12:45 +03:00
5311005587
fix Bug 60606
2023-01-20 15:34:36 +03: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
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
9cc90a4789
People: refactor
2023-01-19 13:27:23 +03:00
0d46e034e7
Files.Service: added users module for feed aggregator
2023-01-18 18:36:06 +03:00
2f29eb444f
fix 60163
2023-01-13 14:28:44 +03:00
29e0ef45b9
fix 60163
2023-01-13 14:26:12 +03:00
1ab804e4a0
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
2023-01-12 22:48:30 +03:00
92f786c572
fix 60163
2023-01-12 12:09:01 +03:00
070475af5b
running ActivePassiveHostedService in singletone mode as default
2023-01-11 00:31:12 +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
e6c1991c39
fix Bug 60187
2022-12-25 19:44:37 +03:00
aa447f3384
fix key
2022-12-23 13:27:49 +03:00
62cec7b7c5
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
2022-12-22 14:17:24 +03:00
84aec69091
fix backup files_thirdparty_account
2022-12-21 18:34:23 +03:00
d0fe06052e
Db: optimization
2022-12-21 15:57:32 +03:00
a1daacb4d0
fix
2022-12-21 12:38:47 +03:00
d31e341ff9
add async and AddBaseDbContext with settings
2022-12-20 10:27:55 +03:00
d1c436ea11
add migration to Teamlabsite
2022-12-19 18:01:57 +03:00
db951d00e6
asc.apicache
2022-12-16 15:41:09 +03:00
6c112da511
Core: fixed user status change
2022-12-14 14:38:40 +03:00
cd684de7cc
Core: fixed permissions checking
2022-12-13 14:11:37 +03:00
426a11d080
Merge branch 'develop' into release/rc-v1.2.0
2022-12-12 19:33:41 +03:00
ffde2bf1c2
s3: fixed presigned url
2022-12-09 23:46:08 +03:00
143a4d01ec
removed unused variables
2022-12-09 17:47:46 +03:00
6e45bc5aa8
removed unused variables
2022-12-09 16:34:00 +03:00
153c68b3bd
Merge branch 'develop' into release/rc-v1.2.0
2022-12-09 13:05:08 +03:00
8d1393ba8e
Core: changed singleton to scope
2022-12-09 12:23:26 +03:00
966364da9e
Merge branch 'develop' into release/rc-v1.2.0
2022-12-09 12:14:48 +03:00
4fa41aa273
fixed updating ownerId
2022-12-08 18:50:50 +03:00
cd0de88e6c
Core.Common: fix getting user groups
2022-12-08 14:55:05 +03:00
4affc5f58f
Merge branch 'develop' into release/rc-v1.2.0
2022-12-07 18:50:14 +03:00
a03b50bd7c
Merge branch 'develop' into release/rc-v1.2.0
2022-12-07 16:20:29 +03:00
ea1f2ba1b7
Merge branch 'develop' into feature/socket-newtag
2022-12-07 16:16:59 +03:00
61f7765a4f
Merge branch 'develop' into feature/api-origin
2022-12-06 21:47:56 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
...
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
346c8d08e3
Core.Common: changed permissions validation logic
2022-12-06 01:57:45 +03:00
1596b4392b
Core.Common: added rules matching support
2022-12-06 01:55:33 +03:00
3ee45f256b
Core.Common: added new secuirty objects
2022-12-06 01:55:13 +03:00
6202e65932
Core.Common: added default rules
2022-12-06 01:54:35 +03:00
cd23ed5efc
Core.Common: added rule
2022-12-06 01:54:18 +03:00
5e026445f5
Core.Common: added check for default rules
2022-12-06 01:49:57 +03:00
52f77ac06b
Common: added interface IRuleData
2022-12-06 01:48:02 +03:00
28e2392e55
Core.Common: added clearing cache with user id
2022-12-05 14:06:42 +03:00
094e8d41ff
Merge branch 'develop' into feature/room-admin-permissions
2022-12-05 11:15:15 +03:00
997b2547b5
remove waste
2022-12-02 11:01:00 +03:00
b693486b46
merge from develop
2022-12-01 14:52:46 +03:00
5e253bb9c8
set region when start app
2022-11-30 19:03:44 +03:00
fbfd9daa46
Merge branch 'develop' into feature/socket-newtag
2022-11-30 18:37:34 +03:00
a44d24d86f
Merge branch 'develop' into feature/migration_personal
2022-11-30 16:24:04 +03:00
3a927973e3
Merge pull request #1018 from ONLYOFFICE/feature/users-payments-filter
...
Feature/users payments filter
2022-11-29 23:31:37 +04:00
bacde66b72
Merge branch 'develop' into feature/users-payments-filter
2022-11-29 22:24:50 +03:00
baedfcc93a
fixed performance issue
2022-11-29 16:47:26 +03:00
b9f45035b9
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
...
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +03:00
610e0b3064
Core.Common: added method to get user type
2022-11-29 11:52:29 +03:00
014c07c06a
Core.Common: added option to disable validation
2022-11-29 11:51:54 +03:00
130532927b
Merge branch 'develop' into feature/socket-newtag
2022-11-24 17:56:32 +03:00
8d421a3b24
refactoring
2022-11-24 17:21:34 +03:00
ee04a7a55c
removed unused dependencies
2022-11-24 14:40:13 +03:00
0d65c0dccf
revert
2022-11-23 18:54:59 +03:00
284c329f70
Core: autodetect mysql version
2022-11-23 18:45:33 +03:00
2b9446dc26
fix startup
2022-11-23 12:17:08 +03:00
d1c0e79eee
Get tenantDomain from origin
2022-11-18 17:17:50 +03:00
e5863dddcc
fix
2022-11-15 17:07:51 +03:00
61b401d906
fix
2022-11-15 13:28:25 +03:00
9dfcd25033
backend: update dependency dll
2022-11-14 14:11:10 +03:00
629f44b2f2
Core: added sorting users by type
2022-11-14 12:17:33 +03:00
4432bf7d22
Socket: async, refactoring
...
Files: markasnew
2022-11-13 20:33:19 +03:00
d7c1787442
dbContext from regions
2022-11-13 00:44:57 +03:00
aa0222f078
Merge branch 'develop' into feature/migration_personal
2022-11-11 15:05:26 +03:00
7e633c8e70
Core: added payments filter
2022-11-10 17:13:33 +03:00
a4fd81b404
migrate from .net6 to .net7
2022-11-10 13:10:18 +03:00
789ab8f956
Merge branch 'develop' into feature/refactoring-saveUserInfo
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
c3c19aba39
fix migration
2022-11-07 13:43:49 +03:00
ca85ef1d49
fix usings
2022-11-07 12:34:50 +03:00
14a64f4ad0
Merge branch 'develop' into feature/remove-waste
...
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
e5393096a7
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
...
Bugfix/rooms
2022-11-02 19:05:17 +03:00
34bda20eb0
Merge branch 'develop' into feature/recalculate-user-quota
...
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
2022-11-02 13:40:53 +03:00
141bed97b4
Merge branch 'develop' into feature/refactoring-saveUserInfo
2022-11-02 11:16:29 +03:00
d450457703
removed unnecessary call when inviting a user that reduces performance
2022-11-01 14:06:31 +03:00
624391ab26
Merge branch 'develop' into feature/migration_personal
...
# Conflicts:
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.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/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/StorageUploader.cs
2022-10-31 21:15:23 +03:00
a414d68182
Merge branch 'develop' into feature/migration_personal
...
# Conflicts:
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
# common/ASC.Data.Storage/StorageFactory.cs
2022-10-28 12:16:36 +03:00
78bd9f0e13
Merge branch 'develop' into feature/invite-accounts
2022-10-27 19:18:07 +03:00
fa9dd5bd94
rename singnalR to socket
2022-10-27 15:37:26 +03:00
d54a2fc79e
rename file
2022-10-27 15:33:06 +03:00
ef7215fbe3
fix
2022-10-27 14:06:37 +03:00
deb0c5beb7
remove .wait and .result
2022-10-27 13:49:42 +03:00
37e52ea733
Core.Common: fix for invated users
2022-10-25 23:16:54 +03:00
22d800afcd
Core.Common: added new type
2022-10-25 23:15:57 +03:00
972d66e4ea
Core.Common: fix invalidate cache
2022-10-25 23:15:35 +03:00
92ef73eb86
async UpdateUserInfo and SaveUserInfo
2022-10-25 18:27:56 +03:00
128527a809
Merge branch 'develop' into feature/recalculate-user-quota
2022-10-25 17:33:56 +03:00
42b4787899
refactoring saveUserInfo
2022-10-24 18:30:17 +03:00
ac05302b21
Merge branch 'develop' into feature/rights-rework
2022-10-21 13:14:00 +03:00
60f2393940
Quota: fix
2022-10-20 14:53:38 +03:00
f01376cc56
Merge branch 'develop' into feature/remove-waste
2022-10-20 11:24:20 +03:00
35592fd306
Quota: fix
2022-10-19 19:27:04 +03:00
ea86b81c7e
Quota: fix
2022-10-19 18:04:31 +03:00
0a955950e6
fix
2022-10-19 17:11:52 +03:00
2b95553037
another fix quota
2022-10-19 16:22:13 +03:00
22a24de659
Merge branch 'develop' into feature/rights-rework
2022-10-19 15:31:14 +03:00
0ad23f779c
fix quota
2022-10-19 14:53:56 +03:00
afc9d1ce17
Merge branch 'develop' into feature/remove-waste
2022-10-19 14:18:52 +03:00
16bb42d0af
fix ASC.Data.Storage.Encryption
2022-10-19 13:12:33 +03:00
4e0d77a239
fix wizard
2022-10-19 12:48:23 +03:00
9df8c0d69f
Quota: fix
2022-10-18 21:37:16 +03:00
a2afba0a28
Quota: fix
2022-10-18 18:13:35 +03:00
1a5c273825
refactor
2022-10-18 14:43:31 +03:00
7af080486c
Merge branch 'develop' into feature/rights-rework
2022-10-18 14:32:17 +03:00
a2d144514d
refactor
2022-10-18 14:22:02 +03:00
c938a98d00
fix ValidateDomain
2022-10-17 17:48:41 +03:00
65a066b61e
fix merge
2022-10-17 16:21:09 +03:00
ed22136269
Merge branch 'develop' into feature/remove-waste
2022-10-17 14:31:57 +03:00
7280d2d52b
Merge branch 'develop' into feature/recalculate-user-quota
2022-10-17 14:20:31 +03:00
19ad5b0ef2
fix api system
2022-10-17 12:15:44 +03:00
e2ccab3c97
ApiSystem: fix
2022-10-14 17:52:00 +03:00
cd25dcc8b3
Merge branch 'develop' into feature/apisystem
2022-10-14 11:27:19 +03:00
d6441948f3
Quota: fix
2022-10-13 18:12:04 +03:00
21075fd4c3
Quota: fix
2022-10-13 17:45:09 +03:00
c7fbe5d87c
Billing: fix cache
2022-10-13 12:30:24 +03:00
1c5bea4fcc
fix cache
2022-10-12 17:02:07 +03:00
dc2cfbc614
Merge branch 'develop' into feature/apisystem
...
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
2022-10-11 13:53:31 +03:00
9d050b0c6a
fix
2022-10-11 13:14:50 +03:00
b160c16fc2
creating rooms and users feature available only for paid portals
2022-10-11 11:02:43 +03:00
4dbf1e70b7
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
e3bcada474
fix
2022-10-07 16:49:03 +03:00
c8e6578c11
fix
2022-10-07 16:48:06 +03:00
5b96dbdb55
removed DbUsersQuotaRow
2022-10-07 16:37:57 +03:00
4ebd5323c0
Quota: fix
2022-10-06 15:55:47 +03:00
143cc76066
fix
2022-10-06 12:01:43 +03:00
89390657cf
fix
2022-10-06 11:43:16 +03:00
400fc49bb6
api system
...
-fix api system
-TenantName from resources
2022-10-05 14:23:53 +03:00
803f342d2d
Payments: fix delay
2022-10-05 13:38:35 +03:00
731c32795f
Payments: fix cache
2022-10-05 12:12:16 +03:00
9f9a4c3815
Payments: id from billing
2022-10-04 15:58:59 +03:00
00bd41ad0a
Merge branch 'develop' into feature/user-quota
2022-09-23 17:15:49 +03:00
28802b6926
Quota: fix
2022-09-23 17:14:55 +03:00
7f1d946269
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
4f3831ac16
DbTariffRow: removed id
2022-09-23 15:26:26 +03:00
130e485a0c
Payments: refactoring. TrialEnabled setting
2022-09-21 18:44:32 +03:00
557b1baaf9
Merge branch 'develop' into feature/room-security
2022-09-21 12:22:45 +03:00
9c8bf9708a
Payment: UsersInRoomStatistic
2022-09-20 23:22:27 +03:00
c91968adf6
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
2022-09-19 22:59:12 +03:00
ccbbc5499e
Quota: MaxFileSizeChecker
2022-09-19 22:49:41 +03:00
eeb94810f1
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
2022-09-19 18:40:08 +03:00
5740b578db
Payment: rename
2022-09-19 18:20:21 +03:00
6448b63318
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
4b0fc12efc
Payment: rename
2022-09-19 18:03:25 +03:00
5848bf5cd3
Api: payments check
2022-09-19 17:56:45 +03:00
d05071110d
Merge branch 'develop' into feature/room-security
2022-09-19 11:54:55 +03:00
7f7d7e5200
merge from develop
2022-09-16 00:03:52 +03:00
c91711dbeb
hosting: fixed running ActivePassive instance
2022-09-15 23:56:55 +03:00
53e0146a26
Quota: countroom
2022-09-15 17:44:48 +03:00
bec4f11dcd
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
cfb0c957e9
Quota: user quota storage core_user -> webstudio_settings
2022-09-15 15:38:31 +03:00
40702707bd
refactoring
2022-09-14 14:21:25 +03:00
384f83f10e
Merge branch 'develop' into feature/room-security
2022-09-14 13:02:33 +03:00
372f5e9f3a
fix startup
2022-09-14 12:01:32 +03:00
412ee040a4
startup quota
2022-09-14 11:56:00 +03:00
90c3cd29ba
fix
2022-09-13 22:35:54 +03:00
af6fa993e6
Payments: added quota feature type
2022-09-13 18:18:43 +03:00
071f882d53
Payments: customerId = email
2022-09-13 17:29:38 +03:00
d24f9db4c7
Quota: migration
2022-09-13 17:29:01 +03:00
1f07a7ddad
Merge branch 'develop' into feature/remove-waste
2022-09-13 17:14:49 +03:00
896e1a7aeb
fix
...
add checks new alias, fix backup
2022-09-13 17:11:23 +03:00
b43ca7368e
Quota: fix
2022-09-13 01:35:12 +03:00
14dfc1f5a7
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
2022-09-13 00:41:59 +03:00
068e3c051b
Quota: Quota limit string -> long
2022-09-13 00:40:10 +03:00
f7fd831a17
Merge branch 'develop' into feature/ip-security
2022-09-12 13:31:13 +03:00
705ca6fee1
fix
2022-09-12 11:04:30 +03:00
23731e8eab
UserQuota: fix
2022-09-10 18:07:50 +03:00
1ab51406cd
Merge branch 'develop' into feature/user-quota
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-09 18:47:38 +03:00
2f0c494cda
Files: added multiplie invintation link
2022-09-09 18:07:04 +03:00
6f710be0c2
Quota: refactoring
2022-09-09 17:39:28 +03:00
acbacaf9ef
Quota: removed MaxFileSize column
2022-09-09 15:13:54 +03:00
25ae19d601
Merge branch 'develop' into feature/remove-waste
2022-09-09 11:52:13 +03:00
87cfb294ab
Quota: CountRoomFeature
2022-09-09 10:27:35 +03:00
354c4a69ab
Quota: refactoring
2022-09-08 19:57:36 +03:00
bf5ce9cdb0
Quota: admin replaced with manager
2022-09-08 16:35:52 +03:00
83f4545f02
Quota: refactoring
2022-09-08 10:23:26 +03:00
375853bf8e
Quota: removed hasMigrationFeature
2022-09-07 19:35:07 +03:00
b7d0a532ca
Api.Core: refactor, removed unnecessary
2022-09-07 18:23:54 +03:00
e2dc47adea
Quota: merge autobackup and restore feature
2022-09-07 16:43:37 +03:00
4b183c2fa1
Quota: removed open feature
2022-09-07 16:28:52 +03:00
58b9eb3172
Quota: refactoring
2022-09-07 16:26:03 +03:00
f54f31a3d1
remove waste asc.core.common
2022-09-07 15:45:23 +03:00
9988e86a8c
Quota: return used user space
2022-09-07 13:44:59 +03:00
1008e1c47e
Quota: added users quota row table
2022-09-07 02:10:58 +03:00
ddeb4157ad
Quota: used field
2022-09-06 23:30:19 +03:00
2c758355bc
Quota: added used field
2022-09-06 18:35:30 +03:00
941689b6ca
Quota: refactoring
2022-09-06 12:14:08 +03:00
Vashchuk Nikita
cdb3b2ce65
- added functionality for adding ip restrictions for users and admins separately
...
- added functionality for reading CIDR notations
- modified EFmodel
2022-09-05 15:48:41 +04:00
7b623c4e30
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
36714b4130
Api: added payment/request
2022-09-04 18:30:32 +03:00
df96629834
Core: fixed user cache
2022-08-31 21:06:26 +03:00
ea2d97b6f5
Api: removed unused columns
2022-08-30 19:01:12 +03:00
54ff8de78b
Quota: moved UserQuotaSettings
2022-08-30 16:03:14 +03:00
