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

22109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
 2022-07-14 11:56:07 +03:00
pavelbannov
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
pavelbannov
3597114325 Api: fix tfaappnewapp 2022-07-13 18:41:44 +03:00
pavelbannov
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
pavelbannov
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
pavelbannov
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
Pavel Bannov
48a743e01e
Merge pull request #722 from ONLYOFFICE/bugfix/Bug53348 
Bug 53348 - Client.Account termination. Account deletion confirmation…
 2022-07-13 13:43:03 +03:00
pavelbannov
04603f1314 Merge branch 'develop' into bugfix/Bug53348 2022-07-13 13:42:24 +03:00
Pavel Bannov
a88d5b6d41
Merge pull request #715 from ONLYOFFICE/feature/room_tests 
Feature/room tests
 2022-07-13 13:03:41 +03:00
pavelbannov
ea00433ff1 Files: tests. refactoring 2022-07-13 13:00:08 +03:00
Vashchuk Nikita
9348ad1a46 fix files tests 2022-07-13 12:52:13 +03:00
pavelbannov
120a57c1bf Merge branch 'develop' into feature/room_tests 2022-07-13 11:56:48 +03:00
Pavel Bannov
62ce169017
Merge pull request #724 from ONLYOFFICE/feature/room-api-refactor 
feature/room-api-refactor
 2022-07-13 11:49:20 +03:00
MaksimChegulov
e7831d9b94 Files: moved parameter from body to query 2022-07-13 11:47:15 +03:00
pavelbannov
06a98c508e Merge branch 'develop' into feature/room_tests 
# Conflicts:
#	.gitignore
 2022-07-12 22:48:47 +03:00
pavelbannov
a8ba7ae685 removed logo test 2022-07-12 22:44:10 +03:00
pavelbannov
72caeb475c People: fixed change theme mathod 2022-07-12 20:45:12 +03:00
pavelbannov
c9680ae830 fix tfaapp 2022-07-12 19:36:39 +03:00
pavelbannov
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
pavelbannov
fa8898d522 Files: fixed converter 2022-07-12 14:18:26 +03:00
Alexey Safronov
df65b26ce9
Merge pull request #723 from ONLYOFFICE/feature/security-settings 
Feature/security settings
 2022-07-12 14:16:53 +03:00
Viktor Fomin
a9d5080f5d Web: Client: Settings: disabled autofocus 2022-07-12 13:50:55 +03:00
Viktor Fomin
7b19b2f730 Web: Client: Settings: SessionLifetime: fix show reminder 2022-07-12 13:41:50 +03:00
Viktor Fomin
0d0eed6d1a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-12 12:57:57 +03:00
Alexey Safronov
71ca12b8e2 Update .gitignore with radicale plugin files 2022-07-12 12:53:30 +03:00
pavelbannov
e9a15cc2a4 added [HttpGet("iprestrictions/settings")] 2022-07-12 12:20:59 +03:00
pavelbannov
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
pavelbannov
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
pavelbannov
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
Vashchuk Nikita
5cfb69ae48 recreated all migrations 2022-07-11 18:33:57 +03:00
Vashchuk Nikita
bc0ad53e8f changed int type to tinyint(1) for bool 2022-07-11 18:31:00 +03:00
Alexey Safronov
477f386047
Merge pull request #698 from ONLYOFFICE/feature/create-from-modal 
Feature/create from modal
 2022-07-11 17:28:09 +03:00
Alexey Safronov
14ec770253
Merge branch 'develop' into feature/create-from-modal 2022-07-11 17:19:39 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
SuhorukovAnton
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
Alexey Safronov
16acccc4e3 Sql: Added hosting_instance_registration table 2022-07-11 15:48:53 +03:00
Vashchuk Nikita
f13263c75a fix contexts after merge 2022-07-11 15:43:06 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
Viktor Fomin
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
Viktor Fomin
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
Alexey Safronov
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
Viktor Fomin
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
Vashchuk Nikita
ab5279ae4c fix Backup Context 2022-07-11 13:37:20 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-07-11 13:28:49 +03:00
Viktor Fomin
6719ff0e72 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-11 12:39:34 +03:00
Vashchuk Nikita
dcd6faf781 fix for merge 2022-07-11 12:29:45 +03:00
Alexey Safronov
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
Viktor Fomin
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
Alexey Safronov
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2 
Release/v1.2
 2022-07-11 10:47:33 +03:00