Commit Graph

34835 Commits

Author SHA1 Message Date
091f943497 fixed query 2023-06-28 12:50:39 +03:00
bfb9a096e6 Merge branch 'develop' into feature/optimization-queries
# Conflicts:
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/ASC.Webhooks.Core/DbWorker.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2023-06-27 18:29:23 +03:00
09bc9909d4
Merge pull request #1475 from ONLYOFFICE/feature/thumbnails-new-formats
Feature/thumbnails new formats
2023-06-27 02:45:21 -07:00
116d4c8174
Merge pull request #1491 from ONLYOFFICE/bugfix/fix-migration-namespaces
Bugfix/fix migration namespaces
2023-06-27 02:37:30 -07:00
24706477db
Merge pull request #1493 from ONLYOFFICE/bugfix/foreign-keys
fix migrations
2023-06-27 02:36:11 -07:00
0bd332d2a9 fix migrations 2023-06-27 12:18:04 +03:00
265335d371 fix 2023-06-26 11:33:37 +03:00
01bbf1fb5e rename migration.core to migrations.core 2023-06-26 11:12:57 +03:00
7c7e20dfa3 fix migration namespace 2023-06-25 02:15:36 +03:00
cd7615c79e
Merge pull request #1478 from ONLYOFFICE/feature/migration-context
Feature/migration context
2023-06-21 14:28:22 -07:00
56353e7c22 fix 2023-06-22 00:15:37 +03:00
830ddf7c1c add foreign key in migration 2023-06-21 15:48:44 +03:00
09ffbbba7e create migration context 2023-06-21 15:40:55 +03:00
ebe5553ec4 Thumbnails: new formats added according to conversion matrix https://api.onlyoffice.com/editors/conversionapi#text-matrix 2023-06-21 12:07:23 +03:00
40ab1ab9cb
Merge pull request #1474 from ONLYOFFICE/bugfix/fixed-list-tabindex
Web: Files: fixed ReactVirtualized__List tabindex
2023-06-20 15:46:57 +04:00
55c2d0c05a
Merge pull request #1388 from ONLYOFFICE/feature/delete-portal
Feature/delete portal
2023-06-19 07:19:50 -07:00
932afe9106 fix 2023-06-19 16:34:23 +03:00
67eac48247 fix migration 2023-06-19 16:31:56 +03:00
beb2debb44 fix 2023-06-19 16:15:39 +03:00
f408b2b1d8 Web: Files: fixed ReactVirtualized__List tabindex 2023-06-19 15:48:35 +03:00
e8071dbcc8 fix context 2023-06-19 14:05:17 +03:00
3d694ad5ae Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Webhooks.Core/EF/Model/WebhooksLog.cs
#	web/ASC.Web.Studio/GlobalUsings.cs
#	web/ASC.Web.Studio/Startup.cs
2023-06-19 11:46:35 +03:00
03d929be63
Merge pull request #1466 from ONLYOFFICE/bugfix/loader-state
Web:Client:Home: fix onClick back funcation removing useless loaders …
2023-06-13 11:39:04 +04:00
Timofey Boyko
35597e6c09 Web:Client:Home: fix onClick back funcation removing useless loaders and replaced new url 2023-06-13 10:27:33 +03:00
813870989a
Merge pull request #1463 from ONLYOFFICE/feature/general-profile-page
Feature/general profile page
2023-06-09 17:18:47 +04:00
Timofey Boyko
e4e686e106 Web:Client:Profile: fix styles for free user 2023-06-09 16:10:50 +03:00
Timofey Boyko
fa0f6c50a1 Web:Client:Profile: return button for go back for free users 2023-06-09 16:09:00 +03:00
Timofey Boyko
9f116815bd WEb:Client:Profile: fix open from accounts context menu 2023-06-09 15:55:58 +03:00
Timofey Boyko
20859dc326 Web:Client:Profile: fix fromUrl 2023-06-09 15:42:41 +03:00
Timofey Boyko
4cf3873d95 Web:Client: change route from 'view/@self' to 'profile' 2023-06-09 14:52:25 +03:00
1905566b90 refactoring 2023-06-09 14:28:49 +03:00
Timofey Boyko
ad6904ad6f Web:Client: change route from 'view/@self' to 'profile' 2023-06-09 14:24:48 +03:00
3a5975645f Merge branch 'develop' into feature/general-profile-page 2023-06-09 15:12:46 +04:00
e9adcbdaa4 Update yarn.lock 2023-06-09 15:10:51 +04:00
ba345c0f06 fix merge 2023-06-09 14:04:55 +03:00
Timofey Boyko
40384b63f8 Merge branch 'develop' into branch bugfix/general-profile-page 2023-06-09 11:08:06 +03:00
4c7a2a4275
Merge pull request #1428 from ONLYOFFICE/feature/webhooks-page
Feature webhooks page
2023-06-08 22:54:36 +04:00
Vladimir Khvan
01995be6fd footer is shown if filters are changed 2023-06-08 21:11:26 +05:00
Vladimir Khvan
a632bb0674 selectedItem was substituted with styled one 2023-06-08 20:46:45 +05:00
Vladimir Khvan
108b1cffa5 webhook configs page styles were corrected 2023-06-08 20:17:50 +05:00
Vladimir Khvan
3ada0461d5 removed isWebhooksEmpty constraint on re-render 2023-06-08 19:53:31 +05:00
26c5e29cf8 revert 2023-06-08 16:53:43 +03:00
986561d4e9 Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/services/ASC.ApiSystem/Controllers/PeopleController.cs
#	migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2023-06-08 15:53:31 +03:00
Vladimir Khvan
002ce1780a added saving filters to url 2023-06-08 17:48:30 +05:00
Timofey Boyko
57d6cf3c06 Web:Client: add general routes for Profile and Notification pages 2023-06-08 14:40:48 +03:00
Vladimir Khvan
88db0cc37d corrected filter logic 2023-06-08 14:16:33 +05:00
Timofey Boyko
454f78edea Web:Client:Home: fix create icon for archive and trash 2023-06-08 12:08:00 +03:00
6d89a03aee
Merge pull request #1461 from ONLYOFFICE/bugfix/fix-article-header-at-desktop
Web: fix nav menu for small window at desktop
2023-06-08 12:43:11 +04:00
Timofey Boyko
c4851fa512 Web:Client:TableView: fix sorting 2023-06-08 10:17:25 +03:00
Vladimir Khvan
9c2cabed60 hint was hidden 2023-06-08 12:16:14 +05:00