|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
1ac44d3c92
|
net6: warning SYSLIB0021
|
2021-10-07 12:03:13 +03:00 |
|
|
7a380542aa
|
net6: warning SYSLIB0023
|
2021-10-07 12:00:26 +03:00 |
|
|
8409b10705
|
net6: warning SYSLIB0022
|
2021-10-01 13:34:47 +03:00 |
|
|
b791586252
|
net6
|
2021-08-25 18:26:13 +03:00 |
|
|
a0f5c4231f
|
fixed run via vs
|
2021-08-23 15:55:19 +03:00 |
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
44847c1e8f
|
backend: change TargetFramework from netstandard2.1 to net5.0
|
2021-08-06 18:37:22 +03:00 |
|
|
90bb8a139a
|
UserManager: fix for personal
|
2021-08-06 17:30:51 +03:00 |
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
d88741962c
|
EF: optimize server version check
|
2021-07-16 11:48:30 +03:00 |
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
|
fbcdba3b17
|
Merge branch 'develop' into feature/personal
|
2021-06-25 11:10:49 +03:00 |
|
|
37a676cb5a
|
Tenant: removed Public, PublicVisibleProducts
|
2021-06-24 15:55:12 +03:00 |
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
|
8fc9bef6c6
|
Core: fix cache
|
2021-06-16 22:25:02 +03:00 |
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
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 |
|
|
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 |
|
|
2be10b8bd9
|
Settings: added personal settings
|
2021-06-02 19:13:47 +03:00 |
|
|
e43445cb2d
|
Config: Enabled personal mode in appsettings.json
|
2021-06-02 16:17:23 +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 |
|
|
c8c5b49d1c
|
Files: thumbnails. 2e37dcd0
|
2021-05-30 21:52:32 +03:00 |
|
|
4e57f2a47f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-20 00:47:45 +03:00 |
|
|
06928a7896
|
People: fixed group cache
|
2021-05-18 18:50:48 +03:00 |
|
|
db7e2b8700
|
People: fixed query
|
2021-05-18 16:16:17 +03:00 |
|
Vashchuk Nikita
|
82abf11109
|
Merge branch 'develop' into feature/calendar
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
|
2021-05-18 13:24:02 +03:00 |
|
Vashchuk Nikita
|
94047ab0a1
|
Fix Calendar
|
2021-05-17 21:35:23 +03:00 |
|
|
8a3db93d0d
|
Backup: moved from 08a01422
|
2021-05-17 21:27:39 +03:00 |
|
|
a5c6ba5dcc
|
Common, db: moved from 08a01422
|
2021-05-17 14:35:00 +03:00 |
|
|
31752e64b4
|
fixed warnings
|
2021-05-14 15:26:18 +03:00 |
|
|
7ad62ded2b
|
Auth: fix confirm
|
2021-05-13 14:02:33 +03:00 |
|
|
c93813c7d3
|
Pomelo up to 5.0.0
|
2021-05-06 12:31:55 +03:00 |
|
|
4b756843ca
|
Tfa: validate confirm link
|
2021-04-16 21:54:53 +03:00 |
|
|
50d01a646d
|
Core: fixed creating group
|
2021-04-06 21:04:15 +03:00 |
|
|
ee6ffd3ace
|
Updated packages
|
2021-04-06 20:16:24 +03:00 |
|
|
a0570554dd
|
Fixed migrations
|
2021-03-26 12:26:57 +03:00 |
|
|
65e1c72c01
|
Sln: fixed packages
|
2021-03-26 12:26:12 +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 |
|
Diana
|
976b955137
|
fix data in table core_settings
|
2021-03-17 14:30:25 +03:00 |
|
|
91105e8cd0
|
EF: removed old column tariff_key
|
2021-03-17 12:09:49 +03:00 |
|
Diana
|
73731f23b7
|
fix
|
2021-03-16 12:53:06 +03:00 |
|
Diana
|
4e62f6a204
|
update migrations ef tools v.5.0.3
|
2021-03-09 20:56:57 +03:00 |
|
|
dccbe81002
|
DataAnnotations: fix
|
2021-02-25 21:18:27 +03:00 |
|