Commit Graph

21539 Commits

Author SHA1 Message Date
17caec2581 Web: Translations: Fix some SingleKeyFilesTest issues 2022-05-25 14:53:28 +03:00
a84a47008d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 14:27:33 +03:00
d2215cba38 Web: Components: SelectorAddButton: Added property passing to component 2022-05-25 14:27:21 +03:00
94836dd2b5 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 14:17:42 +03:00
a5ed08b838 Fixed Bug 57338 - Client.HoveredRow. Added selection row on hover 2022-05-25 14:17:35 +03:00
4789e5e5ce Web: Campaigns: added Docs_7_1 stories 2022-05-25 14:56:11 +05:00
9485c2e59e Web: Campaigns: fixed origin for NewYear stories 2022-05-25 14:55:39 +05:00
7055ff083f Web: Campaigns: updated yarn lock 2022-05-25 14:54:56 +05:00
439d7d8d73 Merge branch 'release/v1.2' into feature/layout-for-banner 2022-05-25 14:43:51 +05:00
1f18ae7194 Web: Campaigns: added NewYear stories 2022-05-25 14:41:24 +05:00
3a74878277 Web: Campaigns: created Section 2022-05-25 14:40:54 +05:00
66a7f48cea Web: Campaigns: created Header 2022-05-25 14:40:23 +05:00
189687a537 Web: Campaigns: added theme 2022-05-25 14:39:43 +05:00
532b4dd36a Web: Campaigns: created Article 2022-05-25 14:39:14 +05:00
27c4d9e662 Web: Campaigns: created Layout 2022-05-25 14:38:49 +05:00
be3bbf9188 Web: Client: Files: Fixed error on canceling cloud file/folder moving dialog 2022-05-25 12:33:08 +03:00
b0bd02044c Web: Campaigns: added storybook 2022-05-25 14:26:08 +05:00
11ad1819f2 Web: Campaigns: added storybook and styled components 2022-05-25 14:25:11 +05:00
87b131c807 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 11:00:20 +03:00
032feddda8 Fix Bug 57218: oform edit icon 2022-05-25 10:59:55 +03:00
1f58e81928 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 10:55:42 +03:00
ffa6b10825 Web: People: fixed styles 2022-05-25 10:55:37 +03:00
1c1aa2b9b6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-25 10:53:54 +03:00
70a6a44196 Web: Client: Disable PWA feature for mobile devices 2022-05-25 10:53:39 +03:00
6491009d9e Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-25 10:43:27 +03:00
2b86d19122 Web: Client: Added <AppLoader /> 2022-05-25 10:43:19 +03:00
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
7ce16eeb3e
Merge pull request #676 from ONLYOFFICE/feature/nlog-5.0
update nlog
2022-05-24 21:58:59 +03:00
994bf92f06 Nlog: removed default settings.
Disabled Microsoft log except Microsoft.AspNetCore.Hosting.Diagnostics
2022-05-24 21:58:15 +03:00
7aba8f85ca Web: Client: increase progress indicator z-index 2022-05-24 19:52:20 +03:00
948ddcf6a0 Web: Files: Tile: fix padding 2022-05-24 19:27:56 +03:00
426e14b243
Merge pull request #675 from ONLYOFFICE/feature/cluster-services
Feature/cluster services
2022-05-24 18:41:58 +03:00
b525696b03 fix usings 2022-05-24 18:41:28 +03:00
2a10ac929f edit translations 2022-05-24 18:41:22 +03:00
1936498713 update spellcheck-excludes.json 2022-05-24 18:40:49 +03:00
b411f61ee5 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 18:31:49 +03:00
786ff38a98 update editor 2022-05-24 18:31:24 +03:00
7c3762ec9a edit translations 2022-05-24 18:29:25 +03:00
9581477d4e edit translations 2022-05-24 18:29:05 +03:00
d13c53c7f8 edit translations 2022-05-24 18:28:18 +03:00
a84cf572e4 update spellcheck-excludes.json 2022-05-24 18:27:49 +03:00
4b6aa555ec Web: Client: Added check of ready prop (Fix translation loading issue) 2022-05-24 17:43:25 +03:00
02570e12cf Merge branch 'develop' into feature/cluster-services 2022-05-24 17:24:25 +03:00
bb600fc32e
Merge pull request #668 from ONLYOFFICE/feature/remove-application/x-www-form-urlencoded
remove application/x-www-form-urlencoded
2022-05-24 17:15:07 +03:00
5599fc9809 Merge branch 'develop' into feature/remove-application/x-www-form-urlencoded 2022-05-24 17:09:33 +03:00
e20370be5d
Merge pull request #673 from ONLYOFFICE/feature/fix-crm
Feature/fix crm
2022-05-24 17:07:18 +03:00
8d9ee14ea6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-24 16:49:36 +03:00
57ad283bca edit translations 2022-05-24 16:47:40 +03:00
912f694b0d edit translations 2022-05-24 16:46:57 +03:00
f137a8904e Web: Files: InfoPanel: add missed prop 2022-05-24 16:42:05 +03:00