|
a8527e1a57
|
WebApi: sendsms, setphone
|
2021-06-16 20:46:24 +03:00 |
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
469678ac85
|
Api: fix settings
|
2021-06-16 13:03:41 +03:00 |
|
|
429f5a1ea2
|
Smtp: fix warning
|
2021-06-15 21:40:36 +03:00 |
|
|
58f7a0f285
|
Tfa: fix
|
2021-06-08 11:34:14 +03:00 |
|
|
54d5c658bd
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-07 11:54:06 +03:00 |
|
|
c6f85ef4ce
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-02 23:57:00 +03:00 |
|
|
76d8ebb459
|
Tests moved to separate projects.
Removed unused dependepcies
|
2021-06-01 12:21:51 +03:00 |
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
527a650601
|
WebStudio: resources
|
2021-05-27 21:30:15 +03:00 |
|
|
bda786f844
|
WebStudio: moved from 08a01422
|
2021-05-27 20:13:24 +03:00 |
|
|
f6fbe33814
|
Web.Core: moved from 08a01422
|
2021-05-24 20:41:31 +03:00 |
|
|
1b730233c9
|
ElasticSearch: moved from 08a01422
|
2021-05-23 19:11:25 +03:00 |
|
|
4e57f2a47f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-20 00:47:45 +03:00 |
|
|
e14948944f
|
Tfa: added validation
|
2021-05-19 18:04:32 +03:00 |
|
|
27caf0932e
|
tfaappnewapp: enable empty body
|
2021-05-17 22:14:58 +03:00 |
|
|
7ad62ded2b
|
Auth: fix confirm
|
2021-05-13 14:02:33 +03:00 |
|
|
d01db1eed6
|
Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
# Conflicts:
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
# common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/services/ASC.Data.Backup/BackupAjaxHandler.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-13 11:57:40 +03:00 |
|
|
198f1e4fe6
|
Settings: fixed tfaapp/confirm
|
2021-05-11 22:30:37 +03:00 |
|
|
7a27280dc3
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-07 14:49:44 +03:00 |
|
|
37f8bdd872
|
Merge branch 'master' into develop
|
2021-05-05 20:52:06 +03:00 |
|
|
07c6749243
|
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-05 15:59:01 +03:00 |
|
|
90117eb6f8
|
Auth: setCookies
|
2021-05-05 15:57:12 +03:00 |
|
|
261e6d8b4c
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-05 15:09:59 +03:00 |
|
|
026306d7ca
|
Web: Login: Fix hard-coded list of trusted domains on registration
|
2021-05-04 15:35:09 +03:00 |
|
|
b27e973ec0
|
Merge pull request #237 from ONLYOFFICE/feature/support-hosting-as-service
Feature/support hosting as service
|
2021-04-28 15:33:53 +03:00 |
|
|
0656725149
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
|
2021-04-28 11:20:32 +03:00 |
|
|
38ed10ccb8
|
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-04-28 11:13:01 +03:00 |
|
|
f53eef184f
|
Tfa: added tfaapp/setup method for receiving code and image
|
2021-04-27 20:31:05 +03:00 |
|
|
5777f0abd4
|
Settings: confirm url
|
2021-04-27 13:41:32 +03:00 |
|
|
6114d960e3
|
Auth: AuthenticateMe added ConfirmUrl
|
2021-04-27 13:40:25 +03:00 |
|
Alexey Kostenko
|
bf963f511b
|
Merge branch 'develop' into bugfix/thirdparty
|
2021-04-27 11:25:30 +03:00 |
|
|
8bb173fa92
|
Thirdparty: fix providers
|
2021-04-26 21:42:39 +03:00 |
|
|
d97928fd37
|
Merge branch 'develop' into feature/support-hosting-as-service
|
2021-04-26 19:52:32 +03:00 |
|
|
0128b01518
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
# products/ASC.People/Client/public/locales/en/Profile.json
# products/ASC.People/Client/public/locales/ru/Profile.json
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/public/locales/en/Confirm.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Confirm.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-04-26 15:57:19 +03:00 |
|
|
f11f18dffb
|
Auth: check tfa
|
2021-04-26 14:56:38 +03:00 |
|
|
a66a454462
|
Settings: added tfaapp method
|
2021-04-25 18:06:56 +03:00 |
|
|
6d2f417c5c
|
Method GetAuthProviders moved to PeopleController
|
2021-04-25 11:46:44 +03:00 |
|
|
2d8b085d02
|
add support WindowsService/systemd for IHostBuilder
listen unix socket if it setup for Kestrel Web Server
|
2021-04-23 16:54:39 +03:00 |
|
|
6c8654ba77
|
Merge branch 'develop' into feature/team-template
|
2021-04-19 16:47:52 +03:00 |
|
|
5f2998af87
|
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
|
2021-04-16 19:33:26 +03:00 |
|
|
3aae413e12
|
replace Path.Combine to CrossPlatform.PathCombine
|
2021-04-16 16:26:26 +03:00 |
|
|
038fd58d7c
|
Settings: fixed custom schemaName
|
2021-04-14 16:21:37 +03:00 |
|
|
fdc5ee0838
|
Settings: fixed custom name settings
|
2021-04-14 15:03:08 +03:00 |
|
|
a30915f618
|
Settings: post and put customschemas
|
2021-04-13 21:11:38 +03:00 |
|
|
0df4b998d1
|
Api: removed SchemaItemModel
|
2021-04-13 20:10:14 +03:00 |
|
|
18a2c0a53d
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
|
2021-03-25 21:50:09 +03:00 |
|
|
fc7bd11088
|
Fix getshortenlink
|
2021-03-21 18:29:35 +03:00 |
|
|
693a633dee
|
fix auth via password
|
2021-02-26 22:32:03 +03:00 |
|
|
b25dd2d6e2
|
.net 5
|
2021-02-25 12:02:28 +03:00 |
|