Commit Graph

8658 Commits

Author SHA1 Message Date
2e69d83683 Web: portalSettings: Restore: Deleted useless code. 2023-02-13 11:23:24 +03:00
56ce6aea67 Merge branch 'develop' into bugfix/restore-from-local-file 2023-02-13 10:21:01 +03:00
d69609104e
Merge pull request #1194 from ONLYOFFICE/bugfix/dark-theme-color
fixed color
2023-02-10 19:25:09 +03:00
203f2cad7f Merge branch 'develop' into bugfix/restore-from-local-file 2023-02-10 17:55:19 +03:00
261b1f13df Merge branch 'develop' into bugfix/61099 2023-02-10 16:34:38 +03:00
DmitrySychugov
708ef1f810 Web: Client: removed redundant check 2023-02-10 17:57:39 +05:00
DmitrySychugov
7180488f26 Merge branch 'bugfix/hide-mobile-button' of github.com:ONLYOFFICE/DocSpace into bugfix/hide-mobile-button 2023-02-10 17:52:20 +05:00
DmitrySychugov
d287e35d0d Web: Client: fixed name on sort button click 2023-02-10 17:52:04 +05:00
152012852b Merge branch 'develop' into bugfix/hide-mobile-button 2023-02-10 15:45:09 +03:00
621efcf870
Merge pull request #1195 from ONLYOFFICE/feature/refactoring-mediaviewer
Feature/refactoring mediaviewer
2023-02-10 15:42:18 +03:00
DmitrySychugov
b79b7815d6 Web: Client: removed the control of the store from the sort button 2023-02-10 17:37:24 +05:00
a1416a2791 Web: Files: fixed dragging, added hiding selection-area after losing focus 2023-02-10 15:32:08 +03:00
Akmal Isomadinov
6f491c9d40 Web fixed keyboard event 2023-02-10 17:13:52 +05:00
Akmal Isomadinov
0175edc651 Web: Moved from MediaViewerV2 to MediaViewer and removed old MediaViewer 2023-02-10 16:43:43 +05:00
DmitrySychugov
c1a3984786 Revert "Fixed Bug 61102 - Web: Common: removed the window with deletion if there are no rights or the room is in the archive"
This reverts commit d35452012d.
2023-02-10 16:26:12 +05:00
Elyor Djalilov
20e1d49171 fix translate 2023-02-10 15:51:43 +05:00
Akmal Isomadinov
21bc7f59dc Web:Common:Components:MediaViewerV2:Helpers Added protection against incorrect arguments for the findNearestIndex method 2023-02-10 15:44:44 +05:00
DmitrySychugov
52a51431cb Merge branch 'develop' into bugfix/hide-mobile-button 2023-02-10 15:33:03 +05:00
DmitrySychugov
a5c340c4d5 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-02-10 15:32:43 +05:00
DmitrySychugov
d35452012d Fixed Bug 61102 - Web: Common: removed the window with deletion if there are no rights or the room is in the archive 2023-02-10 15:32:16 +05:00
Akmal Isomadinov
7b036537a0 Web: Decomposition of MediaViewerDataStore 2023-02-10 15:13:43 +05:00
Akmal Isomadinov
8b33d977c8 Web: Fixed code formatting style 2023-02-10 15:04:57 +05:00
Akmal Isomadinov
789b017d05 Web: Rename the MediaViewerTS folder to MediaViewerV2 2023-02-10 14:18:56 +05:00
Akmal Isomadinov
58ed975320 Merge branch 'feature/refactoring-mediaviewer' of github.com:ONLYOFFICE/DocSpace into feature/refactoring-mediaviewer 2023-02-10 14:11:29 +05:00
Akmal Isomadinov
8571e0aa3b Web Rename the MediaViewer file to index 2023-02-10 14:04:19 +05:00
78a30f5700 Web: Returned checking and deleting the local store. 2023-02-10 11:57:31 +03:00
c9baec3175 Web: Added translation. 2023-02-10 11:31:49 +03:00
a35ef5a40d Merge branch 'develop' into feature/refactoring-mediaviewer 2023-02-10 10:43:05 +03:00
d45f5856a2 Web: PortalSettings: Restore: Added disable file selection. 2023-02-10 10:14:48 +03:00
6fdc4c0e0f Web: PortalSettings: Restore: Refactoring. 2023-02-10 10:12:45 +03:00
Akmal Isomadinov
c8e391bf62 Web:Common:Components:MediaViewerTS:MediaViewer Remove ButtonKeys 2023-02-10 12:04:16 +05:00
Akmal Isomadinov
a83e22ce3d Web:Common:Components:MediaViewerTS:MediaViewer Refactoring and optimization keyboard event 2023-02-10 12:00:57 +05:00
Akmal Isomadinov
4e875a75b9 Web:fixed a bug when opening galleries, the selector was not reset 2023-02-09 23:15:05 +05:00
10639f83aa Web: Fix infinite loop (out of memory issue) 2023-02-09 17:28:57 +03:00
cf8127ece8 Web: PortalSettings: Added standalone mode. 2023-02-09 16:31:41 +03:00
492a94ad03 Web: Added prop. 2023-02-09 16:25:01 +03:00
c17d0e9186 Web: PortalSettings: Restore: Adding a new component. 2023-02-09 16:18:16 +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
b11e97b188 Web: PortalSettings: Refactoring. 2023-02-09 14:42:05 +03:00
4e33c27532 Web: fix Safari selection 2023-02-09 14:28:01 +03:00
780a90f0c0 Merge branch 'develop' into feature/selection-area 2023-02-09 13:28:24 +03:00
ed7b339e87 Web: Client: InvitePanel: Fixed input width on mobile devices 2023-02-09 13:24:44 +03:00
DmitrySychugov
8c2476920e Web: Common: added check if function is defined 2023-02-09 15:09:16 +05:00
Elyor Djalilov
7b74a48891 fixed color 2023-02-09 14:23:00 +05:00
Elyor Djalilov
f3c6b14817 Fix Bug 61099 - Mobile. The location of the download copy button in the backup menu 2023-02-09 13:47:20 +05:00
838a2c9bb3 Web: SelectionArea: fixed selection 2023-02-09 11:26:37 +03:00
DmitrySychugov
2e4bdb0e49 Fixed Bug 60553 - Web: Client: added hiding the button if the sort menu is open 2023-02-09 13:19:58 +05:00
DmitrySychugov
4bd6c8d4f3 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-02-08 20:20:23 +05:00
Akmal Isomadinov
76e601bec7 Web: Fixed keyboard swipe 2023-02-08 19:21:14 +05:00
f548b4f99a
Merge pull request #1187 from ONLYOFFICE/bugfix/invite-link-copy
Fixed bugs
2023-02-08 17:07:18 +03:00
f9e5f46410 Merge branch 'develop' into feature/selection-area 2023-02-08 16:50:41 +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
c8f3b0582a Merge branch 'develop' into feature/login-error-page 2023-02-08 16:41:38 +03:00
b7adfea88c Web: Components: removed useless files 2023-02-08 16:35:32 +03:00
ac5e19398d Merge branch 'develop' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-02-08 16:28:08 +03:00
82f5b39fe7 Web: SelectionArea: fixed select 2023-02-08 16:25:39 +03:00
a46f625a9c Web: SelectionArea: refactoring 2023-02-08 14:15:16 +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
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
Akmal Isomadinov
19e1603ed3 Merge branch 'feature/refactoring-mediaviewer' of github.com:ONLYOFFICE/DocSpace into feature/refactoring-mediaviewer 2023-02-08 14:54:23 +05:00
Akmal Isomadinov
74ae468c3d Web:common:components:MediaViewerTS:MediaViewer Refactoring and optimization 2023-02-08 14:54:07 +05:00
Akmal Isomadinov
2c8a7ab89b Web:client:store:MediaViewerDataStore Added computed field currentPostionIndex and Added helper methods 2023-02-08 14:53:14 +05:00
Akmal Isomadinov
a163cea13c Web:common:components:MediaViewerTS:helpers: removed nearestValue method 2023-02-08 14:51:16 +05: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
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
17a6d8785f Web: Correcting the absence of the background of the button when isChecked in the storybook. 2023-02-08 10:34:02 +03:00
cfbe161312 Merge branch 'develop' into feature/refactoring-mediaviewer 2023-02-08 09:34:56 +03:00
Viktor Fomin
c3a54b2e74 Client: Wizard: fix style 2023-02-07 20:44: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
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
DmitrySychugov
e0fff6ce0a Web: Components: fixed display of video duration 2023-02-07 19:40:26 +05: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
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
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
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