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

110 Commits

Author SHA1 Message Date
pavelbannov
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
SuhorukovAnton
51d88c1e5a api/settings: return Standalone 2023-01-30 11:15:57 +03:00
pavelbannov
dc71761710 Settings: TenantDomainValidator 2023-01-26 15:31:06 +03:00
Vashchuk Nikita
596a85a318 fix GetJournal 2023-01-24 13:40:26 +05:00
Vashchuk Nikita
592c672c34 added name to returned parameters 2023-01-24 12:03:57 +05:00
Vashchuk Nikita
de94226794 fix 2023-01-23 18:15:46 +05:00
SuhorukovAnton
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
pavelbannov
ccfc8d0e47 Auth: added confirm data 2022-12-08 17:53:39 +03:00
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
pavelbannov
4b180094e8 Whitelabel: rename 2022-11-22 18:03:59 +03:00
pavelbannov
b227a68b5f CustomColorThemesSetting: fix 2022-11-18 19:39:10 +03:00
pavelbannov
35e22fe8c8 Merge branch 'develop' into feature/fix-whitelable 
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Core/LogoUploader.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-11-18 16:48:19 +03:00
SuhorukovAnton
ea946ccfea union whitelabel/logos with whitelabel/sizes 2022-11-15 17:01:47 +03:00
pavelbannov
fed6d30095 Api: added TenantDto 2022-11-14 17:17:57 +03:00
SuhorukovAnton
301e64a34a GetWhiteLabelLogos dark and light when isDark null 2022-11-13 02:00:35 +03:00
SuhorukovAnton
2e21cc5735 remove IsDefault 2022-11-13 00:54:37 +03:00
SuhorukovAnton
2314dce176 fix apisystem 2022-11-10 18:07:11 +03:00
SuhorukovAnton
d733880485 dark whitelabel 2022-11-09 16:30:56 +03:00
pavelbannov
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
pavelbannov
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
MaksimChegulov
ac05302b21 Merge branch 'develop' into feature/rights-rework 2022-10-21 13:14:00 +03:00
MaksimChegulov
a2d144514d refactor 2022-10-18 14:22:02 +03:00
SuhorukovAnton
16af78a2a2 fix is default 2022-10-14 23:59:18 +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
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
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
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
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
4b1c7644af added functionality for flexible tfa configuration 2022-10-04 13:40:21 +04:00
Nikolay Rechkin
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +03:00
MaksimChegulov
d7e17828e0 Files: added additional parameters to feed 2022-09-23 14:57:04 +03:00
pavelbannov
5740b578db Payment: rename 2022-09-19 18:20:21 +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
pavelbannov
6b728a0fca refactoring 2022-09-15 18:58:05 +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
pavelbannov
7a17f325b1 Api: payments. Removed FeaturePriceDto 2022-09-13 19:59:57 +03:00
pavelbannov
af6fa993e6 Payments: added quota feature type 2022-09-13 18:18:43 +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
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
ddeb4157ad Quota: used field 2022-09-06 23:30:19 +03:00