IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,723 Commits 38 Branches 22 Tags 359 MiB
6e45bc5aa8
Commit Graph

10229 Commits

Author SHA1 Message Date
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
gazizova-vlada
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
gazizova-vlada
28d918464f Merge branch 'develop' into feature/company-info-settings 2022-10-13 15:48:31 +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
SuhorukovAnton
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
Nikolay Rechkin
b1bd5a100f Quota: recalculate user quota 2022-10-12 14:23:57 +03:00
pavelbannov
90575890d0 fixed PortalRemove 2022-10-12 12:50:57 +03:00
pavelbannov
42c12ca706 Added AllowSuspendedFilter 2022-10-12 12:29:08 +03:00
pavelbannov
d6755db551 Rebraing: added isDefault 2022-10-12 11:38:18 +03:00
pavelbannov
dc2cfbc614 Merge branch 'develop' into feature/apisystem 
# Conflicts:
#	web/ASC.Web.Core/PublicResources/Resource.resx
 2022-10-11 13:53:31 +03:00
pavelbannov
fcabf8b73c fix 2022-10-11 11:13:22 +03:00
pavelbannov
b160c16fc2 creating rooms and users feature available only for paid portals 2022-10-11 11:02:43 +03:00
Tatiana Lopaeva
cf2547e030 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/common/constants/index.js
 2022-10-11 10:20:42 +03:00
pavelbannov
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
mushka
415c620574 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-10 17:27:16 +03:00
pavelbannov
486ddb25bf refactoring 2022-10-10 14:55:22 +03:00
pavelbannov
397af4e55d refactoring 2022-10-10 14:32:48 +03:00
pavelbannov
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
pavelbannov
75aebdd9b2 optimization 2022-10-09 19:35:59 +03:00
pavelbannov
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
mushka
aecc841e55 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-07 17:15:15 +03:00
pavelbannov
5b96dbdb55 removed DbUsersQuotaRow 2022-10-07 16:37:57 +03:00
Vashchuk Nikita
9b37c9f9b3 fix 2022-10-05 19:13:56 +04:00
SuhorukovAnton
400fc49bb6 api system 
-fix api system
-TenantName from resources
 2022-10-05 14:23:53 +03:00
Tatiana Lopaeva
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
MaksimChegulov
ed42050de3 Merge branch 'feature/feed' into feature/doc-space-info-panel 2022-09-26 11:14:35 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
Nikolay Rechkin
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +03:00
pavelbannov
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
MaksimChegulov
d7e17828e0 Files: added additional parameters to feed 2022-09-23 14:57:04 +03:00
pavelbannov
130e485a0c Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
gazizova-vlada
79fa7815c4 Merge branch 'develop' into feature/company-info-settings 2022-09-21 14:48:28 +03:00
pavelbannov
9c8bf9708a Payment: UsersInRoomStatistic 2022-09-20 23:22:27 +03:00
pavelbannov
c91968adf6 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 22:59:12 +03:00
pavelbannov
ccbbc5499e Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
Alexey Safronov
eeb94810f1 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 18:40:08 +03:00
pavelbannov
5740b578db Payment: rename 2022-09-19 18:20:21 +03:00
Alexey Safronov
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
pavelbannov
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
pavelbannov
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
MaksimChegulov
d05071110d Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
Alexey Safronov
a51cde20c7 Merge branch 'develop' into feature/doc-space-info-panel 
# Conflicts:
#	products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
 2022-09-16 18:26:36 +03:00
Alexey Bannov
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
Vashchuk Nikita
f86b937652 fix 2022-09-16 12:08:11 +04:00
Alexey Bannov
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
pavelbannov
6b728a0fca refactoring 2022-09-15 18:58:05 +03:00
Vashchuk Nikita
94fb1cb5a5 fix multithreading, clustering 2022-09-15 18:55:51 +04:00
pavelbannov
53e0146a26 Quota: countroom 2022-09-15 17:44:48 +03:00
Alexey Bannov
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
Tatiana Lopaeva
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
Nikolay Rechkin
cfb0c957e9 Quota: user quota storage core_user -> webstudio_settings 2022-09-15 15:38:31 +03:00
gazizova-vlada
5edb33259c Merge branch 'develop' into feature/company-info-settings 2022-09-15 10:07:58 +03:00
pavelbannov
17d476aafc Files: added new categories OForm,OFormTemplate 2022-09-14 18:56:18 +03:00
gazizova-vlada
c7acfe9fb0 Merge branch 'develop' into feature/company-info-settings 2022-09-14 18:31:04 +03:00
SuhorukovAnton
193a415fa4 fix whitelabel/logos 2022-09-14 16:23:24 +03:00
SuhorukovAnton
651ab44fd0 remove DemandPermissions in httpGet methods in WhitelabelController 2022-09-14 15:43:46 +03:00
MaksimChegulov
0f2378b0fc Web.Core: added confirm type 2022-09-14 14:50:03 +03:00
pavelbannov
40702707bd refactoring 2022-09-14 14:21:25 +03:00
MaksimChegulov
384f83f10e Merge branch 'develop' into feature/room-security 2022-09-14 13:02:33 +03:00
MaksimChegulov
1726057d95 People: fix, refactor 2022-09-14 12:59:55 +03:00
MaksimChegulov
d573733800 People: added invite by link 2022-09-13 23:47:35 +03:00
pavelbannov
90c3cd29ba fix 2022-09-13 22:35:54 +03:00
pavelbannov
7a17f325b1 Api: payments. Removed FeaturePriceDto 2022-09-13 19:59:57 +03:00
pavelbannov
6e51001e34 Api: payment settings. 2022-09-13 19:27:11 +03:00
pavelbannov
af6fa993e6 Payments: added quota feature type 2022-09-13 18:18:43 +03:00
pavelbannov
071f882d53 Payments: customerId = email 2022-09-13 17:29:38 +03:00
SuhorukovAnton
1f07a7ddad Merge branch 'develop' into feature/remove-waste 2022-09-13 17:14:49 +03:00
MaksimChegulov
7ccfe9547f Web.Api: refactor, changed links logic 2022-09-13 16:01:04 +03:00
MaksimChegulov
12c7a28c21 Core: fix 2022-09-13 15:11:09 +03:00
Nikolay Rechkin
14dfc1f5a7 Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota 2022-09-13 00:41:59 +03:00
Nikolay Rechkin
068e3c051b Quota: Quota limit string -> long 2022-09-13 00:40:10 +03:00
pavelbannov
f7fd831a17 Merge branch 'develop' into feature/ip-security 2022-09-12 13:31:13 +03:00
pavelbannov
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
pavelbannov
6f710be0c2 Quota: refactoring 2022-09-09 17:39:28 +03:00
MaksimChegulov
f16da6e3ad refactor 2022-09-09 17:31:56 +03:00
MaksimChegulov
d2f4ea2fcb Web.Core: added confirmation link generation 2022-09-09 17:30:44 +03:00
SuhorukovAnton
c8a8ef11d6 refactoring 2022-09-09 15:26:37 +03:00
SuhorukovAnton
549854c579 add DemandPermissions 2022-09-09 15:20:51 +03:00
pavelbannov
acbacaf9ef Quota: removed MaxFileSize column 2022-09-09 15:13:54 +03:00
SuhorukovAnton
e8d3169af4 fix 2022-09-09 13:51:03 +03:00
MaksimChegulov
6077c563b0 Web.Api: fix for rooms 2022-09-09 13:43:37 +03:00
SuhorukovAnton
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
pavelbannov
87cfb294ab Quota: CountRoomFeature 2022-09-09 10:27:35 +03:00
pavelbannov
354c4a69ab Quota: refactoring 2022-09-08 19:57:36 +03:00
SuhorukovAnton
f3a05087fa fix 2022-09-08 18:39:53 +03:00
pavelbannov
bf5ce9cdb0 Quota: admin replaced with manager 2022-09-08 16:35:52 +03:00
pavelbannov
83f4545f02 Quota: refactoring 2022-09-08 10:23:26 +03:00
MaksimChegulov
950266a3d6 People: changed invite by link 2022-09-07 18:23:08 +03:00
pavelbannov
4b183c2fa1 Quota: removed open feature 2022-09-07 16:28:52 +03:00
pavelbannov
58b9eb3172 Quota: refactoring 2022-09-07 16:26:03 +03:00
pavelbannov
59e30bf87f Quota: tariff title 2022-09-07 10:58:44 +03:00
pavelbannov
ddeb4157ad Quota: used field 2022-09-06 23:30:19 +03:00
pavelbannov
2c758355bc Quota: added used field 2022-09-06 18:35:30 +03:00
SuhorukovAnton
27a7c54368 branding for current user 2022-09-06 17:22:50 +03:00
Alexey Bannov
46d0b89433
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed 
Feature/rooms feed
 2022-09-06 14:46:49 +04:00
Tatiana Lopaeva
416925eb06 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-06 12:49:34 +03:00
Tatiana Lopaeva
09a02d01ff Api: method without payment. 2022-09-06 12:48:09 +03:00
pavelbannov
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
Alexey Bannov
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +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
Vashchuk Nikita
cad3608dc2 fix 2022-09-05 15:55:42 +04: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
Vashchuk Nikita
f31797a896 added method for getting LoginSettings 2022-09-05 15:43:49 +04:00
MaksimChegulov
7bc95a826a Web.Core: changed user profile url 2022-09-05 13:13:37 +03:00
MaksimChegulov
21fc9de84a Web.Api: updated doc 2022-09-05 10:56:13 +03:00
MaksimChegulov
d4677adffa Web.Api: removed unnecessary 2022-09-05 10:43:41 +03:00
Tatiana Lopaeva
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
pavelbannov
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
pavelbannov
53dc57eed7 Quota: union with default 2022-09-04 16:10:16 +03:00
MaksimChegulov
23e24dc9e8 Web.Api: added module to feed filter 2022-09-02 18:57:36 +03:00
pavelbannov
a398b22ef4 Feature: added PriceRange 2022-09-02 16:10:06 +03:00
pavelbannov
928d621dbe Payment: email settings 2022-09-02 16:09:16 +03:00
Vashchuk Nikita
6fbc6c8b78 fix 2022-09-02 15:13:10 +04:00
pavelbannov
195d514db8 fix 2022-09-02 12:57:23 +03:00
Nikolay Rechkin
56102771ee Quota: check recalculate quota 2022-09-02 11:25:27 +03:00
MaksimChegulov
88e38e82e2 Merge branch 'develop' into feature/rooms-feed 2022-09-01 20:25:11 +03:00
MaksimChegulov
50175aad40 Web.Api: added id, withRelated for feed filter 2022-09-01 20:22:59 +03:00
MaksimChegulov
7c3af54718 Web.Api: fix 2022-09-01 19:38:26 +03:00
MaksimChegulov
bf4a27def5 Web.Api: added feed api 2022-09-01 18:22:40 +03:00
Nikolay Rechkin
120c9b3bdb Quota: error processing 2022-09-01 17:04:02 +03:00
Nikolay Rechkin
77657329a6 Quota: fix recalculate quota 2022-09-01 13:45:48 +03:00
Nikolay Rechkin
1cdb6bbb20 Quota: recalculate quota 2022-09-01 11:37:15 +03:00
pavelbannov
99011714c8 Api: rename. 2022-09-01 11:27:10 +03:00
pavelbannov
c0bdb98da9 Api: quota name 2022-08-31 22:58:45 +03:00
pavelbannov
b96dc2425c Api: fixed delete method 2022-08-31 22:27:30 +03:00
SuhorukovAnton
bf52f50ad3 remove waste in asc.web.core 2022-08-31 17:46:11 +03:00
Nikolay Rechkin
3ba02c3e2a Quota: recalculate quota 2022-08-31 17:42:00 +03:00
pavelbannov
6b245e9e94 Quota: fixed total_size 2022-08-30 21:30:07 +03:00
pavelbannov
daa9645259 Api: methods without payment 2022-08-30 19:19:15 +03:00
pavelbannov
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
Tatiana Lopaeva
feaccc484b Api: Changed icons. 2022-08-30 16:25:24 +03:00
Nikolay Rechkin
54ff8de78b Quota: moved UserQuotaSettings 2022-08-30 16:03:14 +03:00
pavelbannov
1c9d3ebfab Api: payment/tariff method 2022-08-30 11:39:43 +03:00
Nikolay Rechkin
bf7f4f04da Merge branch 'develop' into feature/user-quota 2022-08-30 11:04:49 +03:00
Nikolay Rechkin
701a1ba4ef Quota: save the default user quota setting 2022-08-30 02:26:54 +03:00
Nikolay Rechkin
8e5fcfc3c8 Quota: errors 2022-08-29 23:35:25 +03:00
Tatiana Lopaeva
9154b971c0 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
 2022-08-29 13:06:44 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
Tatiana Lopaeva
ed5f62a877 Merge branch 'develop' into feature/docspace-backup 
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
 2022-08-26 18:48:20 +03:00
pavelbannov
9cfa1cd4b3 Api: payment/currencies 2022-08-26 17:33:55 +03:00