|
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 |
|
Akmal Isomadinov
|
7340e2c4f6
|
Web:Components:Viewer:Sub-Components:Viewer-Base Fixed warning
|
2023-02-07 22:10:31 +05:00 |
|
Akmal Isomadinov
|
474e6251ef
|
Web: Refactoring MediaViewer
|
2023-02-07 22:09:48 +05:00 |
|
Akmal Isomadinov
|
e15b806c68
|
Web:Packages:Common:Components:MediaViewerTS Added types
|
2023-02-07 22:07:38 +05:00 |
|
Akmal Isomadinov
|
f532ed6fd5
|
Web:Common:Components:MediaViewerTS Added helpers
|
2023-02-07 22:06:46 +05: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 |
|
|
367d8c9936
|
Web: Files: fixed folder select
|
2023-02-07 18:23:44 +03:00 |
|
|
601e61eab6
|
Web: Files: fixed drag
|
2023-02-07 17:59:01 +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 |
|
|
86d93f1259
|
Merge branch 'develop' into feature/selection-area
# Conflicts:
# yarn.lock
|
2023-02-07 17:04:43 +03:00 |
|
|
08e68ac6a5
|
Web: SelectionArea: fixed tile view
|
2023-02-07 16:56:15 +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 |
|
|
0dd6985bd2
|
Fixed storybook run
|
2023-02-07 12:57:48 +03:00 |
|
|
b378917502
|
Merge pull request #1172 from ONLYOFFICE/feature/update-readme
Update README.md
|
2023-02-07 12:54:01 +03:00 |
|
Kseniya Fedoruk
|
e9764904fb
|
Update README.md
|
2023-02-07 12:40:39 +03:00 |
|
|
3bfad2c234
|
Update README.md
|
2023-02-07 12:26:37 +03:00 |
|
|
264f415dff
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2023-02-07 12:21:29 +03:00 |
|
|
81e6c58cc1
|
Web:Client:Added that when opening the Accent and Buttons modal, the colors are displayed from the previously selected portal theme.
|
2023-02-07 12:20:31 +03:00 |
|
|
22eacf4fb8
|
Fixed Bug 61060 - Accounts: Error in console Uncaught TypeError: "newData" is read-only when deselecting account
|
2023-02-07 11:00:21 +03:00 |
|
Viktor Fomin
|
1328cb2691
|
Merge branch 'release/rc-v1.2.0' into bugifx/wizard
|
2023-02-07 00:47:41 +03:00 |
|
Viktor Fomin
|
c6537bdddd
|
Client: Wizard: fix error message
|
2023-02-07 00:46:36 +03:00 |
|
|
604bc27e88
|
files: added logs
|
2023-02-07 00:35:13 +03:00 |
|
|
45b8e81a63
|
Web: Optimization of thumbnails creation
|
2023-02-06 23:05:57 +03:00 |
|
|
8c18fb254d
|
Fix TypeError: Cannot read properties of undefined (reading 'split')
|
2023-02-06 20:47:54 +03:00 |
|
Viktor Fomin
|
ee82613d81
|
Client: Wizard: add upload and validate license
|
2023-02-06 20:09:22 +03:00 |
|
Timofey Boyko
|
3dc7c23196
|
Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-02-06 19:28:08 +03:00 |
|
Elyor Djalilov
|
3722ae1a77
|
Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization
|
2023-02-06 21:23:32 +05:00 |
|
Elyor Djalilov
|
0bfb980f99
|
Bug 61043 - Files. Unreadable characters instead of name in Author column and Info/History panel
|
2023-02-06 21:19:25 +05:00 |
|
Timofey Boyko
|
131dd06bdb
|
Web: fix build
|
2023-02-06 19:15:04 +03:00 |
|
Akmal Isomadinov
|
917fe492eb
|
Merge branch 'release/rc-v1.2.0' into feature/refactoring-mediaviewer
|
2023-02-06 20:59:27 +05:00 |
|