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

206 Commits

Author SHA1 Message Date
Vashchuk Nikita
5b9668c14f ILinkDao, fix 2022-01-18 19:50:31 +03:00
AlexeySafronov
bedfad1ec5 Merge branch 'master' into develop 
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
 2021-12-28 18:21:44 +03:00
pavelbannov
031af716e6 Tfa: fix 2021-12-10 21:25:03 +03:00
pavelbannov
bdcb4cd0be moved from 51eb3d88 2021-12-07 16:56:16 +03:00
pavelbannov
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
pavelbannov
8ca88e4620 Merge branch 'develop' into feature/net6 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
 2021-11-23 16:40:50 +03:00
pavelbannov
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
SuhorukovAnton
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
pavelbannov
5a5e299d98 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
 2021-10-19 18:30:59 +03:00
SuhorukovAnton
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
AlexeySafronov
5d3d8f4d45 Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json' 2021-10-05 11:13:38 +03:00
pavelbannov
737efc3be7 Api: settings. Added recapthca public key 2021-09-17 17:57:22 +03:00
pavelbannov
8835570193 Settings: added param withpassword 2021-09-13 15:42:09 +03:00
pavelbannov
618cf7a1ce Api: fix SendJoinInviteMail 2021-09-08 16:28:10 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
Vashchuk Nikita
c41361bdd8 fix 2021-08-24 11:08:58 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
AlexeySafronov
e81c3df0be Added displaying version from appsettings.json (api/2.0/settings.json) 2021-07-14 17:31:06 +03:00
AlexeySafronov
b4c4625f3f Moved getting firebase config to API method /api/2.0/settings.json 2021-07-09 18:28:08 +03:00
Vashchuk Nikita
2dcf6b8225 Added WebhookHostedService, modified Publisher and Sender 2021-07-08 20:32:59 +03:00
Ilya Oleshko
6118e95028 Merge branch 'develop' into feature/personal 2021-06-17 14:25:09 +03:00
pavelbannov
469678ac85 Api: fix settings 2021-06-16 13:03:41 +03:00
AlexeySafronov
bac090e180 Merge branch 'develop' into feature/personal 
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
 2021-06-11 13:11:08 +03:00
pavelbannov
58f7a0f285 Tfa: fix 2021-06-08 11:34:14 +03:00
Viktor Fomin
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
pavelbannov
2be10b8bd9 Settings: added personal settings 2021-06-02 19:13:47 +03:00
pavelbannov
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
pavelbannov
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
pavelbannov
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
Viktor Fomin
4e57f2a47f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-20 00:47:45 +03:00
pavelbannov
e14948944f Tfa: added validation 2021-05-19 18:04:32 +03:00
pavelbannov
27caf0932e tfaappnewapp: enable empty body 2021-05-17 22:14:58 +03:00
pavelbannov
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
pavelbannov
198f1e4fe6 Settings: fixed tfaapp/confirm 2021-05-11 22:30:37 +03:00
Viktor Fomin
7a27280dc3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-07 14:49:44 +03:00
AlexeySafronov
026306d7ca Web: Login: Fix hard-coded list of trusted domains on registration 2021-05-04 15:35:09 +03:00
Viktor Fomin
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
Viktor Fomin
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
pavelbannov
f53eef184f Tfa: added tfaapp/setup method for receiving code and image 2021-04-27 20:31:05 +03:00
pavelbannov
5777f0abd4 Settings: confirm url 2021-04-27 13:41:32 +03:00
Alexey Kostenko
bf963f511b Merge branch 'develop' into bugfix/thirdparty 2021-04-27 11:25:30 +03:00
pavelbannov
a66a454462 Settings: added tfaapp method 2021-04-25 18:06:56 +03:00
pavelbannov
6d2f417c5c Method GetAuthProviders moved to PeopleController 2021-04-25 11:46:44 +03:00
pavelbannov
038fd58d7c Settings: fixed custom schemaName 2021-04-14 16:21:37 +03:00
pavelbannov
fdc5ee0838 Settings: fixed custom name settings 2021-04-14 15:03:08 +03:00
pavelbannov
a30915f618 Settings: post and put customschemas 2021-04-13 21:11:38 +03:00
pavelbannov
0df4b998d1 Api: removed SchemaItemModel 2021-04-13 20:10:14 +03:00
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00