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

42 Commits

Author SHA1 Message Date
pavelbannov
bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/EmailSenderSink.cs
#	common/ASC.Core.Common/Notify/JabberSenderSink.cs
#	common/ASC.Core.Common/Notify/PushSenderSink.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/security/index.js
#	packages/client/src/pages/Profile/Section/Header/index.js
#	packages/common/store/SettingsStore.js
#	packages/components/drop-down/index.js
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/FeedController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Core/DnsSettings.cs
#	web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
#	yarn.lock
 2023-08-28 18:53:10 +03:00
pavelbannov
9fd6b701d8 Csp: added ability to set default csp header. 2023-08-25 15:36:59 +03:00
Anton Sukhorukov
c2e14efedc audit geolocation 2023-08-10 17:28:35 +03:00
pavelbannov
bddbcd02c4 Merge branch 'hotfix/v1.1.2' into feature/csp 
# Conflicts:
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
 2023-08-08 14:13:52 +03:00
Sergey Linnik
b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
 2023-08-01 17:07:05 +03:00
pavelbannov
63b3bfbbfb Security: restricted access for csp 2023-07-12 17:18:20 +03:00
pavelbannov
d15f704b06 Security: added CspDto 2023-07-12 17:16:39 +03:00
pavelbannov
b3afd051af Csp: lua script, CspSettingsHelper, portalrename, dns change, domains array 2023-07-11 16:21:48 +03:00
pavelbannov
443453d538 save csp header to distributed cache 2023-06-26 13:38:49 +03:00
Anton Sukhorukov
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
pavelbannov
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
Natalia
b11696f70f fixes 2023-04-26 12:27:45 +03:00
Natalia
aa708c8877 added more descriptions and data types 2023-04-25 19:23:54 +03:00
Sergey Linnik
29c37cbba5 fix namespaces for documentation 2023-04-19 16:39:50 +05:00
Natalia
f56b589749 some more fixes 2023-04-14 18:19:43 +03:00
Natalia
50c3f5805a fixes for api docs 2023-04-13 12:43:54 +03:00
Sergey Linnik
aa1b712131 Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
 2023-03-29 19:28:15 +05:00
Natalia
f882861bc6 fixes 2023-03-28 18:29:50 +03:00
SuhorukovAnton
44317ee151 WebstudioDbContext -async 2023-03-24 19:24:59 +03:00
SuhorukovAnton
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
Natalia
734fda9329 fixes 2023-03-17 11:44:04 +03:00
SuhorukovAnton
603fc8cc0f MessagesContext - async 2023-03-16 18:23:59 +03:00
SuhorukovAnton
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +03:00
Natalia
0d6afbc65d security: added api descriptions 2023-03-02 13:38:38 +03:00
pavelbannov
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
pavelbannov
00b32e638a fix Bug 60214 2022-12-23 21:00:05 +03:00
pavelbannov
6b728a0fca refactoring 2022-09-15 18:58:05 +03:00
SuhorukovAnton
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
pavelbannov
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
pavelbannov
cbd73be90b moved from ddf515b8 2022-06-08 12:02:40 +03:00
pavelbannov
c1d152becc moved from ddf515b8 2022-06-07 21:00:08 +03:00
pavelbannov
13ad4381f7 Api: removed CustomHttpMethodAttribute 
added AllowNotPaymentAttribute
 2022-05-23 18:48:23 +03:00
SuhorukovAnton
36855d656f remove application/x-www-form-urlencoded 2022-05-17 12:29:24 +03:00
pavelbannov
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
MaksimChegulov
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
SuhorukovAnton
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
SuhorukovAnton
80eb1c8257 IDE0011 2022-03-17 18:01:39 +03:00
MaksimChegulov
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
SuhorukovAnton
82aac7c696 rename dtos 2022-03-15 13:00:41 +03:00
SuhorukovAnton
e18d6b8757 refactoring: asc.web.api 2022-03-01 13:58:02 +03:00
SuhorukovAnton
c3742208cc replace controllers 2022-03-01 13:03:25 +03:00