Commit Graph

1227 Commits

Author SHA1 Message Date
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
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
e43445cb2d Config: Enabled personal mode in appsettings.json 2021-06-02 16:17:23 +03:00
0aa6a71ea8 Merge branch 'develop' into feature/translations 2021-06-02 14:05:43 +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