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
SuhorukovAnton
03ae9171b6
connect-controlPanel: fix multitenancy
2020-10-23 10:42:28 +03:00
367c93fd91
Refactoring: scope
2020-10-22 20:57:18 +03:00
2143f376a3
Scope: refactoring
2020-10-21 16:39:06 +03:00
3ddb202c56
Scope: refactoring
2020-10-21 14:52:44 +03:00
6f25e2e83e
Refacoring: scope
2020-10-21 14:12:08 +03:00
SuhorukovAnton
01e473f7d1
connect-controlPanel: fix audit/login events and fix whitelabel
2020-10-21 12:55:13 +03:00
1d2f65ba12
Refactoring: scope
2020-10-20 23:10:17 +03:00
bff9629389
Scope: refactoring
2020-10-20 16:24:46 +03:00
24a594b74c
SocketIO: disable ping
2020-10-20 12:33:38 +03:00
b9cb483d65
DIHelper: fix
2020-10-19 22:11:23 +03:00
f56f231c91
Refactoring: scope
2020-10-19 22:04:07 +03:00
830c73a134
Scope: refactoring
2020-10-19 18:53:15 +03:00
9fe6fc3832
Refactoring: scope
2020-10-19 10:19:32 +03:00
3a29e9970f
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# products/ASC.Files/Server/Startup.cs
2020-10-18 22:52:24 +03:00
af1bf4a56e
Refactoring: lazy
2020-10-18 22:00:38 +03:00
181ac04fd8
DI: register fix
2020-10-18 19:34:30 +03:00
a4eb45f1ab
Scope: refactoring
2020-10-18 19:03:14 +03:00
18ef6e7cb6
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +03:00
5eed00dd28
Removed sq bugs and code smells
2020-10-16 16:21:59 +03:00
e6be6f5072
References updated
2020-10-16 10:27:44 +03:00
f69281a07d
References updated
2020-10-15 21:30:16 +03:00
0405989167
LoginEvents: fix
2020-10-15 11:04:06 +03:00
SuhorukovAnton
ab84f48a86
remove-wq: refactoring
2020-10-14 17:26:18 +03:00
7a535d9654
Audit: public resources
2020-10-14 17:15:30 +03:00
c1b046f954
Audit: resources. refactoring
2020-10-14 16:58:53 +03:00
aa28276de7
AuditTrail: resource
2020-10-14 16:43:51 +03:00
bdcfcd697b
Audit: fix
2020-10-14 16:27:12 +03:00
d50cf081ba
Merge branch 'master' into features/ASC.AuditTrail
2020-10-14 13:02:30 +03:00
70ff8c62ae
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-14 13:00:37 +03:00
d41b12cdc8
DbTenant: fix
2020-10-14 12:59:37 +03:00
4a0a683c68
fix
2020-10-14 12:11:04 +03:00
f252ef2a7f
Merge branch 'master' into features/ASC.AuditTrail
...
# Conflicts:
# ASC.Web.sln
2020-10-13 18:17:59 +03:00
SuhorukovAnton
2e4f612f93
remove-wq: fix encryption
2020-10-13 17:28:10 +03:00
668cb3e893
Merge branch 'master' into feature/files
2020-10-13 15:27:31 +03:00
788bddeb4f
Studio: fix
2020-10-13 15:26:54 +03:00
9968873305
Merge branch 'master' into feature/fix_API_return
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
02f39a9c71
Merge branch 'master' into feature/files
...
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
c622be89a3
revert discard
2020-10-12 22:39:23 +03:00
a8b838b4ce
fix
2020-10-12 22:12:03 +03:00
beeeaf3c3d
fix
2020-10-12 20:43:31 +03:00
f6f65f5968
fix
2020-10-12 20:40:14 +03:00
5e14bbb8cc
fix
2020-10-12 20:20:19 +03:00
43b9c33979
fix formating
2020-10-12 19:23:15 +03:00
26bb1567f7
ProductSecurityFilter: fix
2020-10-12 19:00:04 +03:00
b120d801aa
Confirm: fix
2020-10-12 18:58:38 +03:00
36034bf97a
fix warnings
2020-10-12 16:52:31 +03:00
SuhorukovAnton
917493f397
fix-messages: IDE0058
2020-10-10 14:35:05 +03:00
SuhorukovAnton
f4c0515340
fix-messages: IDE0022
2020-10-10 13:01:09 +03:00
49a7e215d2
added editorconfig
2020-10-09 18:52:17 +03:00
e01ee037f2
Merge branch 'master' into feature/fix-messages
...
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
SuhorukovAnton
370400e4c0
fix_API_return: first version
2020-10-09 13:05:48 +03:00
3ca0990715
Merge branch 'master' into feature/files
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-08 19:01:09 +03:00
bc1438ba92
EF: rename
2020-10-08 12:07:05 +03:00
b9e74c0e4d
DbContextManager: fix
2020-10-08 11:56:46 +03:00
573dc8922b
Merge branch 'master' into feature/schema
...
# Conflicts:
# common/ASC.Common/DIHelper.cs
2020-10-08 11:42:57 +03:00
e8061d10bd
DI: refactoring
2020-10-08 11:36:47 +03:00
Diana
2ceb82b458
flag to turn on/off migrations
2020-10-07 15:20:06 +03:00
ed47263adf
Merge branch 'master' into feature/files
2020-10-07 13:48:11 +03:00
08590b6b58
Fix confirm
2020-10-07 13:45:53 +03:00
0a7eb28989
Reassign: fix scope
2020-10-07 11:23:43 +03:00
SuhorukovAnton
10a55a2a76
ASC.AuditTrail: fix
2020-10-06 16:03:51 +03:00
SuhorukovAnton
d247223f86
ASC.AuditTrail: fix
2020-10-06 15:12:57 +03:00
Diana
5c2b6debac
fix migrations
2020-10-06 14:39:44 +03:00
Diana
cc8b3e470d
fix
2020-10-06 14:38:15 +03:00
SuhorukovAnton
8fb13f633c
ASC.AuditTrail
2020-10-06 14:24:12 +03:00
1ba65b9c01
EF: new Migration scheme
2020-10-06 10:06:18 +03:00
SuhorukovAnton
d145bcf076
ASC.AuditTrail: first version
2020-10-06 10:06:05 +03:00
d00d16ee02
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
191b517a59
Ef: fix
2020-10-05 13:11:15 +03:00
9c6812a9c3
EF: refactoring
2020-10-05 13:02:28 +03:00
bfba82be8e
EF: refactoring data
2020-10-05 12:56:07 +03:00
9b5f32be30
Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema
2020-10-05 12:27:33 +03:00
07263e58e8
EF: removed partial
...
Files: removed DbEncryptedData.cs
2020-10-05 12:27:15 +03:00
58f4f6b912
Notify: fix AutoSubmitted
2020-10-02 16:52:48 +03:00
38b204ca5a
DistributedTaskQueue: refactoring
2020-10-02 10:34:29 +03:00
3f5b8b77c4
DistributedTaskQueue: refactoring
2020-10-02 10:19:02 +03:00
Diana
04ee542f22
fix migrations, models, added migration and model schema TelegramDbContext
2020-10-01 20:08:55 +03:00
6bad98e277
Merge branch 'master' into feature/schema
...
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
2020-10-01 12:25:07 +03:00
0bd5099c00
Removed Migrations()
2020-10-01 11:39:21 +03:00
SuhorukovAnton
cb2e656e21
fix-messages: IDE0066
2020-10-01 10:57:35 +03:00
88d7a0d267
DistributedTaskQueue: fix
2020-10-01 10:22:08 +03:00
140d57d5d4
Merge branch 'master' into feature/files
2020-09-30 18:28:27 +03:00
SuhorukovAnton
edbc0f247c
fix-messages: IDE0022
2020-09-30 17:47:42 +03:00
c08abfc396
User: fix SetUserPasswordHash
2020-09-30 15:54:36 +03:00
SuhorukovAnton
f618f8799b
fix-messages: IDE0062
2020-09-30 15:46:16 +03:00
3741f3a5d1
Encryption: DistributedQueue
2020-09-30 15:23:35 +03:00
SuhorukovAnton
ba1ed22345
fix-messages: IDE0058
2020-09-30 14:50:39 +03:00
bfd450e602
DbUserService: fix
2020-09-30 14:20:54 +03:00
90e61ba082
Added DistributedTaskProgress
2020-09-30 13:54:49 +03:00
Diana
0d74f8d6a2
fix
2020-09-29 20:13:09 +03:00
Diana
bea6857429
fix models for npgsql
2020-09-29 20:09:39 +03:00
e4d4db6563
Merge branch 'master' into feature/remove-wq
...
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressBase.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.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
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2020-09-29 19:46:40 +03:00
b56df84bce
Settings: added password settings
2020-09-29 18:08:54 +03:00
e4acc15773
removed WorkerQueue, ProgressQueue
2020-09-29 16:02:47 +03:00
SuhorukovAnton
31cc18f568
fix-messages: IDE1006
2020-09-29 15:27:28 +03:00
SuhorukovAnton
9d5a9dd769
fix-messages: IDE1005
2020-09-29 14:58:00 +03:00
SuhorukovAnton
4e1bc262b9
fix-messages: IDE0075
2020-09-29 14:53:02 +03:00
SuhorukovAnton
9b6ccc19f0
fix-messages: IDE0074
2020-09-29 14:51:34 +03:00
SuhorukovAnton
a055c71610
fix-messages: IDE0070
2020-09-29 14:32:30 +03:00
SuhorukovAnton
151d8e162a
fix-messages: IDE0063
2020-09-29 13:34:12 +03:00
SuhorukovAnton
1da0de1200
fix-messages: IDE0065
2020-09-29 13:28:03 +03:00
SuhorukovAnton
754ac38e3e
fix-messages: IDE0074
2020-09-29 12:18:16 +03:00
SuhorukovAnton
135a845eaf
fix-messages: IDE0063
2020-09-29 12:16:07 +03:00
SuhorukovAnton
6df7f14901
fix-messages: IDE0056
2020-09-29 12:06:08 +03:00
SuhorukovAnton
b7cc10c13a
fix-messages: IDE0054
2020-09-29 12:03:37 +03:00
SuhorukovAnton
2d34d70a4e
fix-messages: IDE0051 and IDE0052
2020-09-29 11:57:37 +03:00
SuhorukovAnton
d866eccade
fix-messages: IDE0044
2020-09-28 18:42:03 +03:00
SuhorukovAnton
29ec562a78
fix-messages: IDE0038
2020-09-28 18:21:29 +03:00
SuhorukovAnton
de64bcca88
fix-messages: IDE0020
2020-09-28 17:45:05 +03:00
SuhorukovAnton
1d7f54ca22
fix-messages: IDE0019
2020-09-28 17:39:13 +03:00
SuhorukovAnton
1545138152
fix-messages: IDE0034
2020-09-28 17:34:28 +03:00
SuhorukovAnton
bde6f8ab49
fix-messages: IDE0031
2020-09-28 17:33:41 +03:00
SuhorukovAnton
bc98087599
fix-messages: IDE0018
2020-09-28 17:25:40 +03:00
SuhorukovAnton
ba07caf1c8
fix-messages: IDE0017
2020-09-28 17:22:46 +03:00
TatianaLopaeva
eaa24436db
Merge branch 'feature/files' into feature/payments-enterprise
2020-09-28 16:04:54 +03:00
a4cbb9f386
Files: fix openedit
2020-09-28 15:45:26 +03:00
2c1d473314
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
2020-09-28 12:29:33 +03:00
0dbae1adfd
Merge branch 'master' into feature/files
2020-09-28 11:32:13 +03:00
SuhorukovAnton
b1090335d0
Telegram: fix
2020-09-25 14:36:09 +03:00
SuhorukovAnton
c455419113
Telegram: fix Kafka
2020-09-25 14:13:43 +03:00
89df700fb1
Files: fix
2020-09-25 13:47:21 +03:00
SuhorukovAnton
693e35ac57
add ASC.TelegramService
2020-09-24 17:30:27 +03:00
8094848d05
Settings: fix
2020-09-24 12:45:02 +03:00
a085e8ef38
Merge branch 'master' into feature/release-11.0.0
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
2020-09-23 14:00:24 +03:00
6f5cc4a447
Api: fix
2020-09-23 13:55:39 +03:00
075798b90c
moved from release/11 4414f77b
2020-09-22 17:17:17 +03:00
dbbd0010f3
EF: fix
2020-09-20 23:02:34 +03:00
0000129b3b
Merge branch 'master' into feature/release-11.0.0
...
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
2020-09-20 20:17:12 +03:00
50ff5a94a4
Encryption: fix port
2020-09-18 21:15:50 +03:00
144dde2699
Encryption: fix notify
2020-09-18 20:57:51 +03:00
Diana
4a5e577cd4
Added Data
2020-09-18 20:50:30 +03:00
SuhorukovAnton
cb365ba75f
encryption: add api-metods getProgress and getSettings
2020-09-18 13:02:20 +03:00
a35a79c96a
moved from release/11 4414f77b
2020-09-18 10:59:23 +03:00
SuhorukovAnton
7d3bb9e9a8
encryption: add api start
2020-09-17 16:56:12 +03:00
d883ef441f
Api: moved from release/11 4414f77b
2020-09-17 15:04:28 +03:00
SuhorukovAnton
7fae3bf83a
encryption: upload crypt
2020-09-16 17:03:33 +03:00
54cf80dafa
Encrypt: fix
2020-09-16 16:32:46 +03:00
94a5079503
Encryption: notify fix
2020-09-16 13:50:53 +03:00
SuhorukovAnton
bb7c283145
enctyption: remove bug
2020-09-16 11:10:16 +03:00
SuhorukovAnton
8e0ebceb36
encryption: copyright
2020-09-16 10:54:52 +03:00
TatianaLopaeva
8ecc93a30c
Changed logic of upload license
2020-09-16 10:33:06 +03:00
dc6b0d2c6c
ASC.Data.Storage moved from release/11 4414f77b
2020-09-15 18:16:37 +03:00
TatianaLopaeva
a3adea3c27
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
dd80e300d0
Common, Core.Common moved from release/11 4414f77b
2020-09-15 16:11:05 +03:00
SuhorukovAnton
13edcd6a1a
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-15 11:26:43 +03:00
SuhorukovAnton
5916705391
enctyption: fixbug
2020-09-15 11:24:48 +03:00
SuhorukovAnton
8ed470113d
encryption: fix
2020-09-15 10:00:07 +03:00
SuhorukovAnton
505cb447cd
encryption: fix
2020-09-14 17:36:57 +03:00
SuhorukovAnton
a3e52d3f3d
ecnryption: test version
2020-09-14 17:16:30 +03:00
SuhorukovAnton
eb18133e4b
encryption: bugfix
2020-09-14 13:32:20 +03:00
7c9df6c3c4
Moved from v10.5.2-saas
2020-09-11 17:16:59 +03:00
15b34875d3
Moved from v10.5.2-saas
2020-09-11 17:12:35 +03:00
9282ffbbf1
Merge branch 'master' into feature/files
2020-09-10 13:40:54 +03:00
f89af33b5b
fix unhandled exception
2020-09-10 13:39:26 +03:00
23b2a310a0
Merge branch 'master' into feature/files
2020-09-10 12:35:55 +03:00
cc9e0e1374
Merge branch 'master' into feature/scope
...
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
e0febd8890
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
2020-09-09 13:49:25 +03:00
SuhorukovAnton
5aeaa0ee98
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-09 13:45:21 +03:00
SuhorukovAnton
88646b2d2f
default-value-module: fix
2020-09-09 13:38:43 +03:00
SuhorukovAnton
3875f9f4b0
default-value-module: fix
2020-09-09 13:36:53 +03:00
SuhorukovAnton
2378c3746e
default-value-module: fix
2020-09-09 13:25:50 +03:00
SuhorukovAnton
0f7901628b
default-value-module: fix
2020-09-09 13:25:13 +03:00
SuhorukovAnton
ae61f59d55
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-09 12:40:01 +03:00
SuhorukovAnton
ce27032fbb
default-value-module: first version
2020-09-09 12:31:57 +03:00
SuhorukovAnton
1752b9a4ba
encryption: fix
2020-09-09 12:03:21 +03:00
d30026b82f
Merge branch 'master' into feature/files
2020-09-08 15:20:05 +03:00
SuhorukovAnton
89daf213c5
encryption: fix
2020-09-08 15:07:59 +03:00
f464e031b8
Notify: fix
2020-09-08 11:42:13 +03:00
SuhorukovAnton
3d79f7c484
encryption: fix
2020-09-08 11:26:05 +03:00
SuhorukovAnton
bd3c14c7ec
encryption: fix
2020-09-07 18:04:26 +03:00
SuhorukovAnton
2d3f183567
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-07 17:00:48 +03:00
SuhorukovAnton
80198032a4
scope: refactoring
2020-09-07 15:01:15 +03:00
Diana
32241a70a6
changed
2020-09-07 01:49:03 +03:00
Diana
463a73e22c
changed
2020-09-06 21:47:52 +03:00
SuhorukovAnton
89318a1f37
encryption: fix
2020-09-05 23:02:51 +03:00
Diana
9f1cf2f8df
changes
2020-09-05 22:18:29 +03:00
8e3e73c746
Scope: fix
2020-09-04 13:10:19 +03:00
dc98b02d4f
fix
2020-09-04 12:20:12 +03:00
897f3c910e
Sln: removed *_Ubuntu configuration
2020-09-04 12:06:30 +03:00
f48574a809
Merge branch 'master' into feature/scope
2020-09-04 11:26:03 +03:00
SuhorukovAnton
3e3257b4be
encryption: fix
2020-09-04 11:22:03 +03:00
cbace5e1b4
Merge branch 'master' into feature/files
2020-09-03 18:32:51 +03:00
82dd4a8828
Settings: fix timeZones for unix
2020-09-03 18:30:14 +03:00
db97b65727
Merge branch 'master' into feature/files
2020-09-03 17:40:26 +03:00
SuhorukovAnton
d8576a4b0a
encryption: fix
2020-09-03 14:48:36 +03:00
5271c7f2f5
Api: fix error response
2020-09-03 12:38:13 +03:00
aa62721e73
EF: refactoring
2020-09-02 18:23:39 +03:00
SuhorukovAnton
15b17a0478
Encryption: first version
2020-09-02 13:54:50 +03:00
29d9f21d05
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
SuhorukovAnton
32f570784b
scope: fix
2020-08-31 12:01:23 +03:00
SuhorukovAnton
90f1c4fa3d
Merge branch 'master' into feature/scope
2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae
scope: add deconstructs
2020-08-31 11:18:07 +03:00
a48f8fb43e
Migration: fix start
2020-08-28 18:30:26 +03:00
maksim
c07be0324a
ASC.Data.Storage.Migration: fix
2020-08-28 14:58:20 +03:00
maksim
aa78badaec
ServiceClientListener: fix cache
2020-08-28 14:26:06 +03:00
maksim
e4b2c45ee6
MigrateServiceClient: adding a cache
2020-08-28 13:23:09 +03:00
maksim
138348f668
MigrateServiceClient: fix
2020-08-28 11:31:46 +03:00
Diana
7466aed406
choice between mysql and postgresql
2020-08-28 00:45:07 +03:00
maksim
95299daaf9
ASC.Data.Storage.Migration: adding listener and extension
2020-08-27 17:06:03 +03:00
maksim
8282f3f658
fix
2020-08-27 17:01:37 +03:00
5633d2467b
Merge branch 'master' into feature/files
2020-08-27 10:42:47 +03:00
952e0f40c7
Settings: authservice api
2020-08-26 17:34:21 +03:00
