Commit Graph

92 Commits

Author SHA1 Message Date
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
6d183ab648 Client: Added top banner for minimazed js files 2024-03-21 18:08:20 +04:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
cd7805b4ca Merge branch 'develop' into feature/editor-nextjs 2024-02-26 11:16:55 +03:00
c10db673c6 Delete useless 2024-02-26 11:12:05 +03:00
e82b3894d2 Delete useless MF 2024-02-22 14:23:49 +03:00
75b5716dcc Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager 2024-02-22 10:00:47 +03:00
0367a8a8be Client: Simplify config for HtmlWebpackPlugin 2024-02-19 12:24:08 +03:00
405406d9e5 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/routes/portalSettings.js
#	public/locales/en/Common.json
2024-02-14 14:19:11 +03:00
5b28408a17 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/client/src/store/TableStore.js
#	packages/client/src/store/index.js
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/utils/common.ts
#	public/locales/en/Common.json
2024-02-14 12:15:32 +03:00
Akmal Isomadinov
f45420aa6a Removed useless code 2024-02-09 17:09:09 +05:00
Akmal Isomadinov
0b58025361 Removed script tiff.min 2024-01-31 21:28:47 +05:00
4ffa82f07b Web: Added quota update in management section. 2024-01-31 10:29:52 +03:00
683c628c28 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/common/components/Loaders/index.js
#	packages/shared/api/files/index.ts
#	public/locales/en/Common.json
2024-01-28 20:44:38 +03:00
1e0c383514 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
#	packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/constants/index.js
#	packages/common/store/CurrentQuotaStore.js
#	packages/components/combobox/index.js
#	packages/components/themes/base.js
#	packages/components/toggle-button/index.js
#	packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/people/filter.js
#	packages/shared/api/rooms/filter.js
#	packages/shared/utils/common.ts
#	yarn.lock
2024-01-19 11:32:34 +03:00
ab08a20435 Shared:Components:Filter: rewrite to typescript and move from common 2024-01-17 15:57:11 +03:00
253a8701f4 Web: Added quota change dialog in management section. 2024-01-17 11:50:48 +03:00
c9eb637db9 Shared:Utils: rewrite to typescript 2024-01-11 16:38:53 +03:00
dca3f1b0a2 Shared:Utils:Helpers: rewrite to typescript 2024-01-11 15:49:51 +03:00
ae23aaf0e2 Shared:Utils:MinifyJson: move from common 2024-01-11 11:28:42 +03:00
c77fda4f91 Client: fix warnings 2024-01-10 15:15:00 +03:00
69d3dadc13 Merge branch 'hotfix/v2.0.1' into develop 2023-12-13 20:01:17 +04:00
7fe587d374 Fix download changed version of embedded api.js (cache issue) 2023-12-13 15:52:14 +04:00
e347aacf11 Merge branch 'develop' into feature/management
# Conflicts:
#	package.json
#	yarn.lock
2023-11-21 12:40:25 +04:00
c202911fec
Merge pull request #70 from ONLYOFFICE/feature/scripts-caching
Added new caching rules for files in public/scripts
2023-11-14 14:13:56 +04:00
0ce050341b Moved hooks (useLoadingWithTimeout, useViewEffect) to client () 2023-11-13 15:40:15 +04:00
1dcdccb590 Added new caching rules for files in public/scripts 2023-11-13 03:25:32 +04:00
b1ed10166c Merge branch 'develop' into feature/management
# Conflicts:
#	yarn.lock
2023-11-10 23:06:29 +04:00
3987fc0eeb Fixed paths 2023-11-10 11:20:02 +04:00
c134e9c7ee Client: expose pages 2023-10-31 13:18:17 +03:00
DmitrySychugov
2fc16bc9ec Merge remote-tracking branch 'remotes/origin/develop' into feature/management
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	build/build.static.bat
#	build/clear.backend.docker.ps1
#	build/clear.backend.docker.sh
#	build/install/docker/Dockerfile
#	build/install/docker/Dockerfile.runtime
#	build/install/docker/config/nginx/templates/upstream.conf.template
#	build/install/docker/docspace.overcome.yml
#	build/install/docker/docspace.profiles.yml
#	build/start/start.backend.docker.ps1
#	build/start/start.backend.docker.sh
#	common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
#	common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
#	common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
#	common/ASC.Data.Backup.Core/Service/BackupService.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ApiSystem/Controllers/SettingsController.cs
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Models/SettingsModel.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
#	common/services/ASC.Data.Backup/GlobalUsings.cs
#	config/nginx/onlyoffice.conf
#	migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	package.json
#	packages/client/package.json
#	packages/client/src/pages/Confirm/sub-components/auth.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	yarn.lock
2023-10-04 16:27:12 +05:00
Akmal Isomadinov
58e0603cda Web: Added webpack bundle analyzer 2023-09-12 18:31:31 +05:00
25102157e6 Web: Deleted SelectFolderInput. 2023-09-06 11:56:16 +03:00
2b40130bce Merge branch 'develop' into bugfix/backup 2023-09-06 10:51:25 +03:00
c6b7a33b14 Web: Deleted SelectFileInput component. 2023-09-05 16:18:04 +03:00
5730a393f0 Merge branch 'develop' into feature/management 2023-09-04 12:23:29 +04:00
969ddbe162 Web: fix Invalid Host header on WP:DevServer with domain 2023-09-04 11:13:04 +04:00
Viktor Fomin
6702ea5ebd Client: expose RestorePage 2023-08-09 14:16:45 +03:00
Viktor Fomin
af58252433 Client: expose BrandingPage, delete useless 2023-08-09 13:55:23 +03:00
Viktor Fomin
866f2c3d03 Client: expose BackupPage 2023-08-09 11:52:48 +03:00
Viktor Fomin
dd0834fb04 Client: expose NavMenu 2023-07-29 17:51:01 +03:00
Viktor Fomin
92fb3499bb Client: expose PaymentsPage 2023-07-29 14:59:16 +03:00
Viktor Fomin
47a9f7a367 Client: expose LoaderWhiteLabel 2023-07-28 01:28:32 +03:00
Viktor Fomin
c36da266ea Client: expose BreakpointWarning 2023-07-28 01:14:57 +03:00
Viktor Fomin
5da205b488 Client: add wrapper for whitelabel 2023-07-26 12:31:46 +03:00
Viktor Fomin
ac005ccda0 Client: expose CommonWhiteLabel 2023-07-24 16:58:41 +03:00
4c0e68ad3d Web:Client:FilesSelector: add available selec files 2023-06-26 15:50:49 +03:00
Timofey Boyko
a83b100f4e Web:Client: update SelectFolderDialog for editor 2023-06-22 15:59:20 +03:00
Timofey Boyko
88366b36ce Web:Client: add support type script 2023-06-09 13:24:36 +03:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +03:00