|
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 |
|
|
2ae75ec762
|
fix ide001
|
2022-11-07 12:49:29 +03:00 |
|
|
58e745b59f
|
Update TenantWhiteLabelSettings.cs
|
2022-11-07 12:45:30 +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 |
|
|
cec0473d1b
|
Merge branch 'develop' into feature/letters
# Conflicts:
# web/ASC.Web.Core/Notify/Actions.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
|
2022-11-02 13:25:49 +03:00 |
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
434a34c021
|
Merge branch 'develop' into bugfix/rooms
|
2022-11-02 10:48:26 +03:00 |
|
|
d450457703
|
removed unnecessary call when inviting a user that reduces performance
|
2022-11-01 14:06:31 +03:00 |
|
|
7a01578f0c
|
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove "new TenantQuotaController"
|
2022-10-31 13:03:28 +03:00 |
|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +03:00 |
|
|
fa24e98df6
|
fix IpSecurityFilter
|
2022-10-28 10:58:13 +03:00 |
|
|
86daa32280
|
People: fix
|
2022-10-28 10:34:03 +03:00 |
|
|
78bd9f0e13
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 19:18:07 +03:00 |
|
|
342343a1e1
|
Merge pull request #925 from ONLYOFFICE/feature/rights-rework
Feature/rights rework
|
2022-10-27 19:59:03 +04:00 |
|
|
dbaf6bb264
|
remove unused resources
|
2022-10-27 16:15:08 +03:00 |
|
|
95a1743258
|
Revert "remove unused resources"
This reverts commit 2d99753676 .
|
2022-10-27 16:01:32 +03:00 |
|
|
0f3490b977
|
DoJob return task
|
2022-10-27 14:14:41 +03:00 |
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
edf9fb3111
|
Web.Core: added DocSpace email notify
|
2022-10-26 17:40:18 +03:00 |
|
|
6529ae25e7
|
Web.Core: added manager count check
|
2022-10-26 17:39:24 +03:00 |
|
|
a7f75bcffe
|
Web.Core: added inviting users
|
2022-10-25 23:18:36 +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 |
|
|
b33d55cfe7
|
Quota: fix
|
2022-10-24 17:26:29 +03:00 |
|
Vashchuk Nikita
|
6c197d9372
|
fixed a bug with null values of settings
|
2022-10-24 15:11:01 +05:00 |
|
|
ac05302b21
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-21 13:14:00 +03:00 |
|
|
69f6d703e0
|
Security: fix for users
|
2022-10-20 17:52:42 +03:00 |
|
|
ba01d9dacd
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/letters
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
|
2022-10-20 13:56:13 +03:00 |
|
|
2927cdb66b
|
Notify: small fix
|
2022-10-20 13:50:08 +03:00 |
|
|
f01376cc56
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-20 11:24:20 +03:00 |
|
|
2d99753676
|
remove unused resources
|
2022-10-19 18:39:42 +03:00 |
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
7569a741d8
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 15:21:18 +03:00 |
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +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 |
|
|
a5165d09cf
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-18 10:31:15 +03:00 |
|
diana-vahomskaya
|
c407a412b3
|
fix
|
2022-10-17 14:40:42 +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 |
|
|
16af78a2a2
|
fix is default
|
2022-10-14 23:59:18 +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 |
|
diana-vahomskaya
|
ebed27f1c7
|
deleted PersonalAfterRegistration7, PersonalAfterRegistration14, PersonalAfterRegistration21, fix letters
|
2022-10-13 22:08:07 +03:00 |
|
diana-vahomskaya
|
6cb72eb490
|
deleted EnterpriseAdminInviteTeammatesV10, EnterpriseAdminWithoutActivityV10, EnterpriseAdminTrialWarningBefore7V10, EnterpriseAdminTrialWarningV10, EnterpriseAdminPaymentWarningBefore7V10, EnterpriseAdminPaymentWarningV10
|
2022-10-13 20:29:15 +03:00 |
|
diana-vahomskaya
|
2f646828e5
|
deleted EnterpriseAdminCustomizePortalV10, EnterpriseWhitelabelAdminCustomizePortalV10
|
2022-10-13 18:57:46 +03:00 |
|
diana-vahomskaya
|
c13d306b2b
|
deleted table
|
2022-10-13 17:46:28 +03:00 |
|
diana-vahomskaya
|
39d66dfb7d
|
deleted SaasAdminTrialWarningAfter1V115
|
2022-10-13 17:33:29 +03:00 |
|
diana-vahomskaya
|
eb1a101aa0
|
deleted SaasAdminTrialWarningV115
|
2022-10-13 17:24:07 +03:00 |
|
diana-vahomskaya
|
3a40dee414
|
deleted SaasAdminTrialWarningBefore5V115
|
2022-10-13 17:20:27 +03:00 |
|
diana-vahomskaya
|
b1fc5019ee
|
deleted SaasAdminUserAppsTipsV115
|
2022-10-13 17:17:13 +03:00 |
|
diana-vahomskaya
|
e9e5393031
|
deleted SaasAdminPaymentWarningEvery2MonthsV115
|
2022-10-13 17:13:11 +03:00 |
|
diana-vahomskaya
|
36011a497b
|
deleted SaasAdminComfortTipsV115
|
2022-10-13 17:08:58 +03:00 |
|
diana-vahomskaya
|
a81976b845
|
fix
|
2022-10-13 16:22:08 +03:00 |
|
|
5fbd701ffe
|
Merge branch 'feature/company-info-settings' of github.com:ONLYOFFICE/AppServer into feature/company-info-settings
|
2022-10-13 15:56:05 +03:00 |
|
diana-vahomskaya
|
46bc2fcdee
|
added letter saas_admin_modules_v1
|
2022-10-13 15:20:15 +03:00 |
|
diana-vahomskaya
|
a2f120e86a
|
fixed letters for DocSpace, added new text for footer: TextForFooterUnsubsribeDocSpace
|
2022-10-13 11:53:18 +03:00 |
|
|
23c41d86ef
|
add IsDefault in response
api/2.0/settings/rebranding/company and api/2.0/settings/rebranding/additional
|
2022-10-12 15:51:07 +03:00 |
|
|
b1bd5a100f
|
Quota: recalculate user quota
|
2022-10-12 14:23:57 +03:00 |
|
|
d6755db551
|
Rebraing: added isDefault
|
2022-10-12 11:38:18 +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 |
|
|
fcabf8b73c
|
fix
|
2022-10-11 11:13:22 +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 |
|
|
486ddb25bf
|
refactoring
|
2022-10-10 14:55:22 +03:00 |
|
|
397af4e55d
|
refactoring
|
2022-10-10 14:32:48 +03:00 |
|
|
a563bbe3cf
|
Merge branch 'develop' into feature/two-factor-authentication
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
|
2022-10-09 21:32:14 +03:00 |
|
|
75aebdd9b2
|
optimization
|
2022-10-09 19:35:59 +03:00 |
|
|
fe2dd3c394
|
Merge branch 'develop' into feature/login-settings
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-10-07 17:47:24 +03:00 |
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
Vashchuk Nikita
|
9b37c9f9b3
|
fix
|
2022-10-05 19:13:56 +04:00 |
|
|
400fc49bb6
|
api system
-fix api system
-TenantName from resources
|
2022-10-05 14:23:53 +03:00 |
|
|
c331dbffa0
|
web: PublicResources: Changed translations.
|
2022-10-05 10:53:41 +03:00 |
|
Vashchuk Nikita
|
4b1c7644af
|
added functionality for flexible tfa configuration
|
2022-10-04 13:40:21 +04:00 |
|
|
00bd41ad0a
|
Merge branch 'develop' into feature/user-quota
|
2022-09-23 17:15:49 +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 |
|
|
9c8bf9708a
|
Payment: UsersInRoomStatistic
|
2022-09-20 23:22:27 +03:00 |
|
|
ccbbc5499e
|
Quota: MaxFileSizeChecker
|
2022-09-19 22:49:41 +03:00 |
|
|
5740b578db
|
Payment: rename
|
2022-09-19 18:20:21 +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 |
|
Vashchuk Nikita
|
f86b937652
|
fix
|
2022-09-16 12:08:11 +04:00 |
|
|
6b728a0fca
|
refactoring
|
2022-09-15 18:58:05 +03:00 |
|
Vashchuk Nikita
|
94fb1cb5a5
|
fix multithreading, clustering
|
2022-09-15 18:55:51 +04: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 |
|
|
17d476aafc
|
Files: added new categories OForm,OFormTemplate
|
2022-09-14 18:56:18 +03:00 |
|
|
0f2378b0fc
|
Web.Core: added confirm type
|
2022-09-14 14:50:03 +03:00 |
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +03:00 |
|
|
1726057d95
|
People: fix, refactor
|
2022-09-14 12:59:55 +03:00 |
|
|
d573733800
|
People: added invite by link
|
2022-09-13 23:47:35 +03:00 |
|
|
90c3cd29ba
|
fix
|
2022-09-13 22:35:54 +03:00 |
|
|
7a17f325b1
|
Api: payments. Removed FeaturePriceDto
|
2022-09-13 19:59:57 +03:00 |
|
|
7ccfe9547f
|
Web.Api: refactor, changed links logic
|
2022-09-13 16:01:04 +03:00 |
|
|
12c7a28c21
|
Core: fix
|
2022-09-13 15:11:09 +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 |
|
|
f16da6e3ad
|
refactor
|
2022-09-09 17:31:56 +03:00 |
|
|
d2f4ea2fcb
|
Web.Core: added confirmation link generation
|
2022-09-09 17:30:44 +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 |
|
|
f3a05087fa
|
fix
|
2022-09-08 18:39:53 +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 |
|
|
950266a3d6
|
People: changed invite by link
|
2022-09-07 18:23:08 +03:00 |
|
|
4b183c2fa1
|
Quota: removed open feature
|
2022-09-07 16:28:52 +03:00 |
|
|
59e30bf87f
|
Quota: tariff title
|
2022-09-07 10:58:44 +03:00 |
|
|
ddeb4157ad
|
Quota: used field
|
2022-09-06 23:30:19 +03:00 |
|
Vashchuk Nikita
|
57726421f2
|
Merge branch 'develop' into feature/login-settings
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
|
2022-09-06 12:17:10 +04:00 |
|
|
7bc95a826a
|
Web.Core: changed user profile url
|
2022-09-05 13:13:37 +03: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 |
|
|
53dc57eed7
|
Quota: union with default
|
2022-09-04 16:10:16 +03:00 |
|
|
928d621dbe
|
Payment: email settings
|
2022-09-02 16:09:16 +03:00 |
|
Vashchuk Nikita
|
6fbc6c8b78
|
fix
|
2022-09-02 15:13:10 +04:00 |
|
|
56102771ee
|
Quota: check recalculate quota
|
2022-09-02 11:25:27 +03:00 |
|
|
120c9b3bdb
|
Quota: error processing
|
2022-09-01 17:04:02 +03:00 |
|
|
77657329a6
|
Quota: fix recalculate quota
|
2022-09-01 13:45:48 +03:00 |
|
|
1cdb6bbb20
|
Quota: recalculate quota
|
2022-09-01 11:37:15 +03:00 |
|
|
c0bdb98da9
|
Api: quota name
|
2022-08-31 22:58:45 +03:00 |
|
|
b96dc2425c
|
Api: fixed delete method
|
2022-08-31 22:27:30 +03:00 |
|
|
bf52f50ad3
|
remove waste in asc.web.core
|
2022-08-31 17:46:11 +03:00 |
|
|
3ba02c3e2a
|
Quota: recalculate quota
|
2022-08-31 17:42:00 +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 |
|
|
1c9d3ebfab
|
Api: payment/tariff method
|
2022-08-30 11:39:43 +03:00 |
|
|
701a1ba4ef
|
Quota: save the default user quota setting
|
2022-08-30 02:26:54 +03:00 |
|
|
8e5fcfc3c8
|
Quota: errors
|
2022-08-29 23:35:25 +03:00 |
|
|
641695ec51
|
Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController
|
2022-08-25 23:09:12 +03:00 |
|
Vashchuk Nikita
|
54284b0d61
|
removed LoginThreshold
|
2022-08-24 19:15:22 +04:00 |
|
Vashchuk Nikita
|
ccca35ca4a
|
added loginSettings to protect against brute-force
|
2022-08-24 19:11:44 +04:00 |
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
|
5b8374daa0
|
refactoring
|
2022-08-18 19:00:22 +03:00 |
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +03:00 |
|
|
64782b49bf
|
CoreCommon: Year field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
9025541b0a
|
CoreCommon: Year3 field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
83e7ad25d2
|
SSO: fixed successful login
|
2022-08-09 17:14:35 +03:00 |
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
ceae4ff07d
|
packages updated
|
2022-08-01 13:58:12 +03:00 |
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
|
57f797ab24
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-25 12:59:19 +03:00 |
|