|
|
eed733b83c
|
fixed user photo thumbnail generator
|
2022-02-04 20:59:58 +03:00 |
|
Vashchuk Nikita
|
5aa99ec811
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Server/ASC.Files.csproj
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
|
2022-02-04 16:04:52 +03:00 |
|
|
|
973624c30b
|
Merge branch 'feature/refactoring' into feature/asc-common-refactor
|
2022-02-03 17:30:13 +03:00 |
|
|
|
34dab043e0
|
Merge branch 'develop' into feature/analizators
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
|
2022-02-03 12:55:33 +03:00 |
|
|
|
4661ee96d0
|
Packages updated
|
2022-02-02 19:54:23 +03:00 |
|
|
|
f2c0f3ec77
|
Common: ICahcheNotify is reduced to IEventBus
|
2022-02-01 14:38:03 +03:00 |
|
Vashchuk Nikita
|
2901d837a1
|
async methods for httpClient in ASC.Web
|
2022-01-31 17:35:36 +03:00 |
|
|
|
17cb4a647b
|
analizators: bugfix
|
2022-01-31 14:35:59 +03:00 |
|
|
|
34ff334692
|
Merge branch 'develop' into feature/analizators
|
2022-01-31 14:35:16 +03:00 |
|
|
|
cefa25a391
|
refactoring: add globalusings: web.core
|
2022-01-31 11:30:08 +03:00 |
|
Vashchuk Nikita
|
3e03f820bb
|
async IDataStore
|
2022-01-25 12:29:11 +03:00 |
|
|
|
445f03097d
|
Fix content-type header
|
2022-01-24 22:44:18 +03:00 |
|
|
|
fce8d26cef
|
analizators/ca1507
|
2022-01-24 13:49:00 +03:00 |
|
|
|
fb3a61d0d2
|
analizators/s3442
|
2022-01-24 12:57:01 +03:00 |
|
|
|
667697f933
|
analizators/s2259
|
2022-01-21 16:46:30 +03:00 |
|
|
|
510bd4d731
|
analizators/s2219
|
2022-01-21 16:42:02 +03:00 |
|
|
|
f3d8b8d17a
|
analizators/s1854
|
2022-01-21 16:36:36 +03:00 |
|
|
|
fb65d3a09d
|
analizators/1481
|
2022-01-21 16:15:15 +03:00 |
|
|
|
3d635a4824
|
analizators/1643
|
2022-01-21 16:12:05 +03:00 |
|
|
|
2029c34f9c
|
analizators/s1121
|
2022-01-21 14:02:17 +03:00 |
|
|
|
473259657e
|
analizators/s1118
|
2022-01-21 13:47:56 +03:00 |
|
|
|
728c1b896e
|
analizators/s1104
|
2022-01-21 12:19:57 +03:00 |
|
|
|
bf3b0395a5
|
analizators/s1116
|
2022-01-21 11:04:08 +03:00 |
|
|
|
5f78b37e25
|
analizators/U2U1000
|
2022-01-20 12:28:48 +03:00 |
|
|
|
eb9a33c660
|
analizators/s3218
|
2022-01-20 11:36:56 +03:00 |
|
|
|
3f28dfe78a
|
analizators/s3237
|
2022-01-20 11:36:42 +03:00 |
|
|
|
f2e33fa4aa
|
analizators/s2365
|
2022-01-19 18:16:59 +03:00 |
|
|
|
25050cb5fd
|
analizators/s2223
|
2022-01-19 17:16:15 +03:00 |
|
|
|
85f1660b39
|
analizators/U2U1203
|
2022-01-19 13:46:21 +03:00 |
|
|
|
20b60958a8
|
analizators/U2U1022
|
2022-01-19 13:24:11 +03:00 |
|
|
|
fbb50e676e
|
analizators/U2U1202
|
2022-01-19 12:51:30 +03:00 |
|
|
|
1403afbc16
|
analizators/U2U1209
|
2022-01-19 11:59:14 +03:00 |
|
Vashchuk Nikita
|
5b9668c14f
|
ILinkDao, fix
|
2022-01-18 19:50:31 +03:00 |
|
|
|
78047d3b93
|
analizators/U2U1210
|
2022-01-18 18:29:46 +03:00 |
|
|
|
36c26bc803
|
analizators/U2U1117
|
2022-01-18 15:40:28 +03:00 |
|
|
|
0ee1a35424
|
analizators/U2U1115
|
2022-01-17 11:22:52 +03:00 |
|
|
|
516cd2fd80
|
analizators/U2U1111
|
2022-01-14 16:44:02 +03:00 |
|
|
|
b9884e6b81
|
Analizators/U2U1107
|
2022-01-14 16:32:06 +03:00 |
|
|
|
4bf841581f
|
Analizators/U2U1104
|
2022-01-14 16:12:37 +03:00 |
|
|
|
6b883bcd60
|
Merge branch 'develop' into feature/support-elasticache
|
2022-01-13 18:16:43 +03:00 |
|
|
|
9bc8584184
|
analizators/U2U1103
|
2022-01-13 15:53:57 +03:00 |
|
|
|
4155f911c0
|
analizators/U2U1025
|
2022-01-13 14:19:39 +03:00 |
|
|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
|
6961f38593
|
analizators/U2U1023
|
2022-01-12 15:34:58 +03:00 |
|
|
|
efb51c613f
|
refactoring *.proto files according to https://bit.ly/3KcZ0Ef
|
2022-01-11 19:28:48 +03:00 |
|
|
|
c85c2e6f26
|
analizators/U2U1007
|
2022-01-11 18:37:10 +03:00 |
|
|
|
c43f244282
|
analizators/U2U1003
|
2022-01-10 18:13:30 +03:00 |
|
|
|
a671732da5
|
analizators/SCS0005
|
2022-01-10 12:24:21 +03:00 |
|
|
|
a7dc8c7dfd
|
sync CommunityServer and AppServer cache via redis
|
2021-12-30 18:09:20 +03:00 |
|
|
|
a40b06648a
|
analizators/s3963
|
2021-12-28 19:01:12 +03:00 |
|
|
|
5e91416c53
|
analizators/s4035
|
2021-12-28 18:44:54 +03:00 |
|
|
|
9d43cb07ba
|
Files: fix after merge
|
2021-12-28 18:40:42 +03:00 |
|
|
|
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 |
|
|
|
0a786bbfa3
|
analizators/s4830
|
2021-12-28 15:00:48 +03:00 |
|
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
|
eb02c96697
|
microsoft recomended store the System.Guid type as string type in protobuf format
|
2021-12-23 18:29:35 +03:00 |
|
|
|
6d250efffa
|
add *.dll for support redis + update Grpc.* dll
|
2021-12-23 16:17:31 +03:00 |
|
|
|
031af716e6
|
Tfa: fix
|
2021-12-10 21:25:03 +03:00 |
|
|
|
0771a54c47
|
Optimization
|
2021-12-09 20:23:06 +03:00 |
|
|
|
c87a831b89
|
Files: optimization
|
2021-12-08 13:14:44 +03:00 |
|
|
|
bdcb4cd0be
|
moved from 51eb3d88
|
2021-12-07 16:56:16 +03:00 |
|
|
|
626191c5d7
|
Core: fixed session
|
2021-11-30 22:16:23 +03:00 |
|
|
|
4c78667a99
|
fix Bug 52493 - Welcome page. notify «User with this email is already registered»
|
2021-11-30 12:09:51 +03:00 |
|
|
|
58d84912dd
|
fix
|
2021-11-25 11:23:35 +03:00 |
|
|
|
038cf92a91
|
ApiSystemHelper: fix check
|
2021-11-25 11:00:17 +03:00 |
|
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
|
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 |
|
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
|
|
fc42416fea
|
fix config
|
2021-11-12 10:57:12 +03:00 |
|
|
|
09897ffc2b
|
net6: warning SYSLIB0014
|
2021-10-25 14:03:14 +03:00 |
|
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
|
f6f317ec42
|
net6: refactoring and bugfix
|
2021-10-21 16:23:26 +03:00 |
|
|
|
b6461e46f4
|
net6: replacing System.Drawing with ImageSharp
|
2021-10-18 14:24:05 +03:00 |
|
|
|
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 |
|
|
|
72b19da283
|
Files: fix requests
|
2021-10-08 12:49:29 +03:00 |
|
|
|
7a380542aa
|
net6: warning SYSLIB0023
|
2021-10-07 12:00:26 +03:00 |
|
|
|
6988c4f997
|
net6: warning SYSLIB0021
|
2021-10-01 13:28:15 +03:00 |
|
|
|
0f833ae1de
|
net6: warning SYSLIB0020
|
2021-10-01 13:26:36 +03:00 |
|
|
|
53c77f5214
|
Files: fix startedit
|
2021-10-01 11:04:19 +03:00 |
|
|
|
97b6fdc6e7
|
Bug 51393 - Personal: Security. There is possible to know email registered users with help "Signup"
|
2021-09-28 15:17:06 +03:00 |
|
|
|
90bb2ef44a
|
fixed bearer
|
2021-09-24 12:08:10 +03:00 |
|
|
|
b75940fe49
|
fix
|
2021-09-17 18:18:34 +03:00 |
|
|
|
737efc3be7
|
Api: settings. Added recapthca public key
|
2021-09-17 17:57:22 +03:00 |
|
|
|
6233ab55a3
|
Personal: added register method
|
2021-09-17 17:32:37 +03:00 |
|
|
|
a6b55a7496
|
Files: settings. Added ChunkUploadSize
|
2021-08-31 14:34:30 +03:00 |
|
|
|
c37fd46e6f
|
fix remove photo
|
2021-08-25 21:17:06 +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 |
|
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
|
643b7b66dc
|
Optimization: removed autofac ILifetimeScope
|
2021-08-10 17:56:38 +03:00 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
NikolayRechkin
|
5060e81b5f
|
Calendar: core: api
|
2021-06-30 09:37:17 +03:00 |
|
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
|
65378cc089
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
|
2021-06-15 11:49:39 +03:00 |
|
|
|
637be57e84
|
People: resize fix
|
2021-06-11 14:48:49 +03:00 |
|
