Commit Graph

1124 Commits

Author SHA1 Message Date
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
d8c1bf08f9 Web: Added room check for notifications disabled. 2023-02-07 13:34:52 +03:00
8c18fb254d Fix TypeError: Cannot read properties of undefined (reading 'split') 2023-02-06 20:47:54 +03:00
Akmal Isomadinov
917fe492eb Merge branch 'release/rc-v1.2.0' into feature/refactoring-mediaviewer 2023-02-06 20:59:27 +05:00
Akmal Isomadinov
d3dcbad09c Merge branch 'release/rc-v1.2.0' into feature/refactoring-mediaviewer 2023-02-06 20:54:43 +05:00
68adfe1138 Web: Added enable/disable notifications to the context menu. 2023-02-06 16:55:19 +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
Akmal Isomadinov
c9012ab76f Web:Common:Components: Added MediaViewer 2023-02-03 20:05:26 +05: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
Vashchuk Nikita
ab7f24a68b Merge branch 'release/rc-v1.2.0' into feature/notifications 2023-02-02 18:48:48 +05: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
c2a35e2400 Web: Common: Loaders: Refactoring. 2023-01-30 18:09:33 +03:00
ab57a90fb9 Web: Notifications: Added loaders. 2023-01-30 17:36:52 +03: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
45f62ac03c Web: Files: removed useless code 2023-01-30 13:49:11 +03:00
ec44f0ed7e Merge branch 'release/rc-v1.2.0' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-01-30 13:35:00 +03:00
223558d1bb Fix Bug 60878 - Registration: No redirect when following wrong portal alias (500 Error) 2023-01-27 20:13:31 +03:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
864e3c9c33 Web: Notifications: Added api methods. 2023-01-27 16:22:21 +03:00
425fc7531e Merge branch 'release/rc-v1.2.0' into feature/selection-area
# Conflicts:
#	yarn.lock
2023-01-27 13:45:27 +03:00
7db5e5f353 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 12:11:11 +03:00
761a8357dd Fix Bug 60788 - Rooms.Search. The background scrolls behind the List accounts panel on the touchpad in Chrome on MacOS. 2023-01-26 20:23:50 +03:00
Akmal Isomadinov
c507ac87f3 Web:Article Refactoring 2023-01-26 18:46:47 +05:00
Akmal Isomadinov
a758d400cb Web: Fixed settings article 2023-01-26 18:03:03 +05:00
d9d8f09f54 Web: Common: Renamed folder. 2023-01-26 14:26:31 +03:00
552c046514 Web: PreparationPortal: Fixed styles. 2023-01-26 14:16:50 +03:00
7e201d4a4e Merge branch 'bugfix/restoring-portal' of github.com:ONLYOFFICE/AppServer into bugfix/restoring-portal 2023-01-26 13:01:32 +03:00
98e6b220f5 Web: PreparationPortal: Refactoring. 2023-01-26 10:02:22 +03:00
63ecf9b5ec Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-25 13:28:50 +03:00
Viktor Fomin
9d58b079cb Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-25 13:03:30 +03:00
c79a874d03 Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-25 11:49:50 +03:00
Timofey Boyko
1fb415c770 Web:Commmon:MediaViewer: fix after merge static-versioned 2023-01-25 11:33:31 +03:00
8598c09dfb Web: Common: Fixed redirect to wizard. 2023-01-25 09:40:09 +03:00
75ef9b68f3 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-24 18:36:09 +03:00
Timofey Boyko
0300c5990d Web: delete useless ?url for png images 2023-01-24 18:29:33 +03:00
Timofey Boyko
9e5f76d7c0 Web: fix double slash for favicon 2023-01-24 17:37:18 +03:00
7b55fe5a68 Web: Added portal recovery pages to the login page. 2023-01-24 16:19:06 +03:00
508ef81440 Web: Common: Limiting requests when restoring the portal. 2023-01-24 16:16:46 +03:00
06bdcd6cd2 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-24 12:19:20 +03:00
bd5ed45566 Fix Bug 60624 - Accounts. Alert Work in progress для Invite again, Time zone, Reset authentication 2023-01-24 12:18:56 +03:00
Timofey Boyko
98d652ed9a Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-24 10:05:04 +03:00
50ba019fce Fix Bug 60703 - Rooms.Files.NewFiles. ‘Something went wrong’ when clicking on an unsupported media file in the New files panel. 2023-01-23 18:56:18 +03:00
Timofey Boyko
34a6b8eefa Web:Common:Utils: fix path for favicon logo 2023-01-23 13:22:23 +03:00
Viktor Fomin
b19367d0b8 Common: SettingsStore: return timezones 2023-01-20 23:49:39 +03:00
Akmal Isomadinov
dec7ea109e Web:Common:Store:AuthStore Fixed error props type isAuthenticated on mobile 2023-01-20 14:26:47 +05:00
Akmal Isomadinov
dd03fa21d8 Web:Common:Component:Article Fixed the disappearance of the menu content when pressing the "Back" button on the mobile device 2023-01-20 14:24:48 +05:00
Timofey Boyko
cfbf8a9860 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-20 10:14:49 +03:00
cfda2c1313 Added translation of empty list alert of third-party services for Room Admin 2023-01-19 20:42:32 +03:00
Timofey Boyko
f20a1db341 Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned 2023-01-19 16:15:19 +03:00
e1205c5d94 Merge branch 'bugfix/error-handler-editor' of github.com:ONLYOFFICE/AppServer into bugfix/error-handler-editor 2023-01-19 14:31:55 +03:00
050f7fffe6 Web: Components: ErrorContainer: Added new element. 2023-01-19 14:29:16 +03:00
Timofey Boyko
f11e72e8ed Web: fix svg src after merge 2023-01-18 19:09:00 +03:00
Timofey Boyko
f4cb8acf1d Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned 2023-01-18 18:06:22 +03:00
01ffd2adf8
Merge pull request #1035 from ONLYOFFICE/feature/new-viewer
Feature/new viewer
2023-01-18 17:33:28 +03:00
Mushka Nikita
12609c5b77 Fixed bug 60574 2023-01-18 16:14:16 +03:00
DmitrySychugov
0d186ea345 Web: fixed icon position, fixed pause in video player 2023-01-17 14:19:17 +05:00
DmitrySychugov
22fd3dc6c6 Web: Common: fixed 100% width/height for icons 2023-01-17 13:12:49 +05:00
3b33344817 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2023-01-17 10:46:47 +03:00
Timofey Boyko
e1be96d9b7 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-17 10:08:12 +03:00
e3b74c6df4 Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-16 21:35:39 +03:00
cbf2dc1bcb Merge branch 'release/rc-v1.2.0' into feature/ctrl-select 2023-01-16 20:49:20 +03:00
4d682185eb Web:Common:Fix jumping to "My rooms" folder after clicking "Clear search" in an empty container. 2023-01-16 19:49:07 +03:00
7939bd693b Web: Files: added selection with Shift 2023-01-16 18:16:08 +03:00
2548ac5aed Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2023-01-16 12:53:42 +03:00
DmitrySychugov
50982d1218 Web: Common: fixed hotkey play/pause video 2023-01-16 14:31:23 +05:00
Timofey Boyko
0cb238e5d3 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-16 10:36:22 +03:00
Akmal Isomadinov
07e6c9be28 Merge branch 'feature/new-viewer' of github.com:ONLYOFFICE/DocSpace into feature/new-viewer
# Conflicts:
#	packages/components/viewer/sub-components/viewer-image.js
2023-01-16 12:23:05 +05:00
Akmal Isomadinov
af8cfa37e3 Web: Added sub component mobile viewer, added package @use-gesture/react and refactoring 2023-01-16 12:17:14 +05:00
Viktor Fomin
49c5104806 Common: add useThemeDetector 2023-01-13 21:59:47 +03:00
Viktor Fomin
59d7ed3242 Client: fix get logo theme 2023-01-13 18:46:19 +03:00
014262ac75 Web: Removed useless api @trash call on first load 2023-01-13 17:24:13 +03:00
DmitrySychugov
b8f1c9f1e2 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2023-01-13 18:16:38 +05:00
DmitrySychugov
66e73c11ac Web: Common: fixed swipe media when rename 2023-01-12 21:29:54 +05:00
Timofey Boyko
5730a5e8ac Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-12 18:10:15 +03:00
46b99d1f25 Removed old resources (Team titles - custom names) 2023-01-12 16:20:35 +03:00
9176e62093 Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-12 16:07:25 +03:00
Viktor Fomin
80496a67bb Common: Loaders: SettingsLoader: fix type warning 2023-01-12 14:08:42 +03:00
bd0efe1a7e Removed old resources (GroupSelector, AddGroupPanel) 2023-01-11 20:04:35 +03:00
Timofey Boyko
edaa43b90c Web: fix after merge 2023-01-11 18:52:57 +03:00
Timofey Boyko
b46d21c258 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-11 18:47:06 +03:00
Timofey Boyko
98e5ce3240 Web: move imgs from components to public 2023-01-11 18:38:08 +03:00
Timofey Boyko
6b8afcaa33 Web: add import svg with url 2023-01-11 18:08:01 +03:00
DmitrySychugov
91447f27ba Web: Common: disable context menu element when is preview media 2023-01-11 16:39:29 +05:00
Timofey Boyko
dbb4d7aca0 Web: move all images from client to public 2023-01-11 12:56:54 +03:00
DmitrySychugov
9789238ed6 Web: fixed double click, clear import 2023-01-11 14:49:50 +05:00
Timofey Boyko
c9ed3a42ef Web: delete useless images 2023-01-11 12:32:15 +03:00
Timofey Boyko
c968dc21d9 Web: move logo from client to public 2023-01-11 11:35:11 +03:00
43f633a91c Web:Common:Add EmptyContainerLoader. 2023-01-10 22:25:22 +03:00
f51730fb7f Web:Common:Changing loader styles to new ones. 2023-01-10 22:24:47 +03:00
DmitrySychugov
8bfe0ba852 Web: fixed preview file store, fixed drop in context menu 2023-01-10 20:56:42 +05:00
Timofey Boyko
e34ef435f2 Web: delete different md5 equal name images 2023-01-10 18:43:12 +03:00
Timofey Boyko
25818e9ad0 Web: delete equal md5 equal name duplicates images 2023-01-10 17:29:12 +03:00
Timofey Boyko
fddd5a615d Web:Common:Firebase: update campaigns images import 2023-01-10 12:05:30 +03:00
DmitrySychugov
9a7ab9ac55 Merge branch 'feature/new-viewer' of github.com:ONLYOFFICE/DocSpace into feature/new-viewer 2023-01-09 20:24:50 +05:00
DmitrySychugov
024831e075 Web: Components: added props 2023-01-09 20:24:36 +05:00
DmitrySychugov
ad59c7f11c Web: added mobile context menu 2023-01-09 20:22:04 +05:00
b3a5a5fdf6 Merge branch 'develop' into feature/selection-area
# Conflicts:
#	packages/client/src/pages/Home/index.js
#	packages/client/src/store/FilesStore.js
#	packages/common/components/Section/index.js
#	packages/components/selector/StyledSelector.js
#	packages/components/selector/index.js
#	yarn.lock
2023-01-09 13:51:00 +03:00
Timofey Boyko
96d3458e2d Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-09 11:03:08 +03:00
d7c799c75e Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-09 10:06:58 +03:00
04bd1b6868 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2022-12-30 16:33:33 +03:00
f28bbebbde Web: Common: Removed mobx warnings. 2022-12-30 11:54:39 +03:00
DmitrySychugov
9e402183a7 Web: fixed image display when inactive 2022-12-29 20:56:17 +05:00
DmitrySychugov
13c4653e91 Web: Common: added space hotkey for viewer 2022-12-29 15:50:59 +05:00
ec84d70835 Web: Added count=1 to @root filter (fix speed issue) 2022-12-29 13:49:38 +03:00
Timofey Boyko
e7d58afda0 Web:Common:Utils: add support url images for background pattern 2022-12-29 12:26:31 +03:00
8c300ade62 Web: Article: Changed translation. 2022-12-29 10:37:02 +03:00
DmitrySychugov
3eb8a650ec Web: Common: fixed context menu 2022-12-28 21:10:57 +05:00
Timofey Boyko
52351c382a Web: update use thirdparties logo 2022-12-28 18:23:22 +03:00
a90bb4d5fc Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2022-12-28 17:17:20 +03:00
Timofey Boyko
4c4c79a015 Web:Common:Utils: add image helpers for icons 2022-12-28 16:59:09 +03:00
89ac6c33fe Web: CurrentQuotaStore: Deleted mobx warnings. 2022-12-28 13:36:01 +03:00
113dfebaf8 Web: Added a check for the ability to move/copy to a folder. 2022-12-28 10:52:16 +03:00
Timofey Boyko
774065c165 Web: fix default logo import 2022-12-27 17:04:56 +03:00
DmitrySychugov
10fe9b2f81 Web: Common: delete share media 2022-12-27 17:48:40 +05:00
DmitrySychugov
a37f5914d7 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2022-12-27 16:47:10 +05:00
8cf3f74aff Fix Bug 60353 - Accounts: Sign Up. Portal registration fails. (@self.json 401) 2022-12-27 13:45:47 +03:00
DmitrySychugov
89a6fb6283 Merge branch 'develop' into feature/new-viewer 2022-12-27 15:08:15 +05:00
d3f06ca8b2 Web: Client: GlobalEvents: Added change user type event 2022-12-26 21:15:22 +03:00