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

22136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vashchuk Nikita
db9eaa3b08 fix 2022-07-22 23:09:16 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-22 22:40:58 +03:00
Vashchuk Nikita
94ca41011b recreate migrations 2022-07-22 22:34:48 +03:00
Vashchuk Nikita
d1f0d5403c modified AutoMigrationCreator 2022-07-22 22:34:12 +03:00
Vashchuk Nikita
76cfe882a9 fix contexts 2022-07-22 22:33:19 +03:00
Vashchuk Nikita
8a1a8b809f fix contexts 2022-07-22 22:31:42 +03:00
pavelbannov
d462bef514 removed unused solution 2022-07-19 17:17:08 +03:00
pavelbannov
b98524532f Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-19 16:04:29 +03:00
pavelbannov
40a5fb35df fixed audit/login/last 2022-07-19 14:59:36 +03:00
Pavel Bannov
55d23b5780
Merge pull request #729 from ONLYOFFICE/feature/fix-build-sln 
Feature/fix build sln
 2022-07-18 19:39:56 +03:00
pavelbannov
a2037eb91d fix build 2022-07-18 18:30:08 +03:00
pavelbannov
3bde5f83c9 removed ASC.Thumbnails.Svc 
fix ASC.Data.Storage.Encryption
fixed ASC.Projects
 2022-07-18 14:25:25 +03:00
pavelbannov
ccbac1d3fa consolidated packages 2022-07-18 13:50:05 +03:00
pavelbannov
cb9f4e5c61 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-18 12:37:04 +03:00
pavelbannov
fb18fa6a0f removed voip 2022-07-18 12:36:45 +03:00
Pavel Bannov
5f5b1f80c3
Merge pull request #727 from ONLYOFFICE/feature/remove-voip 
Feature/remove voip
 2022-07-18 12:32:50 +03:00
pavelbannov
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
pavelbannov
e2b1e48fa9 removed voip service 2022-07-15 18:46:52 +03:00
Vashchuk Nikita
3d814ac78c small fix 2022-07-15 15:17:06 +03:00
Vashchuk Nikita
a9c60af9b7 small fix 2022-07-15 15:15:25 +03:00
Vashchuk Nikita
47d6e0ca1d moved connectionString to config and added functionality for entering connectionString from console 2022-07-15 14:53:21 +03:00
Vashchuk Nikita
e78be607ce small fix 2022-07-15 13:36:58 +03:00
Vashchuk Nikita
aa162790a7 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/Tools/AutoMigrationCreator/AutoMigrationCreator.csproj
#	common/Tools/AutoMigrationCreator/Program.cs
#	common/Tools/AutoMigrationCreator/Utils/Options.cs
 2022-07-15 13:35:56 +03:00
Vashchuk Nikita
56e52f807b modified argsParser 2022-07-15 13:33:34 +03:00
pavelbannov
b72f441029 AutoMigrationCreator: fixed project type 2022-07-15 13:14:09 +03:00
pavelbannov
317a72898a refactoring 2022-07-15 12:48:15 +03:00
pavelbannov
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
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