|
|
1e77063d32
|
fix Bug 51866
|
2021-09-05 22:59:14 +03:00 |
|
|
|
d099326e7f
|
Merge branch 'develop' into feature/backup.core
# Conflicts:
# common/services/ASC.Data.Backup/Program.cs
|
2021-09-05 12:50:05 +03:00 |
|
|
|
ec7fcd34b3
|
Merge branch 'develop' into release/1.0.0
|
2021-09-03 18:07:09 +03:00 |
|
|
|
9cb01be544
|
Elastic: removed unused isInit
|
2021-09-03 18:05:05 +03:00 |
|
|
|
d78195aa5a
|
Added notify
|
2021-09-03 18:04:06 +03:00 |
|
|
|
0970b1b420
|
Merge branch 'develop' into release/1.0.0
|
2021-09-02 23:50:18 +03:00 |
|
|
|
211224ca1a
|
Storage: fix S3
|
2021-09-02 23:49:59 +03:00 |
|
|
|
c5b135afbe
|
backup.core: remove waste
|
2021-09-02 16:11:41 +03:00 |
|
|
|
8171563965
|
backup.core: move backup.core
|
2021-09-02 15:41:54 +03:00 |
|
|
|
fa204303f5
|
Merge branch 'develop' into release/1.0.0
|
2021-09-01 16:08:41 +03:00 |
|
|
|
d8654444c6
|
backup.core: fix
|
2021-08-31 16:59:32 +03:00 |
|
|
|
115d752582
|
backup.core: fix
|
2021-08-31 15:43:40 +03:00 |
|
|
|
a812971c07
|
Merge branch 'develop' into feature/backup.core
|
2021-08-31 13:55:47 +03:00 |
|
|
|
4b3cb1b4fb
|
backup.core: first version
|
2021-08-31 12:40:28 +03:00 |
|
|
|
a84bddad3c
|
fix
|
2021-08-30 19:17:57 +03:00 |
|
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
|
|
14e8c59b17
|
Merge branch 'develop' into release/1.0.0
|
2021-08-25 21:17:41 +03:00 |
|
|
|
a0f5c4231f
|
fixed run via vs
|
2021-08-23 15:55:19 +03:00 |
|
|
|
a471a19dfd
|
Merge branch 'develop' into release/1.0.0
|
2021-08-23 11:50:35 +03:00 |
|
|
|
610e31ec3b
|
fixed equals
|
2021-08-20 19:04:55 +03:00 |
|
|
|
e5faa90adb
|
removed nuget warnings
|
2021-08-20 16:53:27 +03:00 |
|
|
|
9207238d8d
|
Merge branch 'develop' into release/1.0.0
|
2021-08-20 16:12:40 +03:00 |
|
|
|
9f83801f88
|
Nlog: optimization
|
2021-08-20 15:42:43 +03:00 |
|
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
|
|
0745110a44
|
Test: fix
|
2021-08-19 15:58:25 +03:00 |
|
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
|
9f5c732501
|
Merge branch 'develop' into release/1.0.0
|
2021-08-16 11:08:09 +03:00 |
|
|
|
5bf9bfae27
|
Files: optimization
|
2021-08-13 18:59:17 +03:00 |
|
|
|
b23fe977cb
|
Kafka: fix
|
2021-08-13 17:05:11 +03:00 |
|
|
|
86248a3ad1
|
Kafka: fix create topic
|
2021-08-13 11:09:01 +03:00 |
|
|
|
560b622a29
|
Merge branch 'develop' into release/1.0.0
|
2021-08-12 15:06:16 +03:00 |
|
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
|
163e73ef4a
|
Personal: optimization
|
2021-08-12 14:00:05 +03:00 |
|
|
|
87b7e171de
|
ApiSystem: fix
|
2021-08-11 21:32:43 +03:00 |
|
|
|
fff54bd9dc
|
Kafka: create before assign
|
2021-08-11 21:15:37 +03:00 |
|
|
|
e92c41d919
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 18:55:25 +03:00 |
|
|
|
1d4cabe5b9
|
MessagesRepository: optimization
|
2021-08-10 17:57:20 +03:00 |
|
|
|
57493d1018
|
Logger: singletone
|
2021-08-10 17:56:59 +03:00 |
|
|
|
643b7b66dc
|
Optimization: removed autofac ILifetimeScope
|
2021-08-10 17:56:38 +03:00 |
|
|
|
39f77c5352
|
Backup: fix
|
2021-08-10 11:36:07 +03:00 |
|
|
|
af18e175dc
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 11:13:17 +03:00 |
|
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
|
|
16469eb138
|
Api: added ConfigureNLogLogging
|
2021-08-08 15:56:54 +03:00 |
|
|
|
672de09a90
|
NLog: up to 4.7.10
|
2021-08-08 15:55:27 +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 |
|
|
|
5687e6bca2
|
Merge branch 'develop' into release/1.0.0
|
2021-08-05 19:11:02 +03:00 |
|
|
|
e86124cbdd
|
Elastic: fixed search by content
|
2021-08-04 13:08:12 +03:00 |
|
|
|
c2bd00506c
|
fix Bug 51447
|
2021-08-03 17:05:49 +03:00 |
|
|
|
6fbdaf0d31
|
Calendar: post-merge fixes
|
2021-07-27 16:09:30 +03:00 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
|
d821f9a2af
|
TimeZone: fix
|
2021-07-22 22:40:37 +03:00 |
|
|
|
913c67a818
|
Elastic: fixed create scope
|
2021-07-22 12:11:39 +03:00 |
|
|
|
8c78fa4a17
|
Feed: fix TenantManager
|
2021-07-22 11:56:52 +03:00 |
|
|
|
1268a436ca
|
Startup: fix load products
|
2021-07-16 11:56:14 +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 |
|
|
|
b184ad7898
|
Log: fix configuring
|
2021-07-14 11:00:59 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
8388a4e306
|
Merge branch 'develop' into feature/personal
|
2021-07-12 10:56:30 +03:00 |
|
|
|
7e6e25274f
|
Api: fix confirm
|
2021-07-10 20:27:15 +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 |
|
|
|
a23b23de3c
|
Startup: added ability to skip load products and consumers
|
2021-06-24 11:15:20 +03:00 |
|
|
|
d41f81e1cd
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-23 20:27:10 +03:00 |
|
|
|
d59f9a2aa2
|
fixed urls
|
2021-06-23 20:12:50 +03:00 |
|
|
|
0e6078f9e2
|
Merge branch 'develop' into feature/ClearEvents
# Conflicts:
# ASC.Web.sln
|
2021-06-23 17:15:56 +03:00 |
|
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +03:00 |
|
|
|
85574630cb
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-23 15:30:55 +03:00 |
|
|
|
c18adc50dc
|
ClearEvents: fixed log and launch
|
2021-06-23 15:25:17 +03:00 |
|
|
|
7fc9a35b49
|
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
|
2021-06-23 14:37:03 +03:00 |
|
|
|
3788bab48e
|
HealthCheck: fix Studio
|
2021-06-22 19:55:47 +03:00 |
|
|
|
d8abde6d88
|
SSoAuth: fix buid and run
|
2021-06-22 19:44:09 +03:00 |
|
|
|
912501a2f4
|
Healthcheck: fix apisystem
|
2021-06-22 19:09:24 +03:00 |
|
|
|
4a4cab5352
|
Files: FileHelper decorator
|
2021-06-18 23:31:46 +03:00 |
|
|
|
00cc15fbf5
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-18 12:21:54 +03:00 |
|
|
|
d0b813cc71
|
update packages
|
2021-06-18 12:11:25 +03:00 |
|
|
|
d3113fdc2e
|
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
|
2021-06-18 11:32:55 +03:00 |
|
|
|
3d3a8a2d6a
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-18 10:49:07 +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 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
|
73547f421e
|
Common: install newtonsoft
|
2021-06-15 16:44:53 +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 |
|
|
|
a66e3afa92
|
Web: Tests: Commented "Save empty 'EN' keys to not found files"
|
2021-06-11 18:18:38 +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 |
|
|
|
fc9d626bcc
|
UrlShortenerService: fix log
|
2021-06-11 11:44:10 +03:00 |
|
|
|
a82efce2a1
|
add fileHelper
|
2021-06-10 17:53:06 +03:00 |
|
|
|
8d80955686
|
Thumbnail: fix
|
2021-06-09 15:04:29 +03:00 |
|
|
|
c5fe4a9989
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-08 12:17:36 +03:00 |
|
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
|
|
50f0bef484
|
remove unnecessary using
|
2021-06-07 13:56:24 +03:00 |
|
|
|
fd485e06e4
|
remove_binary_formatter
|
2021-06-07 13:54:17 +03:00 |
|
|
|
54d5c658bd
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-07 11:54:06 +03:00 |
|
SuhorukovAnton
|
860b682594
|
replace "DeleteOldEvents" in new service
|
2021-06-04 14:10:37 +03:00 |
|
