Commit Graph

1027 Commits

Author SHA1 Message Date
Viktor Fomin
2704931747 Common: LoginContainer: fix style 2023-02-09 21:26:21 +03:00
2523162114 Web: Fix login selection 2023-02-09 15:01:59 +03:00
b3de8bc753 web: Fix layout selection 2023-02-09 14:58:54 +03:00
4e33c27532 Web: fix Safari selection 2023-02-09 14:28:01 +03:00
f9e5f46410 Merge branch 'develop' into feature/selection-area 2023-02-08 16:50:41 +03:00
ac5e19398d Merge branch 'develop' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-02-08 16:28:08 +03:00
Timofey Boyko
316a54d3d6 Merge branch 'develop' into feature/login-error-page 2023-02-08 11:09:23 +03:00
Timofey Boyko
2bbcf5a03a Web: move wrongPortalNameUrl to common/constants 2023-02-08 10:58:35 +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
Timofey Boyko
0baee7fbee Merge branch 'develop' into feature/login-error-page 2023-02-07 18:38:40 +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
86d93f1259 Merge branch 'develop' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-02-07 17:04:43 +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
8c18fb254d Fix TypeError: Cannot read properties of undefined (reading 'split') 2023-02-06 20:47:54 +03:00
68242853a7 Web: Files: fixed SelectionArea 2023-02-06 14:31:53 +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
65534fc670 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-06 13:23:29 +03:00
0c10732df8 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-03 20:22:39 +03:00
f9d0c7f4f6 Merge branch 'release/rc-v1.2.0' into bugfix/ssr-translations 2023-02-03 19:51:54 +03:00
08df544bcd Fix crash on mobile after remove file on viewer 2023-02-03 18:51:45 +03:00
Timofey Boyko
c3461b61e8 Web:Common:Utils: add logic for work with additionalPath for beforeBuild function 2023-02-03 17:13:03 +03:00
1759f7c564 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-03 16:49:46 +03:00
961b0ad613 Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 17:46:41 +03:00
de95953b14 Web: Fix OS path separator split 2023-02-02 16:50:45 +03:00
Timofey Boyko
3a3cedde88 Web:Common: update import for fonts 2023-02-02 15:10:54 +03:00
Akmal Isomadinov
5794262bc1 Web: Fixed memory leak 2023-02-02 15:56:21 +05:00
Akmal Isomadinov
7a2ca63577 Web: Fixed mediaviewer primary loading 2023-02-02 15:55:27 +05:00
Timofey Boyko
9e67f4343f Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-02-02 09:45:44 +03:00
Viktor Fomin
08d4e98e67 Common: LoginContainer: fix 2023-02-01 20:23:14 +03:00
Timofey Boyko
a4171c6749 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-02-01 18:50:26 +03:00
DmitrySychugov
663da51fce Web: Client: removed the display of one item in the context menu in the viewer 2023-02-01 20:44:02 +05:00
Timofey Boyko
bf63c3e1ec Web:Common:Utils: update beforeBuild function, now it auto generate translations file 2023-02-01 18:35:13 +03:00
Timofey Boyko
72e3fe9032 Web: rename translations to autoGeneratedTranslations 2023-02-01 17:53:33 +03:00
Timofey Boyko
d7b059afaa Web:Common:Utils: delete useless code from beforeBuild function 2023-02-01 16:11:34 +03:00
Timofey Boyko
c3154d88a3 Web:Common:Utils: add beforeBuild function 2023-02-01 16:06:08 +03:00
DmitrySychugov
6f3b53f353 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-01 17:44:56 +05:00
DmitrySychugov
90c2c19fc0 Fix Bug 60888 - Web: Common: removed the context menu items if there are no rights 2023-02-01 17:44:47 +05:00
Viktor Fomin
1e832f817a Common: SettingsStore: disable set cookie for wizard 2023-02-01 13:50:58 +03:00
Timofey Boyko
521a1658c6 Web:Editor: disable sw and fix tranlsation hash 2023-01-31 17:10:19 +03:00
Timofey Boyko
fe8a1bf081 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-01-31 12:46:43 +03:00
Timofey Boyko
776b0b7627 Web:Common: delete useless code 2023-01-31 12:18:19 +03:00
bae287b32b Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-31 00:29:39 +03:00
Timofey Boyko
2a46b713d9 Web:Common:Utils: change loadLanguagePath 2023-01-30 19:19:35 +03:00
Timofey Boyko
5dcfac2dc8 Web:Common:Utils: import all locales 2023-01-30 19:19:14 +03:00
DmitrySychugov
1f9dd80192 Fix Bug 60881 - Web: removed unnecessary items in the context menu in the viewer if the room is in the archive 2023-01-30 20:44:15 +05:00
825c346bf2 Web: Selection-area: fixed table selection 2023-01-30 15:32:52 +03:00
dd3ef94eaa Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-30 15:06:33 +03:00