94c81d11d1
add generation migration name logic
2021-10-11 17:34:11 +03:00
494a201a0b
cosmetic changes
2021-10-11 17:25:25 +03:00
243a2cb55f
update migration
2021-10-11 17:24:15 +03:00
8b4d793d78
remove unnecessary HasData
2021-10-11 17:23:39 +03:00
0066585554
replace DateTime.Now to fixed DateTime
2021-10-11 17:23:02 +03:00
73624e0aed
add auto migration creator
2021-10-07 12:52:35 +03:00
8ced3a052a
change access modificator
2021-10-07 12:51:29 +03:00
040f3065c5
fix
2021-10-07 12:51:10 +03:00
6cc771bb87
fix
2021-10-07 12:50:57 +03:00
814fe65535
fix
2021-10-07 12:49:55 +03:00
05b2c63543
net6: warning SYSLIB0013
2021-10-07 12:05:32 +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
498a896322
fix Bug 50254
2021-10-05 22:28:07 +03:00
01879779cd
Merge branch 'develop' into feature/backup
2021-10-04 15:21:45 +03:00
8409b10705
net6: warning SYSLIB0022
2021-10-01 13:34:47 +03:00
0f833ae1de
net6: warning SYSLIB0020
2021-10-01 13:26:36 +03:00
24224a7437
Files: fix rename folders. fix favorites
2021-09-30 21:26:01 +03:00
1bc64ce5ae
Files: check state before get stream
2021-09-30 09:51:38 +03:00
6c5d0d8940
add GetUserGroupRef
2021-09-28 20:32:22 +03:00
1c4d1efa83
fix
2021-09-28 20:30:02 +03:00
82cb6ddb6a
add scoped caching, remove unnecessary
2021-09-28 20:29:25 +03:00
2bd3a5764d
add method GetUserGroupRef, change return type
2021-09-28 20:26:16 +03:00
d27160cf98
Fix mobile app requests
2021-09-28 14:41:35 +03:00
511cea560b
add scoped caching
2021-09-27 19:59:09 +03:00
a0e39d0112
add ScopeCache
2021-09-27 19:54:01 +03:00
e755d2eda8
renamed providers to lowercase
2021-09-24 17:36:46 +03:00
90bb2ef44a
fixed bearer
2021-09-24 12:08:10 +03:00
315665e87a
BuildAndDeploy
2021-09-23 20:58:39 +03:00
f4feb48d2c
fix dependencies
2021-09-22 19:51:06 +03:00
4d14287590
fix backup
2021-09-20 21:30:29 +03:00
ec40bcc828
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
2021-09-20 16:27:28 +03:00
aa6c02b190
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
2021-09-20 16:26:34 +03:00
d32f555706
ResManager: fix
2021-09-17 16:46:24 +03:00
diana-vahomskaya
a5e1609dac
two methods
2021-09-16 11:25:17 +03:00
ea4fa97838
Merge branch 'develop' into feature/wizard/migration
...
# Conflicts:
# ASC.Tests.sln
# common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
# common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
# common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
2021-09-15 15:52:13 +03:00
ec66a65d38
User: fix request
2021-09-10 17:00:26 +03:00
2e20b4958d
fix CookieAuthHandler
2021-09-08 13:16:58 +03:00
51d905abc6
Cookie: logout after failed auth
2021-09-07 22:58:01 +03:00
5a5bb8fb25
Merge branch 'develop' into release/1.0.0
2021-09-05 22:59:31 +03:00
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
Vashchuk Nikita
3b4cb1dfc6
Added GlobalFilter, fix
2021-09-03 17:02:52 +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
f62209d88e
Merge branch 'develop' into feature/webhooks
2021-08-30 19:18:18 +03:00
a84bddad3c
fix
2021-08-30 19:17:57 +03:00
2addb81adf
Quota: Price2 removed
2021-08-30 18:19:20 +03:00
Vashchuk Nikita
5e6bd9ee5f
fix
2021-08-27 18:33:21 +03:00
Vashchuk Nikita
0521d8af09
fix
2021-08-27 17:50:49 +03:00
Vashchuk Nikita
35caf0dc4a
fix
2021-08-27 12:29:45 +03:00
Vashchuk Nikita
d66600b6c7
fix
2021-08-27 10:50:52 +03:00
Vashchuk Nikita
e5b40b3d0c
fix ASC.Webhooks.Tests
2021-08-27 00:15:47 +03:00
Vashchuk Nikita
45d221a109
Split webhooks into service and core
2021-08-26 21:43:41 +03:00
Vashchuk Nikita
1896457adb
added asynchrony to FileDao
2021-08-26 15:32:44 +03:00
dd9e5e9b5d
Merge branch 'develop' into feature/webhooks
2021-08-26 15:17:53 +03:00
14e8c59b17
Merge branch 'develop' into release/1.0.0
2021-08-25 21:17:41 +03:00
b791586252
net6
2021-08-25 18:26:13 +03:00
Vashchuk Nikita
c41361bdd8
fix
2021-08-24 11:08:58 +03:00
a0f5c4231f
fixed run via vs
2021-08-23 15:55:19 +03:00
Vashchuk Nikita
c851641b6c
Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks
2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880
Merge branch 'develop' into feature/webhooks
2021-08-23 12:36:01 +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
Vashchuk Nikita
3dc5ca5afc
Merge branch 'develop' into feature/webhooks
2021-08-19 15:58:57 +03:00
0745110a44
Test: fix
2021-08-19 15:58:25 +03:00
Vashchuk Nikita
66be58c759
fix
2021-08-19 15:56:14 +03:00
Vashchuk Nikita
e1c648e06a
Merge branch 'develop' into feature/webhooks
2021-08-19 13:49:16 +03:00
Vashchuk Nikita
5e72bcc224
fix
2021-08-19 13:17:54 +03:00
Vashchuk Nikita
2859d05ce3
fix
2021-08-19 12:25:43 +03:00
Vashchuk Nikita
7d4b22ca83
added tests, migrations
2021-08-19 12:11:26 +03:00
cf87addaa3
Security: added new method
2021-08-18 17:04:16 +03:00
diana-vahomskaya
945739fe44
fix test ASC.Web.Api.Tests
2021-08-16 15:20:41 +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
diana-vahomskaya
5e22019a28
fix context delete models: dbtenant, dbtariff from BackupsContext
2021-08-12 18:18: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
diana-vahomskaya
fee6900f19
update migrations ASC.Web.Api.Tests
2021-08-04 14:23:21 +03:00
e86124cbdd
Elastic: fixed search by content
2021-08-04 13:08:12 +03:00
diana-vahomskaya
eaa449db1f
Updated migrations for ASC.Core.Common
2021-08-04 00:41:33 +03:00
Vashchuk Nikita
b70c2e6f09
fix
2021-08-03 19:26:28 +03:00
diana-vahomskaya
af84cd6532
fix Context
2021-08-03 17:11:53 +03:00
c2bd00506c
fix Bug 51447
2021-08-03 17:05:49 +03:00
diana-vahomskaya
bcfddd88d7
fix context
2021-08-02 17:49:36 +03:00
a0b34c5cc9
Webhook: fix
2021-07-31 20:12:41 +03:00
Vashchuk Nikita
3c8fadc28d
modified WebhooksMiddleware
2021-07-29 15:39:22 +03:00
Vashchuk Nikita
e3d5aa50e7
fix
2021-07-29 14:04:42 +03:00
Vashchuk Nikita
b913cdc813
Added WebhooksIdentifier.cs
2021-07-28 18:16:56 +03:00
Vashchuk Nikita
afdd1ab982
Added CustomMiddleware(WebhooksMiddleware.cs)
2021-07-28 13:10:14 +03:00
diana-vahomskaya
34c4161f08
Update migrations, fix Context with repetitive Models
2021-07-27 19:26:56 +03:00
diana-vahomskaya
3131c27d26
Merge remote-tracking branch 'remotes/origin/feature/wizard/migration' into develop
2021-07-27 17:39:29 +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
Vashchuk Nikita
81299cc766
fix
2021-07-26 20:07:00 +03:00
Vashchuk Nikita
8a51dee296
modified DbWorker(Lazy), Sender. Added BuildQueueService and WorkerService.cs.
2021-07-26 20:03:55 +03:00
diana-vahomskaya
7f763cb7ff
fix test library from Newtonsoft.Json to System.Text.Json. Added new object to serialization
2021-07-25 22:14:30 +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
diana-vahomskaya
8be7427764
added test to webstudioDbContext Data = Completed:false
2021-07-22 01:38:31 +03:00
diana-vahomskaya
17a0a6bb9d
fix test for wizard
2021-07-21 15:44:20 +03:00
diana-vahomskaya
e1c9c17ecb
fix BaseApiTests
2021-07-20 13:35:19 +03:00
diana-vahomskaya
0785140ca5
fix tests
2021-07-20 13:24:19 +03:00
diana-vahomskaya
81d8324afb
ASC.Web.Api Tests added
2021-07-19 15:12:40 +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
Vashchuk Nikita
faabf5aae7
Updated Publisher, BackgroundService(integration kafka)
2021-07-15 18:45:17 +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
Vashchuk Nikita
2dcf6b8225
Added WebhookHostedService, modified Publisher and Sender
2021-07-08 20:32:59 +03:00
diana-vahomskaya
e02e833d31
fixed data to open wizard if magration true
2021-07-07 17:29:27 +03:00
67902f2072
Merge branch 'develop' into feature/backup
2021-07-07 15:15:59 +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
5f3638d08e
bugfix
...
add "IsCompleted" in end restoring
fix "ProgressQueue.GetTasks"
2021-07-01 15:33:50 +03:00
b6b1c72769
core: added new ThenBy linq extension. crm: fixed sql
2021-06-30 19:08:41 +03:00
58cdc94843
add Tenant status in settings and refactoring tenantStatusFilter
2021-06-30 17:26:46 +03:00
349cdb9853
add check if restoring or transfering
2021-06-30 16:38:07 +03:00
d04484a2eb
backup: add api "enablerestore"
2021-06-30 16:33:49 +03:00
db7954ee31
Merge branch 'develop' into feature/backup
2021-06-30 15:54:45 +03:00
Vashchuk Nikita
5305ad1018
Added models, DbWorker, publisher, sender.
2021-06-29 11:40:20 +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
f340924612
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
2021-06-18 20:19:56 +03:00
ae17671043
Merge branch 'develop' into feature/backup
...
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
2021-06-18 18:08:38 +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
b6b88b2506
bug fix: exception when call "getbackuphistory"
2021-06-17 16:48:20 +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
c22c25e5bf
bug fix: DistributedTask.Exception clean up when OnCompleted
2021-06-16 17:24:48 +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
0663ed7f16
Merge branch 'develop' into feature/backup
...
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-06-10 11:56:32 +03:00
8d80955686
Thumbnail: fix
2021-06-09 15:04:29 +03:00
6db87a3907
Backup: Fixed after merge.
2021-06-08 15:32:28 +03:00
3ef16948fc
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
2021-06-08 15:03:49 +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
e8516f7b34
Merge branch 'develop' into feature/two-factor-auth
2021-06-03 20:27:57 +03:00
944966b67b
WebSocker: repair service
2021-06-03 16:13:22 +03:00
43de25b62a
Merge branch 'develop' into feature/remove-unused-dep
...
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
bcc9e6c34b
ResManager: additional feature
2021-06-03 12:48:25 +03:00
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
...
Feature/thirdparty for two frameworks
2021-06-03 12:19:27 +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
3635905167
Backup: fixed link
2021-06-02 17:02:19 +03:00
d134398167
Storage: fix resolve
2021-06-02 16:28:05 +03:00
e43445cb2d
Config: Enabled personal mode in appsettings.json
2021-06-02 16:17:23 +03:00
d741e91e96
Backup: fixed notify
2021-06-02 15:00:36 +03:00
0aa6a71ea8
Merge branch 'develop' into feature/translations
2021-06-02 14:05:43 +03:00
36bc5a4172
Backup: fix
2021-06-02 12:58:46 +03:00
e9c5ca41ae
fix
2021-06-02 11:26:58 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
72f27e9b55
Web: Tests: Added new NotTranslatedToastsTest()
2021-06-01 20:00:36 +03:00
SuhorukovAnton
7fd550dfe8
Merge branch 'develop' into feature/thirdparty_for_two_frameworks
2021-06-01 17:49:10 +03:00
3ca36c9dd2
Web: Tests: Added new Common translations;
2021-06-01 17:00:55 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
76d8ebb459
Tests moved to separate projects.
...
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
424ea1396b
Web: Tests: Added opportunity to apply new Common translations
2021-06-01 11:44:46 +03:00
353fda6ff8
Web: Tests: Added opportunity to apply new translations
2021-06-01 11:29:46 +03:00
a7befed9be
Web: Tests: Refactoring
2021-05-31 21:01:47 +03:00
f9f049bb80
Web: Tests: Added new EmptyValueKeysTest()
2021-05-31 20:53:26 +03:00
7beccd192b
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
2021-05-31 20:33:12 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
061b4e46e7
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
2021-05-31 19:11:58 +03:00
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
4cabbb7d52
Merge branch 'develop' into feature/11.5.2
2021-05-31 18:13:08 +03:00
3e6cc50323
Api: error custom messages
2021-05-31 18:08:55 +03:00
d3fb9f8384
fix
2021-05-31 14:08:13 +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
0be4e07865
SsoAuth: 2e37dcd0
2021-05-31 11:35:42 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
c8c5b49d1c
Files: thumbnails. 2e37dcd0
2021-05-30 21:52:32 +03:00
74064fc76d
Merge branch 'develop' into feature/translations
2021-05-29 21:59:02 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# 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-05-29 21:57:42 +03:00
440638a18d
Audit: fix request
2021-05-29 17:55:36 +03:00
04fd99a01e
Web: Test: Added new NotTranslatedCommonKeysTest
2021-05-28 11:49:05 +03:00
953602b98b
Web: Test: Fix "Translations:" issues
2021-05-28 11:35:55 +03:00
d0d6b4e3e2
Web: Test: Added new UselessModuleTranslationKeysTest
2021-05-28 10:58:27 +03:00
527a650601
WebStudio: resources
2021-05-27 21:30:15 +03:00
bda786f844
WebStudio: moved from 08a01422
2021-05-27 20:13:24 +03:00
d07671c708
Web: Tests: Added more info on test NotTranslatedKeysTest() assertion
2021-05-27 16:37:38 +03:00
224cbc4b65
Web: Test: Added collection of ModuleFolders for future tests
2021-05-27 15:51:44 +03:00
a9ddfc0a4a
Web: Tests: Added more info on test NotAllLanguageTranslatedTest() assertion
2021-05-27 12:15:45 +03:00
7d1af40f6a
Web: Fix translation tests issues
2021-05-27 11:27:27 +03:00
7a12a26518
Web: Test: Add error message formatting
2021-05-26 10:50:14 +03:00
b372836d71
Web: Tests: Added new FullDublicatesTest
...
+ Fix DublicatesByContentTest (not the same translations on 'ru' language);
+ Added displaying test issues
2021-05-25 17:19:05 +03:00
f6fbe33814
Web.Core: moved from 08a01422
2021-05-24 20:41:31 +03:00
0136c3933a
Web: Tests: Added opportunity to save dublicates test data
2021-05-24 17:40:29 +03:00
90c67cac13
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
2021-05-24 13:26:13 +03:00
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +03:00
c1b7ea5a9a
Storage: moved from 08a01422
2021-05-21 16:26:42 +03:00
f16dd00f63
Web: Tests: Fix search translations inside components and common
2021-05-21 15:39:49 +03:00
55d7d034af
Web: Refactoring tests
2021-05-21 15:27:56 +03:00
a04fc86d0f
Web: Tests: Remove $ from regexp (variables match issue)
2021-05-21 14:38:11 +03:00
bf49684cbc
Web: Added new UselessTranslationKeysTest
2021-05-21 13:34:35 +03:00
SuhorukovAnton
02da2a15d1
websocket for only net standart
2021-05-21 13:31:28 +03:00
SuhorukovAnton
a1c4e0f568
Merge branch 'develop' into feature/thirdparty_for_two_frameworks
2021-05-21 12:27:54 +03:00
eb7f493304
Web: Moved translationKeys "RequiredField" and "FullAccess" to "/static/locales/{lng}/Common.json"
2021-05-21 11:05:37 +03:00
45668507dc
Web: Refactoring tests
2021-05-21 10:24:27 +03:00
f134196b57
Web: Added new translations tests
2021-05-20 18:11:43 +03:00
af2f24e4ac
Merge branch 'develop' into feature/translations
2021-05-20 13:11:13 +03:00
4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
5d94113e23
Backup: fix
2021-05-19 11:31:50 +03:00
Vashchuk Nikita
7c676374b3
fix Calendar & Radicale
2021-05-19 11:17:04 +03:00
b9c52c526e
Fixed DistributedTask
2021-05-18 21:24:22 +03:00
4b4b03f2a4
Merge branch 'develop' into feature/crm-migrate
2021-05-18 19:06:54 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
...
Feature/remove wq
2021-05-18 19:04:34 +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
SuhorukovAnton
ec56ae33a3
packages for rackspace and openstack
2021-05-18 12:01:34 +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
ce57a76648
Web: Back-end tests: refactoring
2021-05-17 11:20:13 +03:00
4013d0a799
Tests: Front-end: Added NUnit tests for i18n duplicates
2021-05-17 10:46:43 +03:00
31752e64b4
fixed warnings
2021-05-14 15:26:18 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
7ad62ded2b
Auth: fix confirm
2021-05-13 14:02:33 +03:00
d01db1eed6
Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
...
# Conflicts:
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
# common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/services/ASC.Data.Backup/BackupAjaxHandler.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-13 11:57:40 +03:00
6867ded281
Merge branch 'develop' into feature/remove-wq
...
# Conflicts:
# common/ASC.Common/DIHelper.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
# common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
Vashchuk Nikita
bf41c21c4e
Add Radicale
2021-05-11 18:05:46 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
c93813c7d3
Pomelo up to 5.0.0
2021-05-06 12:31:55 +03:00
0c7cbb6c99
removed unused newtonsoft.json
2021-05-06 12:20:37 +03:00
92ce702b28
crm: refactoring. bugfix
2021-05-05 17:09:05 +03:00
261e6d8b4c
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-05 15:09:59 +03:00
c86257cf67
Merge branch 'develop' into feature/crm-migrate
2021-05-04 11:25:27 +03:00
0dbadc6394
from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects
2021-04-30 18:42:10 +03:00
424c6a6806
migrate base mapper class from ASC.CRM to ASC.Common
2021-04-30 17:52:57 +03:00
8816e535c1
merge from develop
2021-04-28 19:50:59 +03:00
b27e973ec0
Merge pull request #237 from ONLYOFFICE/feature/support-hosting-as-service
...
Feature/support hosting as service
2021-04-28 15:33:53 +03:00
0656725149
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
2021-04-28 11:20:32 +03:00
38ed10ccb8
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-04-28 11:13:01 +03:00
dependabot[bot]
818c6dd79d
Bump redis from 2.8.0 to 3.1.1 in /common/ASC.Socket.IO
...
Bumps [redis](https://github.com/NodeRedis/node-redis ) from 2.8.0 to 3.1.1.
- [Release notes](https://github.com/NodeRedis/node-redis/releases )
- [Changelog](https://github.com/NodeRedis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/NodeRedis/node-redis/compare/v.2.8.0...v3.1.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-04-27 18:30:56 +00:00
f4d091135c
ConfirmAuth: auth by email
2021-04-27 20:27:23 +03:00
6c51ae8a15
Merge branch 'develop' into feature/translations
2021-04-27 13:59:58 +03:00
8bb173fa92
Thirdparty: fix providers
2021-04-26 21:42:39 +03:00
d97928fd37
Merge branch 'develop' into feature/support-hosting-as-service
2021-04-26 19:52:32 +03:00
40fe1cc3bc
ResManager: fixed JsonManager
2021-04-24 10:42:01 +03:00
2d8b085d02
add support WindowsService/systemd for IHostBuilder
...
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
cff1b93172
ResManager: added cshtml
2021-04-23 15:16:32 +03:00
NikitaVashchuk
3eb3cef5a3
fix
2021-04-20 10:55:52 +03:00
bd495757cc
Merge branch 'master' into develop
2021-04-19 18:52:56 +03:00
2a6a556a38
Merge pull request #226 from ONLYOFFICE/feature/dotnet-core-debugging-with-WSL-2
...
Feature/dotnet core debugging with wsl 2
2021-04-17 11:36:14 +03:00
4b756843ca
Tfa: validate confirm link
2021-04-16 21:54:53 +03:00
5f2998af87
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
2021-04-16 19:33:26 +03:00
3aae413e12
replace Path.Combine to CrossPlatform.PathCombine
2021-04-16 16:26:26 +03:00
226792cc42
Files: fixed tests
2021-04-14 14:51:17 +03:00
ad534bbc2f
ResManager: fix
2021-04-13 22:49:43 +03:00
3600151c4f
ResManager: fix
2021-04-13 21:19:48 +03:00
560d803d86
Common: added assembly version
2021-04-09 11:12:10 +03:00
50d01a646d
Core: fixed creating group
2021-04-06 21:04:15 +03:00
daa0698645
SocketIO: yarn.lock
2021-04-06 20:36:41 +03:00
ee6ffd3ace
Updated packages
2021-04-06 20:16:24 +03:00
8ff27ff1be
added ControllerNameAttributeConvention
2021-04-02 18:46:00 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +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
c750a55e36
core: added ControllerNameAttribute
2021-03-22 19:07:34 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +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
9e4ccb429d
ResManager: fix
2021-03-09 12:04:22 +03:00
05749fcf8e
ResManager: fix
2021-03-08 20:58:55 +03:00
3fff6c0dc8
ResManager: fix
2021-03-07 19:30:36 +03:00
8ebeeffcaf
ResxManager: fix
2021-03-06 11:08:57 +03:00
2b3d534628
ResManager: fix
2021-03-01 11:49:42 +03:00
b223c5006b
ResourceManager: fix
2021-02-28 15:40:50 +03:00
dccbe81002
DataAnnotations: fix
2021-02-25 21:18:27 +03:00
Diana
5c3f2975e8
fix NotMapped
2021-02-25 13:23:26 +03:00
b25dd2d6e2
.net 5
2021-02-25 12:02:28 +03:00
Diana
f1091f409a
fix dataannotations
2021-02-25 12:00:53 +03:00
Diana
4ddd2cebec
delete dataannotations
2021-02-20 22:02:12 +03:00
a0ce9e0dc5
Merge branch 'develop' into feature/not-implemented-page
2021-02-20 11:35:52 +03:00
3274bd0f21
ResManager: fix
2021-02-19 19:17:06 +03:00
Ilya Oleshko
7717784b46
Merge branch 'develop' into feature/not-implemented-page
2021-02-19 16:23:23 +03:00
24d0b0e672
Thridparty: fixed RemoveProvider method
2021-02-19 12:11:04 +03:00
Ilya Oleshko
b53557cedc
Merge branch 'develop' into feature/not-implemented-page
2021-02-18 15:56:39 +03:00
38b62a9a95
FederatedLogin: added EmbeddedResource callback.htm
2021-02-16 19:48:51 +03:00
d7ef3f631b
ResxManager: fix
2021-02-16 13:24:09 +03:00
Ilya Oleshko
d204c9b6de
Merge branch 'develop' into feature/not-implemented-page
2021-02-16 13:22:34 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
Artem Tarasov
1ddc2c951a
Merge branch 'develop' into feature/empty-group
...
# Conflicts:
# web/ASC.Web.Common/package.json
2021-02-12 13:10:41 +03:00
a12cf74638
fixed login handler
2021-02-10 22:43:18 +03:00
d05f7b70ec
ResManager: fix
2021-02-09 20:53:49 +03:00
10542fe4b4
ResManager: fix
2021-02-09 17:58:35 +03:00
d823516aa3
fixed profile removed resource
2021-02-03 14:07:18 +03:00
Ilya Oleshko
8226d9185c
Merge branch 'develop' into feature/not-implemented-page
2021-01-29 12:38:22 +03:00
f0e227731f
Fixed loading products, lazy loading webitemmanager
2021-01-26 12:29:50 +03:00
64655a7da0
Api: modules. Added info method
2021-01-25 17:37:26 +03:00
e11a880956
Core: fix migrations
2021-01-25 15:31:28 +03:00
036ddc87c3
5.0.2
2021-01-22 16:49:38 +03:00
f222f4be0c
.net 5
2021-01-22 16:42:26 +03:00
f8be896241
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +03:00
2848c39c57
Merge branch 'develop' into feature/thirdparty-integrations
2021-01-14 10:14:46 +03:00
b8e40ff3b2
OAuth: fix links
2021-01-13 16:30:32 +03:00
ae69a9559e
Files: removed temp
2021-01-13 12:41:29 +03:00
60562d69a3
Files: test fix
2021-01-13 10:21:29 +03:00
b7d3cd8650
Files: test
2021-01-12 22:42:17 +03:00
88eac5b10a
Files: test
2021-01-12 21:51:39 +03:00
a65aa18c17
Files: temp fix
2021-01-12 21:35:56 +03:00
2bbf510768
Files: test. Fix cache
2021-01-12 21:11:01 +03:00
f6ca373137
MemoryCache -> IMemoryCache
2021-01-12 20:51:14 +03:00
5289f92935
Files: temp fix
2021-01-12 18:01:38 +03:00
13cf5e5ad0
Files: tests. long operations
2021-01-12 16:00:05 +03:00
682ca73a91
Files: fix tests
2021-01-12 13:16:11 +03:00
7e80f26bc9
MessagesRepository: fix
2021-01-12 10:27:48 +03:00
c7c9225923
Merge branch 'develop' into feature/thirdparty-integrations
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:37:31 +03:00
53c422c2b2
revert
2020-12-30 18:03:21 +03:00
fa7c2bf9f1
Merge branch 'develop' into feature/asc-files-tests
2020-12-29 18:37:28 +03:00
0ae7f84de6
SocketIO: fix
2020-12-28 16:47:59 +03:00
bfa73ec5c2
moved from 2e37dcd0
2020-12-28 16:22:08 +03:00
b88d418d41
Merge branch 'develop' into feature/thirdparty-integrations
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
2020-12-25 15:27:44 +03:00
62cd0a6af0
Test: fix test migrate, drop test db
2020-12-25 13:48:04 +03:00
Diana
aa667a02ef
fix
2020-12-24 03:21:29 +03:00
Diana
e20b87447e
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-24 03:18:47 +03:00
76d7ed6c73
Merge branch 'master' into develop
...
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
1891813132
fix save tenant
2020-12-23 18:36:05 +03:00
d4b736103a
Users: fixed queries
2020-12-23 13:12:07 +03:00
0fae06b2bf
fix storage
2020-12-22 15:51:04 +03:00
Diana
9b338e0f78
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-22 15:37:10 +03:00
Diana
589c17ac95
fix
2020-12-22 02:27:10 +03:00
Diana
fada5e278b
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
2020-12-17 13:20:52 +03:00
29aa793329
Api: max data count - 1000
2020-12-15 14:13:14 +03:00
ce17dccb12
Thumb: security alert
2020-12-15 13:33:51 +03:00
b0dd9c1400
Files: optimization
2020-12-15 13:29:53 +03:00
cbc8888057
Merge branch 'develop' into feature/thirdparty-integrations
2020-12-15 10:55:15 +03:00
bc9dc7cd65
Log: fix
2020-12-11 18:27:59 +03:00
2bb8502526
Core: fix parse
2020-12-11 13:34:23 +03:00
d00d13bb8f
Core: fix
2020-12-11 13:03:30 +03:00
156bf72046
Core: fix GetProperty
2020-12-11 12:48:21 +03:00
Ilya Oleshko
5906b2f914
Merge branch 'develop' into feature/thirdparty-integrations
2020-12-10 16:25:44 +03:00
c764812d3a
Common: refactoring
2020-12-04 16:48:54 +03:00
d39c2524c3
Files: refactoring
2020-12-04 13:52:07 +03:00
1675896294
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
40546da35d
fix create file
2020-11-26 20:30:57 +03:00
462bd090d1
Merge branch 'develop' into feature/thirdparty-integrations
2020-11-26 08:22:40 +03:00
ed22ffb326
Files: bugfix and optimization
2020-11-25 18:40:23 +03:00
f71d59df53
TenantQuotaController: optimization
2020-11-24 13:56:24 +03:00
b487adb9fc
Refactoting & optimization
2020-11-24 13:15:11 +03:00
Ilya Oleshko
912b53cece
Merge branch 'develop' into feature/thirdparty-integrations
2020-11-20 16:45:07 +03:00
71b6f71fd7
Files: fix dispose
2020-11-20 15:49:57 +03:00
Ilya Oleshko
92bcdb9f8b
Merge branch 'develop' into feature/thirdparty-integrations
2020-11-20 13:09:13 +03:00
b5a66444d7
Thirdparty: fix save
2020-11-20 12:24:17 +03:00
eb6b54482e
fix warnings
2020-11-17 13:47:17 +03:00
1623241d8a
Code cleanup
2020-11-17 13:00:01 +03:00
d2a0d318f7
dotnet 5
2020-11-17 12:59:15 +03:00
c666520c74
Merge branch 'develop' into feature/thirdparty-integrations
2020-11-17 12:04:33 +03:00
75fce656f0
Merge branch 'develop' into feature/dotnet5
2020-11-17 11:31:14 +03:00
cd523404f1
Merge branch 'develop' into refactoring/scope
2020-11-16 17:09:19 +03:00
a66f99f574
net5.0
2020-11-15 18:55:57 +03:00
f328484bac
Thumbnails: updated winston
2020-11-15 18:42:47 +03:00
68483bc979
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +03:00
2ec76cae70
Merge branch 'develop' into bugfix/x-www-form-urlencoded
2020-11-12 18:03:10 +03:00
44536c695a
Thirdparty: fix.
2020-11-12 11:24:36 +03:00
503d2c1948
fix loginproviders
2020-11-11 15:21:15 +03:00
09c07e5060
Api: ThirdPartyController
2020-11-11 12:11:44 +03:00
SuhorukovAnton
6e2860a7e5
Merge branch 'develop' into bugfix/x-www-form-urlencoded
2020-11-10 14:51:33 +03:00
SuhorukovAnton
44e565ca37
x-www-form-urlencoded: add models
2020-11-10 13:41:32 +03:00
1490332568
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
3b2bebddf2
TenantManager: fix currentTenant
2020-11-09 14:51:21 +03:00
SuhorukovAnton
855c5bc92b
x-www-form-urlencoded: first version
2020-11-06 12:03:49 +03:00
79ea471098
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
790d2fc934
Restore: fix
2020-11-03 16:02:54 +03:00
450184f51c
Merge branch 'develop' into feature/connect-controlPanel
2020-11-03 11:48:52 +03:00
7e828b5643
Autofac: fix
2020-11-02 19:27:08 +03:00
c9a32c05dc
Merge branch 'develop' into feature/connect-controlPanel
...
# Conflicts:
# web/ASC.Web.Api/Controllers/PortalController.cs
2020-11-02 13:56:52 +03:00
e01182be70
Added /api/2.0/capabilities.json
2020-10-31 17:11:45 +03:00
1278b2abb5
Notify: fix
2020-10-30 20:51:01 +03:00
4056ea888a
Notify: fix urls
2020-10-30 17:57:31 +03:00
SuhorukovAnton
c1701500fa
connect-controlPanel: fix backup
2020-10-30 13:03:19 +03:00
496d908f6d
Notify: fix
2020-10-30 10:23:35 +03:00
0c1560a448
ResManager: fix
2020-10-29 22:15:14 +03:00
43beaf6f6b
Refactoring: scope
2020-10-29 17:30:08 +03:00
265feee81e
Refactoring: scope
2020-10-29 12:31:55 +03:00
049e8f63e9
Refactoring: scope.
2020-10-29 11:13:51 +03:00
3256a3dbc7
DI: fix
2020-10-28 23:02:03 +03:00
SuhorukovAnton
c94b0ee340
connect-controlPanel: fix branding, backup and restore
2020-10-28 16:21:24 +03:00
51f1f92307
Scope: refactoring.
2020-10-28 15:26:27 +03:00
e9a9b320e8
Scope: refactoring. Notify, People
2020-10-27 18:34:22 +03:00
75bbe888cd
Scope: refactoring. Migration, ASC.Files.Service
2020-10-26 19:38:23 +03:00
af99020de0
Scope: refactoring. Encryption
2020-10-26 17:23:23 +03:00
035a98b878
Refactoring: scope. Backup
2020-10-26 16:38:21 +03:00