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 |
|
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 |
|
|
|
b39b294920
|
fix
|
2023-02-07 14:46:24 +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 |
|
|
|
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 |
|
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 |
|
DmitrySychugov
|
f25abdc1ba
|
Web: Components: added alignment for title media error
|
2023-02-06 19:51:53 +05:00 |
|
DmitrySychugov
|
b3d04ccd59
|
Web: Client: added media error ru translation
|
2023-02-06 19:50:55 +05:00 |
|
|
|
c97c281dea
|
Web: Components: Toast: Fixed error toast with custom body
|
2023-02-06 16:35:50 +03:00 |
|
|
|
d3bed594a9
|
Web: Client: ChangeUserTypeEvent: Fixed client error message, added payments setting link
|
2023-02-06 16:33:40 +03:00 |
|
|
|
6fa291abce
|
Web: Client: Locales: Payment: Fixed key: QuotaPaidUserLimitError
|
2023-02-06 16:32:29 +03:00 |
|
|
|
52fd2400e1
|
Web: Client: Locales: Payment: Added new key: QuotaPaidUserLimitError
|
2023-02-06 15:15:44 +03:00 |
|
|
|
33630ce818
|
Web: Client: ChangeUserTypeEvent: Added client error message
|
2023-02-06 15:15:08 +03:00 |
|
|
|
1b14e863b4
|
Web: Client: UsersStore: Fixed updateUserType action
|
2023-02-06 15:14:28 +03:00 |
|
|
|
ac7944370a
|
Web: Client: Fixed Typo fixed
|
2023-02-06 15:13:36 +03:00 |
|
DmitrySychugov
|
2e2e6145d9
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-02-06 16:10:55 +05:00 |
|
DmitrySychugov
|
fa650bad45
|
Web: Client: added error media component
|
2023-02-06 16:10:43 +05:00 |
|
DmitrySychugov
|
321298d809
|
Web: Client: added en media error translation
|
2023-02-06 16:09:55 +05:00 |
|
|
|
8916ecbffe
|
Merge pull request #1164 from ONLYOFFICE/bugfix/mediaviewer-primary-loading
Bugfix/mediaviewer primary loading
|
2023-02-06 13:34:31 +03:00 |
|
|
|
65534fc670
|
Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading
|
2023-02-06 13:23:29 +03:00 |
|
|
|
73eb1a220e
|
Merge pull request #1166 from ONLYOFFICE/bugfix/ssr-translations
Bugfix/ssr translations
|
2023-02-06 13:00:09 +03:00 |
|
Akmal Isomadinov
|
33283cc63b
|
Web:Components:Viewer:Sub-Components:Mobile-Viewer Fixed image size on mobile
|
2023-02-06 13:40:35 +05:00 |
|
|
|
c38e0885a2
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2023-02-06 11:33:07 +03:00 |
|
|
|
fac357c357
|
Web:Components:Adding Animation.
|
2023-02-06 11:32:19 +03:00 |
|
