DmitrySychugov
|
4bd6c8d4f3
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-02-08 20:20:23 +05:00 |
|
|
|
f548b4f99a
|
Merge pull request #1187 from ONLYOFFICE/bugfix/invite-link-copy
Fixed bugs
|
2023-02-08 17:07:18 +03:00 |
|
|
|
c72c1faeef
|
Fixed Bug 61039 - Files. ‘Sorry, the resource cannot be found’ flashes on the page when moving from the profile to the Trash folder.
|
2023-02-08 16:49:28 +03:00 |
|
|
|
ecd1e8537e
|
Merge pull request #1184 from ONLYOFFICE/feature/login-error-page
Feature/login error page
|
2023-02-08 16:48:34 +03:00 |
|
|
|
c8f3b0582a
|
Merge branch 'develop' into feature/login-error-page
|
2023-02-08 16:41:38 +03:00 |
|
|
|
34f510cf2f
|
Fixed Bug 61075 - Rooms.ExternalLink.Invite. The external link is copied to the clipboard each time the Invite Users to Room panel is opened.
|
2023-02-08 13:56:19 +03:00 |
|
|
|
abcc39e725
|
Merge pull request #1186 from ONLYOFFICE/bugifx/wizard
Bugifx/wizard
|
2023-02-08 13:20:32 +03:00 |
|
DmitrySychugov
|
1dace2011f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-02-08 14:56:44 +05:00 |
|
Viktor Fomin
|
5fe675ea74
|
Client: Wizard: hide license filed
|
2023-02-08 12:55:02 +03:00 |
|
Viktor Fomin
|
358f9ea1d3
|
Merge branch 'develop' into bugifx/wizard
|
2023-02-08 12:48:55 +03:00 |
|
Viktor Fomin
|
3d58a461c0
|
Client: WIzard: fix style
|
2023-02-08 12:48:49 +03:00 |
|
|
|
523606ebcb
|
Merge pull request #1185 from ONLYOFFICE/bugfix/fix-plugins-build
Plugins: fix versions
|
2023-02-08 12:34:46 +03:00 |
|
Timofey Boyko
|
f89c5d4036
|
Plugins: fix versions
|
2023-02-08 12:32:48 +03:00 |
|
|
|
6a2606b71e
|
fixed MigrationPersonalToDocSpace
|
2023-02-08 12:07:34 +03:00 |
|
|
|
109b44c529
|
Merge pull request #1132 from ONLYOFFICE/feature/asc.apicache
Feature/asc.apicache
|
2023-02-08 11:49:27 +03:00 |
|
Timofey Boyko
|
316a54d3d6
|
Merge branch 'develop' into feature/login-error-page
|
2023-02-08 11:09:23 +03:00 |
|
Timofey Boyko
|
698b00eabb
|
Web:Login: refactoring
|
2023-02-08 11:03:15 +03:00 |
|
Timofey Boyko
|
2bbcf5a03a
|
Web: move wrongPortalNameUrl to common/constants
|
2023-02-08 10:58:35 +03:00 |
|
Timofey Boyko
|
469455312b
|
Web:Login:Server: delete useless code
|
2023-02-08 10:58:03 +03:00 |
|
|
|
0e48ad7235
|
Merge pull request #1183 from ONLYOFFICE/bugfix/toggleButton
Web: Correcting the absence of the background of the button when isCh…
|
2023-02-08 10:42:29 +03:00 |
|
|
|
17a6d8785f
|
Web: Correcting the absence of the background of the button when isChecked in the storybook.
|
2023-02-08 10:34:02 +03:00 |
|
|
|
6b880d4e10
|
Merge pull request #1182 from ONLYOFFICE/feature/update-plugins-dependencies
Feature/update plugins dependencies
|
2023-02-08 10:26:37 +03:00 |
|
Timofey Boyko
|
eb5d6b9b77
|
Plugins: bump dependencies
|
2023-02-08 10:21:42 +03:00 |
|
Timofey Boyko
|
1b4d2cad04
|
docspace-plugin: update dependencies
|
2023-02-08 10:03:00 +03:00 |
|
Timofey Boyko
|
61d214b15d
|
WebPlugins: update dependencies
|
2023-02-08 09:59:50 +03:00 |
|
Viktor Fomin
|
c3a54b2e74
|
Client: Wizard: fix style
|
2023-02-07 20:44:32 +03:00 |
|
|
|
4da735203a
|
Merge pull request #1181 from ONLYOFFICE/feature/action-develo-brach
Modify github action branch
|
2023-02-07 20:42:56 +03:00 |
|
sk81.biz@gmail.com
|
5d38bd404b
|
Github action build from develop
|
2023-02-07 20:32:32 +03:00 |
|
|
|
d38efe9474
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/services/ASC.ApiSystem/Program.cs
|
2023-02-07 19:23:54 +03:00 |
|
|
|
ed94c42896
|
temporary removed apiCache
|
2023-02-07 19:12:44 +03:00 |
|
|
|
5e76441b64
|
fix
|
2023-02-07 19:12:09 +03:00 |
|
Timofey Boyko
|
0baee7fbee
|
Merge branch 'develop' into feature/login-error-page
|
2023-02-07 18:38:40 +03:00 |
|
Timofey Boyko
|
ede3a5d21d
|
Web:Login: add mechanism for throwing error from server
|
2023-02-07 18:36:44 +03:00 |
|
Timofey Boyko
|
1dc5d41884
|
Web:Login: fix error message type
|
2023-02-07 18:36:16 +03:00 |
|
Timofey Boyko
|
7e23b7118e
|
Web:Login:Server: add protect for undefined values
|
2023-02-07 18:32:17 +03:00 |
|
Timofey Boyko
|
88624cccf0
|
Web:Login:Client: add protect for undefined values
|
2023-02-07 18:32:02 +03:00 |
|
Timofey Boyko
|
fc3030e0af
|
Web:Common:Utils: getBgPattern can accept undefined as colorSchemeId
|
2023-02-07 18:31:06 +03:00 |
|
Timofey Boyko
|
28c903f382
|
Web:Common: add protect for undefined values
|
2023-02-07 18:30:18 +03:00 |
|
Timofey Boyko
|
b6ece7b2ac
|
Web:Login: add correct theme for Error502 and pass it to all components inside
|
2023-02-07 18:26:51 +03:00 |
|
Timofey Boyko
|
03116b8ffa
|
Web:Login: update interfaces and add new IError for error from server
|
2023-02-07 18:26:05 +03:00 |
|
Timofey Boyko
|
2397482010
|
Web:Login: add html template to catch section and send error to client
|
2023-02-07 18:25:37 +03:00 |
|
|
|
0f35b8ab45
|
redis: support User property from config
|
2023-02-07 17:53:34 +03:00 |
|
DmitrySychugov
|
e0fff6ce0a
|
Web: Components: fixed display of video duration
|
2023-02-07 19:40:26 +05:00 |
|
|
|
f52f32a6af
|
Merge branch 'develop' into feature/asc.apicache
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
|
2023-02-07 17:07:20 +03:00 |
|
|
|
b39b294920
|
fix
|
2023-02-07 14:46:24 +03:00 |
|
Viktor Fomin
|
7ac9a9ed54
|
Merge branch 'develop' into bugifx/wizard
|
2023-02-07 14:44:48 +03:00 |
|
|
|
c89b8ca427
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# 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/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
|
2023-02-07 14:31:22 +03:00 |
|
|
|
4a47e72a9a
|
Merge pull request #1173 from ONLYOFFICE/release/rc-v1.2.0
Release/rc v1.2.0
|
2023-02-07 13:45:23 +03:00 |
|
Timofey Boyko
|
dda05f7d7d
|
Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-02-07 13:26:54 +03:00 |
|
Timofey Boyko
|
e0f2a397c4
|
Web:Client: fix translations for devices
|
2023-02-07 13:26:46 +03:00 |
|
