Commit Graph

4729 Commits

Author SHA1 Message Date
c4e934f83f Web: Files: Fix DeleteDialog texts and styles 2021-04-22 16:03:35 +03:00
Artem Tarasov
6381a0c524 Web: Files: refactoring FilesRowContent, withContentActions 2021-04-22 16:00:19 +03:00
Alexey Kostenko
8519fe4d60 Web: Components: SocialButton style fix 2021-04-22 14:54:06 +03:00
553ac70278 Bump version v0.1.7 2021-04-22 14:13:12 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
Ilya Oleshko
c02656d200 Web: Files: Dialog: Fixed setting token data for oAuth providers for ThriParty page 2021-04-22 12:50:16 +03:00
Artem Tarasov
0131520988 Web: Files: refactoring Tile, fix drag, moved EditingWraperComponent to sub-components 2021-04-22 11:42:19 +03:00
Artem Tarasov
813e17cac2 Web: Files: created withFileaActions HOC, refactoring SimpleFilesRow 2021-04-22 03:12:50 +03:00
3782ea4bc3 Applied last changes in Mail/Calendar ComingSoon pages 2021-04-21 22:03:49 +03:00
1516fe0249 Merge branch 'develop' into feature/products 2021-04-21 21:49:39 +03:00
6a4fed2d2c Init Calendar Server back-end 2021-04-21 21:47:27 +03:00
090154ae59 Server: Mail: Fix applying launchSettings.json 2021-04-21 21:46:33 +03:00
63a8caeb97 Init Mail Server back-end 2021-04-21 19:00:38 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
6f2a726210 Web: Files: Close the window after getting the code 2021-04-21 16:02:52 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
Alexey Kostenko
1aae2e60cf Web: Client/Login: Removed 2nd window for actions through oAuth 2021-04-21 14:48:17 +03:00
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
36c65c1c43 Bump version v0.1.6 2021-04-19 18:41:27 +03:00
Ilya Oleshko
175cee8b86 Web: Empty: Fixed displaying translation keys on loading 2021-04-19 15:41:27 +03:00
Ilya Oleshko
fbf69d2bdf Web: Files: Home: Fixed displaying content if translation loading 2021-04-19 15:40:28 +03:00
461110e1a7 Web: Fix show loaders timeout for quickly responses 2021-04-19 13:36:40 +03:00
3037c23e55 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-19 10:26:33 +03:00
ce48583873 Web: Files: fixed row content mobile click 2021-04-19 10:26:24 +03:00
Alexey Kostenko
c45cfe87a1 Merge branch 'feature/oauth2.0' of github.com:ONLYOFFICE/AppServer into feature/oauth2.0 2021-04-19 09:50:05 +03:00
Alexey Kostenko
03ec607cbf Merge branch 'develop' into feature/oauth2.0 2021-04-19 08:25:42 +03:00
2a6a556a38
Merge pull request #226 from ONLYOFFICE/feature/dotnet-core-debugging-with-WSL-2
Feature/dotnet core debugging with wsl 2
2021-04-17 11:36:14 +03:00
Ilya Oleshko
64fae284ee Web: Projects: Fixed style for mobile and tablet devices, fixed description, disabled learn more button 2021-04-16 22:12:41 +03:00
Ilya Oleshko
c083473d5a Web: CRM: Fixed style for mobile and tablet devices, fixed description, disabled learn more button 2021-04-16 22:12:25 +03:00
4917131ccc People: fixed signup 2021-04-16 21:50:50 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
995579ac8b People: change number method 2021-04-16 18:32:31 +03:00
ca876c4349 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:37:30 +03:00
ee76d58ee8 Web: People|Files: Added timeout for 500 ms on setup "isLoading" flag (for quickly responses) 2021-04-16 16:37:22 +03:00
Alexey Kostenko
82e66bf861 Server: People: Fixed signup API 2021-04-16 16:33:17 +03:00
Vladislav Makhov
a05d5218ab web: files: hid filter block, if no items in current dir 2021-04-16 16:31:26 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
Vladislav Makhov
d9179337e8 Merge branch 'bugfix/v0.1.6' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:22:39 +03:00
Vladislav Makhov
4a82ab2355 web: files: fix translation view in filter block, after second visit module 2021-04-16 16:22:23 +03:00
a289256846 Web: Files: added ConflictResolveDialog, refactoring files operations 2021-04-16 16:04:50 +03:00
Alexey Kostenko
96ec652313 Merge branch 'develop' into feature/oauth2.0 2021-04-16 14:25:37 +03:00
53f32a2658 Web: Files: fixed cancelCurrentUpload import 2021-04-16 12:03:06 +03:00
7e2a991eec Files: fixed fileops/move 2021-04-15 21:43:12 +03:00
b302650ea1 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-15 14:37:53 +03:00
7c66d3e531 Web: Files: fixed third party dialogs 2021-04-15 14:37:29 +03:00
741c3a17ab People: Added thirdparty/signup method 2021-04-15 14:34:22 +03:00
770d6f2938 Web: Files: Fix Download As zipping with single file 2021-04-15 13:14:16 +03:00
8f8460bcf4 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-15 13:12:15 +03:00
8583fffdc4 Web: Files: Fix zip title displaying inside DownloadDialog on selected single file 2021-04-15 12:25:27 +03:00
d76239e8b4 Files: MoveOrCopyBatchCheck now is post method 2021-04-15 11:48:23 +03:00
e4ff7bcb01 Web: Files: Fix DeleteDialog selection 2021-04-15 10:27:03 +03:00
c93285e4fb Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-14 15:56:58 +03:00
d525a331fa Web: Fix show error on moving folder to itself 2021-04-14 15:56:45 +03:00
2e70a4bff9 Web: Files: fixed display of the counter for displaying files 2021-04-14 15:56:22 +03:00
a74e285af5 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-14 15:45:10 +03:00
fe3f8ab9b1 Web: Fix OperationPanel TreeFolders setup 2021-04-14 15:45:04 +03:00
Ilya Oleshko
ad2ec9203c Web: Files: FilesStore: Fixed move-to action for users at GroupActionsMenu 2021-04-14 15:20:25 +03:00
674f72f3cd Web: Files: fixed opening files for new files panel 2021-04-14 14:45:10 +03:00
7412d97d99 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-14 14:32:14 +03:00
ffcd5978d1 Web: Files: added delete dialog for context menu 2021-04-14 14:31:11 +03:00
Ilya Oleshko
c6506e5545 Web: Files: FilesStore: Fixed displaying Copy action for ContextMenu 2021-04-14 14:15:24 +03:00
Ilya Oleshko
4ea8375fd2 Web: Files: FilesStore: Restored download-as for edited files 2021-04-14 12:55:10 +03:00
78dcb14d1e Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-14 12:23:48 +03:00
8f143e141f Web: Files: fixed default filename after changing file type 2021-04-14 12:23:39 +03:00
Ilya Oleshko
3c7c77c775 Web: Files: FilesStore: Fixed separator display for context-menu, hide unused property 2021-04-14 12:22:41 +03:00
4a94cca3c8 Web: Files: fixed opening treeFolders nodes for action panels 2021-04-14 11:38:26 +03:00
80aeb705ce Web: Files: fixed selection of files with the same id 2021-04-14 09:48:02 +03:00
4b5c73b3e7 Web: fixed input user-select 2021-04-13 17:05:23 +03:00
262bb10857 Merge branch 'develop' into feature/products 2021-04-13 15:48:45 +03:00
cfd58847f9 Merge branch 'develop' into feature/react-selectable 2021-04-13 14:11:20 +03:00
176a46de65 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-04-13 13:15:50 +03:00
9b3d0b8d39 Files: fixed root query 2021-04-13 12:46:25 +03:00
5936640ce2 Web: fixed selection 2021-04-13 12:43:17 +03:00
8cfd5eb644 Web: Added SelectedFrame 2021-04-13 09:35:07 +03:00
6fbb566c4e Web: Init Mail/Calendar Comming Soon pages 2021-04-12 13:41:16 +03:00
Ilya Oleshko
57a878df50 Merge branch 'develop' into bugfix/v0.1.2 2021-04-12 12:56:23 +03:00
2c0dd28ad4
Merge branch 'develop' into bugfix/files-panel 2021-04-12 12:09:33 +03:00
Ilya Oleshko
12255e771f Merge branch 'develop' into bugfix/v0.1.2 2021-04-12 11:42:34 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
6f3c3d6c2a Web: People: Fixed facebook social button style 2021-04-12 10:36:37 +03:00
TatianaLopaeva
ed1dcfa4a4 Merge branch 'bugfix/v0.1.2' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.2 2021-04-09 17:49:51 +03:00
TatianaLopaeva
7073d0cd61 Web: Files: Fixed upload files. 2021-04-09 17:39:11 +03:00
Ilya Oleshko
c681036143 Web: Files: FilesStore: Fixed files context options access for context-menu 2021-04-09 15:53:52 +03:00
Ilya Oleshko
e2e65b4683 Merge branch 'bugfix/v0.1.2' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.2 2021-04-09 14:15:30 +03:00
b4506b73e4 Web: Files: fixed NewFiles panel 2021-04-09 14:11:33 +03:00
Vladislav Makhov
73ca8656bf web: files: fix loader view via mobile 2021-04-09 12:35:11 +03:00
95352a2116 Bump version v0.1.3 2021-04-09 11:02:13 +03:00
Alexey Kostenko
b017562eaf Web: Changed facebook icon 2021-04-09 10:30:54 +03:00
34cc54cb1e Files: fixed quieries 2021-04-08 20:05:27 +03:00
b66008b33e Bump version v0.1.2 2021-04-08 20:00:15 +03:00
Alexey Kostenko
a01a41cce7 Web: Files: merge fix 2021-04-08 15:29:18 +03:00
TatianaLopaeva
3aca73b31f Web: Files: Fixed margin between buttons. 2021-04-08 14:58:58 +03:00
TatianaLopaeva
12db80a964 Web: Files: Added loader for NewFilesPanel. 2021-04-08 13:37:16 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
bcf350c1d9 Bump version to v0.1.1 2021-04-08 10:23:33 +03:00
5c0f414587 Files: fix tests 2021-04-07 18:08:15 +03:00
43c6618998 Web: Projects: Revert webLink 2021-04-07 15:59:32 +03:00
775a670be1 Web: CRM: Revert webLink 2021-04-07 15:59:20 +03:00
559d7a9940 Web: Fixed export and import registerSW 2021-04-07 15:41:42 +03:00
4484d609a6 Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update 2021-04-07 15:27:51 +03:00
Artem Tarasov
3ee7541e54 Web: Components/People: fixed translation in PasswordInput 2021-04-07 14:41:46 +03:00
13c9e5b0b6 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-07 13:07:17 +03:00
41310842ac Web: Files: fixed @my 2021-04-07 13:07:08 +03:00
Vladislav Makhov
177a707fcb Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-07 12:34:51 +03:00
Vladislav Makhov
33c3905c65 web: people: fix goBackAndReset, when creating user 2021-04-07 12:34:37 +03:00
36eb430652 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-07 12:21:43 +03:00
3c0e64005b Web: Files: fixed selectedTreeNode 2021-04-07 12:21:32 +03:00
Ilya Oleshko
dfc769651a Web: Files: FilesStore: Added download action for folders at context-menu 2021-04-07 11:58:33 +03:00
Ilya Oleshko
cb4e1677b8 Web: Files: FilesStore: Fixed empty separator, added missing options after merge 2021-04-07 11:45:01 +03:00
TatianaLopaeva
f7553b2343 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-07 11:34:11 +03:00
TatianaLopaeva
375ce74464 Web:People: Fixed scroll to top when switching a group. 2021-04-07 11:34:05 +03:00
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
Ilya Oleshko
a1a4eadd07 Web: Files: Row: Added locales for new and version badges 2021-04-06 18:48:42 +03:00
740099ff52 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 17:25:25 +03:00
90fea0fb50 Web: Files: fixed onDragOver event 2021-04-06 17:25:15 +03:00
Ilya Oleshko
fb47962f12 Web: Files: Row: Disabled version action inside trash folder 2021-04-06 16:46:48 +03:00
19526b1d96 Web: Files: fixed canShareOwnerChange 2021-04-06 16:31:39 +03:00
54763ead47 Web: Files: fixed drag events 2021-04-06 16:06:16 +03:00
7bbf46fd90 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 15:47:14 +03:00
424efc1e72 Web: Files: fixed treeFolders drag 2021-04-06 15:47:04 +03:00
Artem Tarasov
fad3757a82 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 15:30:17 +03:00
Artem Tarasov
b673e76d67 Web: Files: fixed update of the version in row after making changes in VersionHistoryPanel 2021-04-06 15:29:42 +03:00
Vladislav Makhov
fbf2c27910 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 14:18:26 +03:00
Vladislav Makhov
065115fffd web: people: fix avatar changes 2021-04-06 14:18:15 +03:00
TatianaLopaeva
3a35fb09fd Web: People: Profile: Fixed the problem of displaying a different avatar when editing profile. 2021-04-06 14:11:02 +03:00
Vladislav Makhov
2c7c5532eb web: people: fix tracking of avatar changes 2021-04-06 14:03:14 +03:00
Vladislav Makhov
5a6d3509fd web: files: fix working with files without extension 2021-04-06 11:35:11 +03:00
8a9ad2d473 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:14:25 +03:00
12b5c6b769 Web: Projects: Fixed switch to desktop version 2021-04-05 18:14:20 +03:00
7861c432aa Web: CRM: Fixed switch to desktop version 2021-04-05 18:14:04 +03:00
Ilya Oleshko
b228e20cdb Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:10:35 +03:00
Ilya Oleshko
f6d8238602 Web: Files: Fixed empty elements inside context menu, added missing actions for deleted items 2021-04-05 18:10:26 +03:00
Artem Tarasov
817f810590 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:07:30 +03:00
Artem Tarasov
056c288fae Web: People: fixed reset filter after switching from profile 2021-04-05 18:06:48 +03:00
88ab4c53d9 Projects: Changed HelpURL 2021-04-05 17:47:00 +03:00
92ff8b3b2d CRM: Changed HelpURL 2021-04-05 17:46:48 +03:00
Ilya Oleshko
7f0e24dc2b Web: Files: Header: Fixed plus icon path 2021-04-05 17:10:04 +03:00
Viktor Fomin
27eb32d296 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:54:48 +03:00
Viktor Fomin
4e7e795046 Web: Files: fixed scroll in upload panel 2021-04-05 16:54:28 +03:00
Ilya Oleshko
f94e093896 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:45:49 +03:00
Ilya Oleshko
018f3fad33 Web: Files: Added data-api for new ContextMenu 2021-04-05 16:44:55 +03:00
cea14a9d4f Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:42:09 +03:00
ce7647ac5f Web: Files: fixed Trans, hidden duplicate 2021-04-05 16:42:01 +03:00
Artem Tarasov
9d7f6265e7 Web: People: fixed manager name for a group without a manager 2021-04-05 16:35:38 +03:00
Artem Tarasov
e304af064b Web: People: fixed group list query 2021-04-05 16:18:41 +03:00
Vladislav Makhov
bf6cb4b134 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:09:34 +03:00
Vladislav Makhov
cf85e950ff web: people: fix onGroupClick 2021-04-05 16:09:21 +03:00
2655f0c62d Web: fixed Trans 2021-04-05 15:35:50 +03:00
Viktor Fomin
acd3e3db12 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:22:00 +03:00
Viktor Fomin
6f4a6a972a Web: Files: fixed import 2021-04-05 15:21:52 +03:00
Vladislav Makhov
dbd6c08772 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:08:25 +03:00
Vladislav Makhov
b400a93407 web: files: remove api query, if cancelled or same title 2021-04-05 15:07:58 +03:00
Viktor Fomin
ded5ce44f2 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 14:54:10 +03:00
Viktor Fomin
10f9d2ad2c Web: Files: fixed getting userId 2021-04-05 14:53:37 +03:00
TatianaLopaeva
f095e9c71b Web: Files: FloatingButton remains visible on error until the UploadPanel is opened. 2021-04-05 14:43:03 +03:00
Alexey Kostenko
866a1bfa68 Web: People: Removed unused method 2021-04-05 13:36:04 +03:00
TatianaLopaeva
ed97700dcb Web:Files: UploadPanel: Fixed styles of row content. 2021-04-05 10:26:46 +03:00
Alexey Kostenko
e333e7e82d Web: People: Clear interval if getter token window is closed (connecting providers) 2021-04-04 16:53:27 +03:00
a11804b60d temp fix. BinaryFormatter deprecated in .net 5 2021-04-02 21:48:40 +03:00
b89e232e59 Web: Files: fixed drag 2021-04-02 19:29:06 +03:00
Vladislav Makhov
b45e243fe6 web: files: fix stores init 2021-04-02 18:12:50 +03:00
Vladislav Makhov
3180831e19 web: files: fix stores init 2021-04-02 17:03:52 +03:00
Vladislav Makhov
0f6b08b2f3 web: files: transfer InitFilesStore to FilesStore 2021-04-02 16:33:18 +03:00
Vladislav Makhov
601c9441cb web: files: remove unnecessary code 2021-04-02 15:45:49 +03:00
Vladislav Makhov
179fec232e Merge branch 'develop' into bugfix/files-store
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-04-02 15:34:34 +03:00
Vladislav Makhov
3e3c442f7c web: files: destructured variables 2021-04-02 15:02:03 +03:00
Vladislav Makhov
ff04684f53 web: remove unused code 2021-04-02 13:49:42 +03:00
Vladislav Makhov
d63132d9e7 web: files: remove console log 2021-04-02 13:06:12 +03:00
Vladislav Makhov
c99fc660c9 web: files: remove unused code and imports 2021-04-02 13:03:28 +03:00
Vladislav Makhov
1bc8ad8600 web: files: fix FilesStore accesses 2021-04-02 12:41:13 +03:00
Vladislav Makhov
f532c06c55 web: files: fix UploadDataStore accesses 2021-04-02 12:40:59 +03:00
Vladislav Makhov
2bafdbc0d2 web: files: fix TreeFoldersStore accesses 2021-04-02 11:20:19 +03:00
Vladislav Makhov
df3f8ca9e5 web: files: fix MediaViewerDataStore accesses 2021-04-02 11:16:01 +03:00
Vladislav Makhov
0eeee5842a web: files: fix FormatsStore accesses 2021-04-02 11:13:33 +03:00
Alexey Kostenko
c4aaa3618f Web: People: Show login settings only on your account 2021-04-02 11:10:26 +03:00
Vladislav Makhov
f70bcc52ca web: files: fix FilesActionStore accesses 2021-04-01 17:34:22 +03:00
TatianaLopaeva
f79f75f6db Merge branch 'develop' into feature/EditorIntegration 2021-04-01 16:42:33 +03:00
a71bbc9886 Files: fix finding template when saving file, hat doesn't have template 2021-04-01 16:32:10 +03:00
TatianaLopaeva
0ea46425c6 Web:Files: Fix SharedPanel when uploadPanel is visible. 2021-04-01 15:32:21 +03:00
TatianaLopaeva
26fe94ae5f Web: Files: Added translation for EmbeddingPanel. 2021-04-01 13:50:57 +03:00
Vladislav Makhov
61fcaf8315 web: files: fix SettingsStore accesses 2021-04-01 13:28:59 +03:00
TatianaLopaeva
968e0009ee Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path. 2021-04-01 13:03:28 +03:00
Vladislav Makhov
3915d28737 web: files: fix InitFilesStore accesses 2021-04-01 12:27:19 +03:00
Vladislav Makhov
07c457882a web: files: fix FilesStore accesses 2021-04-01 11:58:22 +03:00
TatianaLopaeva
833bd357a0 Web: Files: Deleted useless condition for Editor. 2021-04-01 11:55:20 +03:00
TatianaLopaeva
fc1d8001b6 Web: Files: Deleted useless props. 2021-04-01 11:52:24 +03:00
TatianaLopaeva
386529c6fd Merge branch 'develop' into feature/EditorIntegration
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-04-01 10:17:14 +03:00
18b4fba15a Merge branch 'develop' into feature/dotnet5 2021-03-31 20:38:05 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room 2021-03-31 18:01:58 +03:00
Vladislav Makhov
b0b8849ae5 web: files: fix isDesktop refer 2021-03-31 17:59:03 +03:00
TatianaLopaeva
33b165fd40 Web: Files/Editor: Added SharingDialog. 2021-03-31 16:49:14 +03:00
Alexey Kostenko
e4d11c8246 Web: People: Updating to the state of the connection to providers. Added notifications 2021-03-31 16:38:52 +03:00
Vladislav Makhov
2c253bd471 web: files: rename isItemsSelected to selectionCount 2021-03-31 13:56:56 +03:00
Vladislav Makhov
56f49526ad web: files: fix link 2021-03-31 13:54:29 +03:00
c0e780a287 Web: Files: fixed showDragItems 2021-03-31 11:03:56 +03:00
Vladislav Makhov
1728da802d web: fix isAccessedSelected 2021-03-31 10:49:46 +03:00
TatianaLopaeva
b52997a7f8 Merge branch 'develop' into feature/EditorIntegration 2021-03-30 18:39:09 +03:00
Vladislav Makhov
75386c10ea web: files: add missing whitespaces in description 2021-03-30 16:05:04 +03:00
Vladislav Makhov
627e84aeaa web: files: fix isAccessedSelected 2021-03-30 15:53:47 +03:00
TatianaLopaeva
dea731dfa7 Web: Files/Editor: Deleted useless code. 2021-03-30 15:44:45 +03:00
TatianaLopaeva
3960ca1490 Web: Files: SharingPanel: Added loader when list of users does not load yet. 2021-03-30 15:24:44 +03:00
Alexey Kostenko
e66d9e52d9 Web: People: Removed unnecessary method getSerializedProfile 2021-03-30 15:08:01 +03:00
Alexey Kostenko
14f95a61fa Web: Files: removed method getOAuthToken from thirdPartyStore 2021-03-30 14:59:35 +03:00
6c46dd759f Web: Files: fixed context options props 2021-03-30 12:14:25 +03:00
Alexey Kostenko
0f5e5cce3f Web: Components/People/Login: Fixed warning ("React does not recognize prop") 2021-03-30 11:37:21 +03:00
Vladislav Makhov
b4ea70ddaa web: files: regDesktop fix 2021-03-30 11:34:48 +03:00
06f34408ff Merge branch 'develop' into feature/drag-and-drop 2021-03-30 11:10:15 +03:00
9427d98318 Web: Files: refactoring 2021-03-30 11:08:38 +03:00
TatianaLopaeva
f6e242f341 Web: Files: Added name space for translation. 2021-03-30 10:34:09 +03:00
TatianaLopaeva
dc0baec941 Web: Editor/Files: Fix displaying of shared user list at Shared Panel & Refactoring. 2021-03-30 10:21:30 +03:00
TatianaLopaeva
005d6759e9 Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located. 2021-03-29 19:31:11 +03:00
3a756986a0 Files: added enableExternalExt when creating file 2021-03-29 17:53:12 +03:00
91aa5996b5 Web: Files: refactoring 2021-03-29 17:45:26 +03:00
Vladislav Makhov
701e5fc2d1 web: files: fix isOnlyFoldersSelected 2021-03-29 16:25:16 +03:00
Vladislav Makhov
ddba3d91bf web: files: fix isEncryptionSupport value 2021-03-29 16:13:21 +03:00
Vladislav Makhov
70b6e8fe51 web: files: fix share button for private room 2021-03-29 16:05:00 +03:00
Vladislav Makhov
760c3268df web: files: add missing prop 2021-03-29 16:03:34 +03:00
a8d475cb91 Merge branch 'develop' into feature/drag-and-drop 2021-03-29 15:26:22 +03:00
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
f381eb2780 Web: Files: fixed move operations for third party folders 2021-03-29 14:56:39 +03:00
d10f47d984 Web: Files: fixed scroll 2021-03-29 12:06:01 +03:00
fa372f118b Web: Files: fixed scroll 2021-03-29 11:41:42 +03:00
TatianaLopaeva
704f241674 Web: Files: SharingPanel: Fixed icon pathname. 2021-03-28 23:00:21 +03:00
TatianaLopaeva
c4bcb8772c Web: Files/Editor: Added additional conditions for access to the sharing panel and updated conditions for the custom filter. 2021-03-28 22:59:36 +03:00
TatianaLopaeva
5ccb86abeb Web: Editor/Files: Refactoring & Moved icon to the common folder for icons. 2021-03-28 21:38:48 +03:00
TatianaLopaeva
88392ffd56 Web: Editor/Files: Refactoring. 2021-03-28 19:21:08 +03:00
TatianaLopaeva
9309818e77 Web: Files: Fixed internal link for document from the Editor. 2021-03-28 19:04:49 +03:00
TatianaLopaeva
89dbfd1f54 Web: Editor/Files: Fixed share email from the Editor. 2021-03-28 18:47:04 +03:00
06e8a79b06 Web: Files: fixed drag to tree 2021-03-26 19:11:41 +03:00
Alexey Kostenko
7ff66e894a Web: Login: Render only available providers for login 2021-03-26 17:19:26 +03:00
TatianaLopaeva
7777d05515 Web: Editor/Files: Added full list of access rights for SharingPanel to Editor. 2021-03-26 17:18:43 +03:00
e72558182b Web: Files: removed debugger 2021-03-26 17:12:40 +03:00
32338fdcbc Merge branch 'develop' into feature/drag-and-drop 2021-03-26 16:11:16 +03:00
13f097e039 People: fix Activation 2021-03-26 15:59:56 +03:00
6b16402d82 Web: Files: fixed tree drag-and-drop, refactoring 2021-03-26 15:26:44 +03:00
TatianaLopaeva
2dba92ba28 Web: Editor/Files: Added refresh list of people and their access rights after changed at SharingPanel. 2021-03-26 15:19:55 +03:00
TatianaLopaeva
4892b39e0e Web: Editor: Added SharingPanel. 2021-03-26 15:14:17 +03:00
TatianaLopaeva
1b9c327e10 Web: Files: SharingPanel: Fix icon path. 2021-03-26 14:51:25 +03:00
TatianaLopaeva
0e1225cc5a Web: Files: helpers: Fix icon path. 2021-03-26 14:50:45 +03:00
TatianaLopaeva
c853accdf7 Web: Files: Fix icon path. 2021-03-26 14:50:12 +03:00
TatianaLopaeva
e2ebecac4d Web: Files: Fix icon path. 2021-03-26 14:49:28 +03:00
TatianaLopaeva
e837ef77b5 Web: Files: Moved translation from common file to local folder. 2021-03-26 14:48:37 +03:00
TatianaLopaeva
f27c38e2d9 Web: Moved icons from files to common folder. 2021-03-26 14:45:29 +03:00
7c6bf909a6 Files: fixed query 2021-03-26 12:50:04 +03:00
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
18a2c0a53d Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
Alexey Kostenko
6fadc94b71 Web: Components/People: Fixed social-button styles 2021-03-25 18:06:48 +03:00
Alexey Kostenko
482530b2f8 Web: People: Added translations 2021-03-25 17:09:32 +03:00
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00