IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,678 Commits 40 Branches 22 Tags 420 MiB
a8bcc8e558
Commit Graph

942 Commits

Author SHA1 Message Date
SuhorukovAnton
ef7215fbe3 fix 2022-10-27 14:06:37 +03:00
SuhorukovAnton
f4ecdf9fa3 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-10-27 13:55:30 +03:00
SuhorukovAnton
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
pavelbannov
29ee2b04b2 Api: whitelabel/logos AllowAnonymous 2022-10-27 11:53:44 +03:00
SuhorukovAnton
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
Alexey Bannov
277ca1c2cb fixed field number generator 2022-10-25 16:08:23 +03:00
pavelbannov
5e8d06846e Api: fix activeconnections. 2022-10-25 14:19:53 +03:00
SuhorukovAnton
42b4787899 refactoring saveUserInfo 2022-10-24 18:30:17 +03:00
pavelbannov
e39248457e fix /api/2.0/portal/continue.json 2022-10-24 14:34:37 +03:00
MaksimChegulov
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +03:00
SuhorukovAnton
f01376cc56 Merge branch 'develop' into feature/remove-waste 2022-10-20 11:24:20 +03:00
MaksimChegulov
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
gazizova-vlada
7569a741d8 Merge branch 'develop' into feature/company-info-settings 2022-10-19 15:21:18 +03:00
SuhorukovAnton
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00
SuhorukovAnton
16bb42d0af fix ASC.Data.Storage.Encryption 2022-10-19 13:12:33 +03:00
pavelbannov
b9968f8b5a Whitelabel: fix payment 2022-10-19 11:38:12 +03:00
pavelbannov
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
MaksimChegulov
1a5c273825 refactor 2022-10-18 14:43:31 +03:00
MaksimChegulov
7af080486c Merge branch 'develop' into feature/rights-rework 2022-10-18 14:32:17 +03:00
MaksimChegulov
a2d144514d refactor 2022-10-18 14:22:02 +03:00
SuhorukovAnton
3550e0fef6 add greetingsettings/isdefault 2022-10-18 12:06:08 +03:00
gazizova-vlada
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
SuhorukovAnton
19ad5b0ef2 fix api system 2022-10-17 12:15:44 +03:00
SuhorukovAnton
16af78a2a2 fix is default 2022-10-14 23:59:18 +03:00
pavelbannov
e2ccab3c97 ApiSystem: fix 2022-10-14 17:52:00 +03:00
SuhorukovAnton
481d1a1de0 add greetingsettings/isDefault 2022-10-14 13:00:22 +03:00
SuhorukovAnton
421ae1885d unblock logotext and sizes 2022-10-14 11:48:37 +03:00
pavelbannov
cd25dcc8b3 Merge branch 'develop' into feature/apisystem 2022-10-14 11:27:19 +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
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
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
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
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
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
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
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
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
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
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
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
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
pavelbannov
87cfb294ab Quota: CountRoomFeature 2022-09-09 10:27:35 +03:00
pavelbannov
354c4a69ab Quota: refactoring 2022-09-08 19:57:36 +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
pavelbannov
58b9eb3172 Quota: refactoring 2022-09-07 16:26:03 +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