|
|
ce1bb3ae6b
|
Bump version to v2.6.0
|
2024-06-27 08:18:39 +03:00 |
|
|
|
ba2228fdca
|
Update yarn to v4.3.0
|
2024-06-19 16:16:11 +04:00 |
|
|
|
446acde907
|
Add new script start:internal and start-prod:internal
|
2024-05-15 12:28:31 +03:00 |
|
|
|
28829e9faf
|
Update yarn.lock
|
2024-05-02 17:09:12 +03:00 |
|
|
|
89fae48693
|
Apply build and start new login with nextjs
|
2024-04-26 18:04:16 +03:00 |
|
|
|
e21d411b03
|
Bump version to v2.5.1
|
2024-04-22 13:14:32 +04:00 |
|
|
|
33a0c7f746
|
Bump version to v2.5.0
|
2024-03-07 12:41:28 +04:00 |
|
|
|
77b5986876
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/routes/client.js
# packages/client/src/routes/confirm.js
# packages/client/src/routes/general.js
# packages/client/src/routes/portalSettings.js
# packages/common/package.json
# packages/components/scrollbar/styled-scrollbar.js
# packages/editor/package.json
# packages/shared/package.json
# packages/shared/utils/component-loader.ts
|
2024-03-04 17:38:42 +04:00 |
|
|
|
c7a1c6b60c
|
Downgrade yarn to v4.0.2 (next-editor issue)
|
2024-03-01 13:40:58 +04:00 |
|
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
|
|
854c9ed627
|
Update yarn to v4.1.0
|
2024-02-29 11:25:02 +04:00 |
|
|
|
271b4fb63e
|
Delete @docspace/editor
|
2024-02-26 11:28:45 +03:00 |
|
|
|
705cad387e
|
Bump version to v2.0.4
|
2024-02-19 17:08:19 +04:00 |
|
|
|
05739c17b3
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-13 14:49:46 +03:00 |
|
|
|
e61369d522
|
Merge branch 'hotfix/v2.0.3' into develop
# Conflicts:
# packages/shared/package.json
|
2024-02-12 13:15:59 +03:00 |
|
|
|
39ba7138cd
|
Bump version to v2.0.3
|
2024-02-09 12:56:09 +04:00 |
|
|
|
4b4ddba58c
|
Merge branch 'feature/refactoring-selectors' into feature/editor-nextjs
|
2024-01-31 16:22:01 +03:00 |
|
|
|
b86924c936
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/components/selector/sub-components/Item/Item.types.ts
# packages/shared/package.json
# packages/shared/selectors/Room/index.tsx
|
2024-01-25 16:32:37 +04:00 |
|
|
|
ef1140b116
|
Bump version to v2.0.2
|
2024-01-24 20:49:25 +04:00 |
|
|
|
96fee44666
|
Bump yarn to v4.0.2 and engines version
|
2024-01-23 13:51:33 +04:00 |
|
|
|
5406e7cf35
|
Applied server action to get config
|
2024-01-09 20:25:50 +04:00 |
|
|
|
8b02708101
|
Add lint tasks
|
2023-12-29 15:03:39 +03:00 |
|
|
|
0b3ce31756
|
Client: fix after rewrite to typescript
|
2023-12-27 17:45:22 +03:00 |
|
|
|
83bf8f3025
|
Fix after merge 'develop'
|
2023-12-14 13:02:52 +03:00 |
|
|
|
69d3dadc13
|
Merge branch 'hotfix/v2.0.1' into develop
|
2023-12-13 20:01:17 +04:00 |
|
|
|
34bc7d72c5
|
Bump version to v2.0.1
|
2023-12-07 12:55:07 +04:00 |
|
|
|
1e9cb7e35a
|
Shared:Components:TextInput: rewrite to typescript
|
2023-12-06 16:32:43 +03:00 |
|
|
|
e347aacf11
|
Merge branch 'develop' into feature/management
# Conflicts:
# package.json
# yarn.lock
|
2023-11-21 12:40:25 +04:00 |
|
|
|
e1fb10491f
|
Added "Madge" package for find circular dependencies
|
2023-11-16 14:39:47 +04:00 |
|
|
|
1dcdccb590
|
Added new caching rules for files in public/scripts
|
2023-11-13 03:25:32 +04:00 |
|
|
|
3170833b98
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.macos.code-workspace
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# yarn.lock
|
2023-11-09 19:13:20 +05:00 |
|
|
|
e82feda91b
|
Removed useless auto-chanelog for debug-info
|
2023-11-01 11:07:50 +04:00 |
|
DmitrySychugov
|
fd250c57da
|
Merge branch 'develop' into feature/management
# Conflicts:
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/components/context-menu/index.js
# yarn.lock
|
2023-10-25 14:40:50 +05:00 |
|
|
|
564c2c5419
|
Bump version to v2.0.0
|
2023-10-16 13:33:51 +04:00 |
|
DmitrySychugov
|
223034dfc5
|
fixed build/deploy for management
|
2023-10-04 21:11:46 +05: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 |
|
|
|
db2b2170e9
|
merge from master
|
2023-10-03 17:26:38 +03:00 |
|
|
|
7abaca70eb
|
Added minification of common locales in publish/web
|
2023-10-03 12:37:37 +04:00 |
|
|
|
d0add3dbb1
|
Changed paths (to publish/web)
|
2023-10-02 16:49:15 +04:00 |
|
Viktor Fomin
|
3668d75450
|
Merge branch 'develop' into feature/management
|
2023-09-05 18:34:41 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
83bc2edd02
|
Web: bump version to v1.1.3
|
2023-09-04 17:43:24 +04:00 |
|
Viktor Fomin
|
89b8673f99
|
Merge branch 'develop' into feature/management
|
2023-08-02 11:26:54 +03:00 |
|
|
|
12558b8520
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# yarn.lock
|
2023-08-01 17:56:22 +03:00 |
|
Viktor Fomin
|
ae61e11974
|
Merge branch 'develop' into feature/management
|
2023-08-01 16:16:28 +03:00 |
|
|
|
51fb13d035
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/pages/Files.jsx
# packages/common/components/Navigation/Navigation.js
# packages/common/components/Navigation/sub-components/control-btn.js
# packages/common/components/Navigation/sub-components/plus-btn.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Server/Api/OperationController.cs
# yarn.lock
|
2023-08-01 14:39:31 +03:00 |
|
|
|
30c4e4bbaa
|
Web: bump version to v1.1.2
|
2023-07-28 21:03:52 +04:00 |
|
Viktor Fomin
|
82d7024a8b
|
Web: add scripts for management
|
2023-07-28 16:01:57 +03:00 |
|
|
|
f3765018f1
|
Web: bump version
|
2023-07-25 14:02:50 +04:00 |
|
Viktor Fomin
|
f7f0c431a4
|
Web: add script for start management
|
2023-07-24 16:55:07 +03:00 |
|
