Vladislav Makhov
|
b748693676
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Components/src/components/row/index.js
|
2020-12-15 11:00:54 +03:00 |
|
|
|
4027ca9599
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-15 10:56:50 +03:00 |
|
|
|
cbc8888057
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-12-15 10:55:15 +03:00 |
|
Artem Tarasov
|
a0f5261576
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-14 20:59:14 +03:00 |
|
Ilya Oleshko
|
8fd87415fd
|
Web: Files : Home: Fixed downloading action
|
2020-12-14 18:21:45 +03:00 |
|
|
|
6ce69ef768
|
Web: Files: added change of file owner
|
2020-12-14 15:12:56 +03:00 |
|
|
|
ca9e7bd58a
|
Web: Files: Fixed resize window
|
2020-12-14 15:11:34 +03:00 |
|
|
|
d428ec37c2
|
Web: Files: fixed setShareFiles action, added getCanShareOwnerChange selector
|
2020-12-14 15:08:41 +03:00 |
|
|
|
15420cb96b
|
Web: Files: fixed ShareAccessRights constants
|
2020-12-14 15:06:24 +03:00 |
|
|
|
b06a6fb88c
|
Web: Files: added OwnerChange translation
|
2020-12-14 15:05:09 +03:00 |
|
|
|
f232625ca4
|
Web: Files: Extended error toast
|
2020-12-14 14:57:18 +03:00 |
|
|
|
b1ad327e1c
|
Web: Files: Fixed blocking popup on file creation by Enter in FF
|
2020-12-14 14:09:33 +03:00 |
|
Vladislav Makhov
|
10a8e7a039
|
Disable multiple sharing in private room
|
2020-12-14 13:05:51 +03:00 |
|
Vladislav Makhov
|
afb382d9d7
|
Add translation, when creating encrypted file
|
2020-12-14 11:06:36 +03:00 |
|
|
|
584c4e4b1a
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-14 10:57:14 +03:00 |
|
|
|
697ef7ed69
|
Web: Files: Refactoring of DocEditor page
|
2020-12-14 10:56:39 +03:00 |
|
|
|
c1c922f176
|
Web: Files: Removed useless api methods calls on DocEditor page
|
2020-12-14 10:54:27 +03:00 |
|
|
|
cc4fa01479
|
Web: Files: Removed displaying NavMenu loader on editor page
|
2020-12-14 10:51:58 +03:00 |
|
Vladislav Makhov
|
487ff234d9
|
Not to call callback for sharing encrypted file, when nothing changed
|
2020-12-14 10:26:39 +03:00 |
|
Vladislav Makhov
|
4e52155bbb
|
Add translation, when sharing encrypted file
|
2020-12-14 09:58:05 +03:00 |
|
Vladislav Makhov
|
03e29cdec7
|
Remove unused code
|
2020-12-14 09:15:38 +03:00 |
|
Vladislav Makhov
|
7bd7928319
|
Fix items notification
|
2020-12-14 09:15:15 +03:00 |
|
|
|
ca26adf8e2
|
Web: Files: fixed onEditComplete
|
2020-12-11 17:21:38 +03:00 |
|
|
|
e8eb014a6f
|
Files: fix download
|
2020-12-11 16:42:36 +03:00 |
|
Vladislav Makhov
|
81581d2199
|
Remove unused code
|
2020-12-11 16:34:55 +03:00 |
|
Ilya Oleshko
|
460b1ec0d9
|
Web: People : Home : Fixed fetch users after profile navigation
|
2020-12-11 16:03:48 +03:00 |
|
|
|
7a193e3ea0
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-11 15:55:56 +03:00 |
|
|
|
6e0dd74e3e
|
Merge branch 'release/v0.0.2' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into release/v0.0.2
|
2020-12-11 15:41:34 +03:00 |
|
|
|
0d7636d321
|
Web: Files: fixed dowload as
|
2020-12-11 15:41:16 +03:00 |
|
TatianaLopaeva
|
aa6eebb51b
|
Web: Files/People: Home: Fixed the displaying load of section header
|
2020-12-11 14:21:37 +03:00 |
|
|
|
fa7d8e2010
|
Merge branch 'develop' into release/v0.0.2
|
2020-12-11 13:02:11 +03:00 |
|
Vladislav Makhov
|
25d43785d6
|
Replace number of root folder type id with constant
|
2020-12-11 12:09:16 +03:00 |
|
Vladislav Makhov
|
217a937b1e
|
Hide new items notification in private room, then not in desktop
|
2020-12-11 12:06:22 +03:00 |
|
Ilya Oleshko
|
43346003fc
|
Web: Files : Actions: Fixed wrong method on finish operation
|
2020-12-11 11:54:10 +03:00 |
|
|
|
0a775abb82
|
Files: optimization
|
2020-12-11 11:46:41 +03:00 |
|
|
|
f70e6e907f
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-11 11:34:23 +03:00 |
|
Ilya Oleshko
|
902cf95094
|
Web: Files : Home: Fixed action duplication on row
|
2020-12-11 10:17:25 +03:00 |
|
|
|
169c25d9bb
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-12-11 10:04:19 +03:00 |
|
Artem Tarasov
|
72a21a1def
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-10 20:46:24 +03:00 |
|
Artem Tarasov
|
e6dfb13d7d
|
Web: Common/Components/Files: applied isAside prop for backdrop, fixed related bugs
|
2020-12-10 20:09:16 +03:00 |
|
|
|
8c4be9ab6d
|
Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation
|
2020-12-10 19:15:44 +03:00 |
|
|
|
2548dba9b7
|
Web: Files: Fixed opening file on external link
|
2020-12-10 19:15:36 +03:00 |
|
|
|
356ace1c57
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:14:58 +03:00 |
|
|
|
bd8d8c6a14
|
Merge branch 'bugfix/upload-with-convertation' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into bugfix/upload-with-convertation
|
2020-12-10 19:01:01 +03:00 |
|
|
|
72dd4c6bad
|
Web: Files: fixed article width
|
2020-12-10 19:00:44 +03:00 |
|
|
|
0b0d7187e0
|
Update yarn.lock files
|
2020-12-10 18:45:49 +03:00 |
|
|
|
4c9db8c0cb
|
Web: Files: COMMENTED conversation functional
|
2020-12-10 18:24:19 +03:00 |
|
Vladislav Makhov
|
4110da78fa
|
Prevent adding file to recently viewed in private room
|
2020-12-10 17:25:29 +03:00 |
|
Ilya Oleshko
|
5906b2f914
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-12-10 16:25:44 +03:00 |
|
Viktor Fomin
|
d7d14b1bd2
|
Web: Common: show alert if convert error
|
2020-12-10 16:14:28 +03:00 |
|
|
|
dff5391b68
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-10 15:07:14 +03:00 |
|
|
|
1a1417e20a
|
Web: Files: fixed share link access rights
|
2020-12-10 14:46:57 +03:00 |
|
Alexey Kostenko
|
abda53a082
|
Web: Files/People/Common: Fixed header styles
|
2020-12-10 13:31:53 +03:00 |
|
|
|
a562631c3e
|
Web: Files: removed useless code from sharing panel
|
2020-12-10 12:26:09 +03:00 |
|
|
|
82b6bc57bc
|
Web: Files: moved advancedOptions to AccessComboBox
|
2020-12-10 12:14:34 +03:00 |
|
|
|
4eb4da95e6
|
Web: Files: removed useless sharing function, fixed sharingRow render
|
2020-12-10 11:17:01 +03:00 |
|
Vladislav Makhov
|
7658ec0603
|
Fix folder share button render
|
2020-12-10 11:04:52 +03:00 |
|
Alexey Kostenko
|
1a53841499
|
Web: Files/People/Common: Fixed header style
|
2020-12-10 09:48:35 +03:00 |
|
Diana
|
88a48348e0
|
Added Tests for Trash/Favorites/Recent folders
|
2020-12-10 00:07:08 +03:00 |
|
Diana
|
ca6454dc58
|
fix MyDocuments and Shared Documents
|
2020-12-10 00:06:16 +03:00 |
|
Viktor Fomin
|
60f11e4a18
|
Web: Files: fixed fileId
|
2020-12-09 19:38:00 +03:00 |
|
|
|
09ce302b57
|
Web: Files: Init new conversation process
|
2020-12-09 18:37:24 +03:00 |
|
Vladislav Makhov
|
cbf36ee893
|
Fix visibility of tree node expanded options, when private room is disabled
|
2020-12-09 17:14:27 +03:00 |
|
|
|
2e0762b2c3
|
Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-12-09 16:19:03 +03:00 |
|
|
|
8fbec9ea42
|
Web: Files: removed useless code, added new translations for sharing panel
|
2020-12-09 16:01:37 +03:00 |
|
|
|
4903bb4c91
|
Web: Files: Fixed uploading additional files when the upload has already started
|
2020-12-09 15:57:56 +03:00 |
|
|
|
962e9c8643
|
Web: Files: refactoring SharingPanel
|
2020-12-09 15:39:52 +03:00 |
|
|
|
c3b935e6b3
|
Web: Files: added AccessComboBox component
|
2020-12-09 15:39:01 +03:00 |
|
|
|
2da7ae5656
|
Web: Files: added new share translations
|
2020-12-09 15:38:08 +03:00 |
|
|
|
86325f87ba
|
Web: Common: fixed sharing api
|
2020-12-09 15:37:34 +03:00 |
|
|
|
bd18aa1415
|
Web: Files: Re-written uploading process to async controlled chain calls
|
2020-12-09 13:54:04 +03:00 |
|
Artem Tarasov
|
6511557445
|
Web: Components/People: applied prop showDisabledItems
|
2020-12-09 13:09:41 +03:00 |
|
Vladislav Makhov
|
7f2577b3fa
|
Fix encrypted icon style while editing
|
2020-12-09 11:26:24 +03:00 |
|
Artem Tarasov
|
fb10d00272
|
Web: Files/Components/Common/People: z-index fix
|
2020-12-09 10:59:04 +03:00 |
|
Viktor Fomin
|
c4cad309b3
|
Web: Files: fixed
|
2020-12-09 10:57:00 +03:00 |
|
Artem Tarasov
|
854acc0b1a
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-12-08 23:03:42 +03:00 |
|
|
|
8ac1a767bc
|
Files: fix tests
|
2020-12-08 19:36:19 +03:00 |
|
|
|
4d88b2fc28
|
Update yarn.lock files
|
2020-12-08 18:37:19 +03:00 |
|
|
|
e4a43ff558
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 18:26:11 +03:00 |
|
Alexey Kostenko
|
0e2db11c9d
|
Web: Files: SharingPanel: Added new access option - "FilterEditing"
|
2020-12-08 18:26:27 +03:00 |
|
|
|
ce4a3e3338
|
Update yarn.lock files
|
2020-12-08 18:17:46 +03:00 |
|
|
|
c8f7555017
|
Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/yarn.lock
|
2020-12-08 18:06:31 +03:00 |
|
Alexey Kostenko
|
bc5b17367c
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 17:45:40 +03:00 |
|
Alexey Kostenko
|
66e82c9206
|
Web: Files: Updated selector
|
2020-12-08 17:35:22 +03:00 |
|
Alexey Kostenko
|
92dfd37737
|
Web: Files: SharingPanel: Fixed possible access types of file
|
2020-12-08 17:31:01 +03:00 |
|
Viktor Fomin
|
ad2075c62e
|
Web: Files: fixed folder jump
|
2020-12-08 16:25:21 +03:00 |
|
Vladislav Makhov
|
31ec802664
|
Delete dialog: delete encrypted file bypassing recycle bin
|
2020-12-08 16:14:29 +03:00 |
|
|
|
7d3dde38c4
|
Update yarn.lock files
|
2020-12-08 15:26:54 +03:00 |
|
|
|
42bfa9a3a6
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 15:12:42 +03:00 |
|
Vladislav Makhov
|
42c6242d6c
|
Add encrypted file icon
|
2020-12-08 15:01:52 +03:00 |
|
Diana
|
8e7e14bdca
|
fix shared documents
|
2020-12-08 14:55:31 +03:00 |
|
|
|
5e05907678
|
Web: Files: fixed getHeaderIndeterminate, getAccessedSelected selectors
|
2020-12-08 14:30:48 +03:00 |
|
Artem Tarasov
|
34d246deaf
|
Web: Components/Files/People: z-index fix
|
2020-12-08 14:16:23 +03:00 |
|
Ilya Oleshko
|
d2719e1cd9
|
Web: Fixed usage lodash/isEqual on fast-deep-equal
|
2020-12-08 14:09:46 +03:00 |
|
Ilya Oleshko
|
bd13067d0b
|
Web: Added fast-deep-equal
|
2020-12-08 14:08:26 +03:00 |
|
Artem Tarasov
|
5446a6a24d
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-12-08 14:03:01 +03:00 |
|
Vladislav Makhov
|
fb465b3e05
|
Add security icon
|
2020-12-08 13:54:30 +03:00 |
|
|
|
a23909df51
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 13:53:31 +03:00 |
|
|
|
d50349765f
|
Web: Files: fixed the visibility of the frame in the sharing panel
|
2020-12-08 13:40:24 +03:00 |
|
Artem Tarasov
|
52f0c1f96b
|
Web: Components/Files: fix bugs, refactoring
|
2020-12-08 13:33:58 +03:00 |
|
Artem Tarasov
|
071f6c27c3
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-08 13:15:02 +03:00 |
|
|
|
47fb514642
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
|
2020-12-08 13:12:22 +03:00 |
|
|
|
f0d2e61f68
|
Web: Files: Refactoring
|
2020-12-08 13:11:19 +03:00 |
|
Vladislav Makhov
|
c5cdb58682
|
Modified privacy folder context menu
|
2020-12-08 13:01:10 +03:00 |
|
Vladislav Makhov
|
24961eb732
|
Hide folder share button in private room
|
2020-12-08 12:54:19 +03:00 |
|
Vladislav Makhov
|
be238b41c2
|
Disable share button in private room, when only folders selected
|
2020-12-08 12:53:44 +03:00 |
|
Vladislav Makhov
|
5fd757073f
|
Fix result toast text of shared encrypted file
|
2020-12-08 12:27:57 +03:00 |
|
Vladislav Makhov
|
3aff383486
|
Add saving encrypted file toast
|
2020-12-08 12:25:25 +03:00 |
|
Alexey Kostenko
|
6a9b8ca662
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-08 12:23:36 +03:00 |
|
Vladislav Makhov
|
b0aab4ddb9
|
Add sharing of encrypted file
|
2020-12-08 11:51:39 +03:00 |
|
Alexey Kostenko
|
60cc94c06d
|
Web: Files: SharingPanel: Refactoring
|
2020-12-08 11:08:38 +03:00 |
|
Viktor Fomin
|
e1947368bf
|
Web: Files: fixed filter closing
|
2020-12-07 21:42:22 +03:00 |
|
Viktor Fomin
|
39e5119080
|
Web: Files: fixed filter closing
|
2020-12-07 21:16:53 +03:00 |
|
Viktor Fomin
|
d9e95dabab
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 21:03:07 +03:00 |
|
Viktor Fomin
|
c2e133553a
|
Web: Files: fixed filter closing
|
2020-12-07 21:02:27 +03:00 |
|
Viktor Fomin
|
70086c5cb7
|
Merge branch 'feature/floating-button' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 20:21:06 +03:00 |
|
|
|
c48b5783f1
|
People: search ignore case
|
2020-12-07 19:56:59 +03:00 |
|
Viktor Fomin
|
342a02d9b4
|
Web: Files: fixed filter closing
|
2020-12-07 18:52:22 +03:00 |
|
Alexey Kostenko
|
ac5b23f23a
|
Web: Files: Fixed determining the file format
|
2020-12-07 18:07:45 +03:00 |
|
Alexey Kostenko
|
10183ff90b
|
Web: Files: Style fix, small refactoring
|
2020-12-07 16:58:02 +03:00 |
|
Vladislav Makhov
|
2c1c8dedb0
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
|
2020-12-07 16:03:47 +03:00 |
|
Alexey Kostenko
|
eb4f5c2085
|
Web: Files: Removed link highlighting on click
|
2020-12-07 15:36:50 +03:00 |
|
Viktor Fomin
|
982ce4e12c
|
Merge branch 'develop' into feature/floating-button
|
2020-12-07 14:50:49 +03:00 |
|
Viktor Fomin
|
2be2085655
|
Update yarn.lock files
|
2020-12-07 14:48:09 +03:00 |
|
Viktor Fomin
|
04a009543d
|
Web: Common: fixed folder id
|
2020-12-07 14:43:00 +03:00 |
|
Alexey Kostenko
|
bc8efccf1b
|
Web: Files: SharingPanel: Style fix
|
2020-12-07 14:34:41 +03:00 |
|
Vladislav Makhov
|
c94ff1ab41
|
Add sharing encrypted file options
|
2020-12-07 14:14:04 +03:00 |
|
Alexey Kostenko
|
98e1d94ea7
|
Web: Files: Fixed header style
|
2020-12-07 13:52:57 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
|
|
a2f1bada5e
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 13:26:55 +03:00 |
|
Viktor Fomin
|
f8dcb6c59e
|
Web: Files: fixed uploading files, added refresh files
|
2020-12-07 13:20:07 +03:00 |
|
Viktor Fomin
|
b693cbdd4f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 13:19:32 +03:00 |
|
Ilya Oleshko
|
4147d2f31a
|
Web: Fixed temp loaders
|
2020-12-07 11:11:04 +03:00 |
|
|
|
9b559a6df0
|
Files: fix get share info
|
2020-12-07 11:02:37 +03:00 |
|
Alexey Kostenko
|
4264345556
|
Web: Files: Fixed styles in EmbeddingPanel
|
2020-12-07 10:40:59 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +03:00 |
|
Alexey Kostenko
|
b822342387
|
Web: Files: SharingPanel: Fixed clickable area in combo button in peopleSelector/groupSelector
|
2020-12-07 09:33:16 +03:00 |
|
Alexey Kostenko
|
744898d94d
|
Web: Files: Style fix
|
2020-12-04 16:54:13 +03:00 |
|
|
|
c764812d3a
|
Common: refactoring
|
2020-12-04 16:48:54 +03:00 |
|
Alexey Kostenko
|
e6483213d5
|
Web: Files: Removed dropdown in internal link icon, style fix
|
2020-12-04 15:56:39 +03:00 |
|
Artem Tarasov
|
93da24a63a
|
Web: Common/Files/People: fixed z-index
|
2020-12-04 14:58:37 +03:00 |
|
|
|
0784453daf
|
Fix errors on login and logout
|
2020-12-04 14:21:51 +03:00 |
|
Alexey Kostenko
|
ab71a6dd33
|
Web: Files/Common: Refactoring, changing access type to external share link
|
2020-12-04 14:09:31 +03:00 |
|
Vladislav Makhov
|
a3bd0823c6
|
Refactoring
|
2020-12-04 12:59:48 +03:00 |
|
Vladislav Makhov
|
d7fd6aecdb
|
Remove unused code
|
2020-12-04 12:57:32 +03:00 |
|
Ilya Oleshko
|
d03584fcdd
|
Web: Fixed isAuthenticated logic
|
2020-12-04 11:38:15 +03:00 |
|
|
|
5291c2b11c
|
Merge branch 'develop' into bugfix/new-files-panel-fix
|
2020-12-04 10:58:05 +03:00 |
|
Alexey Kostenko
|
32651dd4d5
|
Web: Files: Fixed the method for determining access options
|
2020-12-04 09:48:37 +03:00 |
|
Vladislav Makhov
|
af6a1a8c73
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-04 08:16:42 +03:00 |
|
|
|
9ddb7c4d0e
|
Files: fix upload
|
2020-12-03 21:42:39 +03:00 |
|
Viktor Fomin
|
fcb7ecc071
|
Web: Files: fixed uploading files
|
2020-12-03 19:22:46 +03:00 |
|
|
|
73ffc6104d
|
Merge branch 'develop' into bugfix/new-files-panel-fix
|
2020-12-03 18:26:02 +03:00 |
|
|
|
ef92cf1cae
|
File: fix FileStreamModel
|
2020-12-03 18:15:35 +03:00 |
|
Alexey Kostenko
|
14031d121e
|
Web: Files/Common: Style fix
|
2020-12-03 18:14:11 +03:00 |
|
|
|
b5807c695d
|
Web: Files: refactoring panels styles
|
2020-12-03 18:05:58 +03:00 |
|
|
|
a39192ff21
|
Web: Common: added new containers styles, added classNames to people and files containers
|
2020-12-03 18:03:05 +03:00 |
|
|
|
d39b0743fd
|
Files: fix GetSecurityInfo
|
2020-12-03 17:50:17 +03:00 |
|
|
|
34f8d17b84
|
Files: set files securityinfo
|
2020-12-03 17:43:33 +03:00 |
|
Vladislav Makhov
|
eb6fe0d417
|
Operation panel fix for Private room
|
2020-12-03 16:21:00 +03:00 |
|
Vladislav Makhov
|
b8b454a438
|
Modified header menu for Private Room
|
2020-12-03 15:54:29 +03:00 |
|
Alexey Kostenko
|
5fe44c3976
|
Web: Files/Common: Change access type to external link, refactoring, applied prettier style fix
|
2020-12-03 15:18:38 +03:00 |
|
Vladislav Makhov
|
f240c8da00
|
Modified context menu for Private Room
|
2020-12-03 14:23:08 +03:00 |
|
Viktor Fomin
|
2482f12e3e
|
Web: Files: fixed uploading files
|
2020-12-03 14:17:40 +03:00 |
|
Vladislav Makhov
|
f188489c06
|
Refactoring
|
2020-12-03 12:12:14 +03:00 |
|
Vladislav Makhov
|
3064eb302b
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# web/ASC.Web.Common/src/pages/login/index.js
|
2020-12-03 09:59:20 +03:00 |
|
Vladislav Makhov
|
e911caf665
|
Creating encrypted file in desktop
|
2020-12-02 16:45:09 +03:00 |
|
Vladislav Makhov
|
95c13950cb
|
Refactoring
|
2020-12-02 16:42:10 +03:00 |
|
Vladislav Makhov
|
293d545175
|
rename getEncryptionSupport to getIsEncryptionSupport
|
2020-12-02 16:41:52 +03:00 |
|
|
|
155b23f799
|
Files: GetSecurityInfo
|
2020-12-02 16:17:43 +03:00 |
|
Alexey Kostenko
|
6be36a65cd
|
Web: Files: SharingPanel: Changing access type external link by toggle button
|
2020-12-02 15:31:43 +03:00 |
|
Alexey Kostenko
|
541cedeb4f
|
Web: Files: Revert local changes
|
2020-12-02 11:21:17 +03:00 |
|
Alexey Kostenko
|
23b209b85c
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-02 09:14:36 +03:00 |
|
Alexey Kostenko
|
2f61c821bf
|
Web: Files: Opening editor without authorization
|
2020-12-02 08:56:42 +03:00 |
|
|
|
303abad2a4
|
Files: change owner
|
2020-12-01 22:59:42 +03:00 |
|
Diana
|
07567a21ba
|
fix My Documents
|
2020-12-01 18:33:31 +03:00 |
|
Diana
|
9cc0d9b3d8
|
fix SharedDocuments
|
2020-12-01 18:30:20 +03:00 |
|
Diana
|
599b07dbbd
|
fix My Documents
|
2020-12-01 18:30:02 +03:00 |
|
Ilya Oleshko
|
eb2ae72026
|
Web: Files : Components: Hide logs
|
2020-12-01 17:19:07 +03:00 |
|
Diana
|
e879799d75
|
fix My Documents
|
2020-12-01 17:09:50 +03:00 |
|
Viktor Fomin
|
86425fac97
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-01 16:31:17 +03:00 |
|
Viktor Fomin
|
0d1f1a4599
|
Update yarn.lock files
|
2020-12-01 16:26:13 +03:00 |
|
Viktor Fomin
|
133b1bfc39
|
Web: Files: fixed files uploading
|
2020-12-01 16:25:49 +03:00 |
|
Viktor Fomin
|
1c8b7115a5
|
Web: Common: fixed files uploading
|
2020-12-01 14:06:57 +03:00 |
|
|
|
228c304211
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-01 12:29:36 +03:00 |
|
|
|
f1f1ae818e
|
Files: fix long operation
|
2020-12-01 12:29:08 +03:00 |
|
|
|
8de24eae99
|
Files: openedit. AllowAnonymous
|
2020-12-01 10:20:15 +03:00 |
|
Diana
|
c0287b6873
|
added shared tests for files
|
2020-12-01 04:11:05 +03:00 |
|
Diana
|
7e620ff6a3
|
fix
|
2020-12-01 02:47:19 +03:00 |
|
|
|
6f76404eaa
|
Files: optimization
|
2020-11-30 23:02:10 +03:00 |
|
Viktor Fomin
|
8c8475bd51
|
Web: Common: fixed percent calculation
|
2020-11-30 19:12:16 +03:00 |
|
Alexey Kostenko
|
7a95d4b942
|
Web: Files: Server: Added api setacelink
|
2020-11-30 18:34:45 +03:00 |
|
|
|
645749fbc7
|
Files: rename ParentFolderID to FolderId.
Optimization
|
2020-11-30 16:47:26 +03:00 |
|
Viktor Fomin
|
2c8b384ef1
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-30 15:17:48 +03:00 |
|
Vladislav Makhov
|
813c9c4b1d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-11-30 15:16:49 +03:00 |
|
Viktor Fomin
|
e49ac0fec7
|
Web: Files: added progress load
|
2020-11-30 15:15:59 +03:00 |
|
|
|
f10f6b8d3b
|
Update yarn.lock files
|
2020-11-30 15:11:23 +03:00 |
|
|
|
4ad116937a
|
Merge branch 'develop' into bugfix/fix-empty-screen-description
|
2020-11-30 13:27:35 +03:00 |
|
|
|
c029a2df04
|
Web: People: fixed text alignment
|
2020-11-30 12:15:45 +03:00 |
|
Alexey Kostenko
|
e27400e573
|
Web: Files: SharingPanel: Added a template for setting up an external link
|
2020-11-30 09:33:35 +03:00 |
|
|
|
8c965fa4e1
|
Web: People: changed empty screen description, fixed icons alignment
|
2020-11-28 13:44:31 +03:00 |
|
|
|
a0adc29899
|
Web: People: fixed alignment and color of icons
|
2020-11-28 13:15:30 +03:00 |
|
|
|
83e4db1e7f
|
Web: People: removed useless buttons styles
|
2020-11-28 13:05:10 +03:00 |
|
|
|
2b7480a200
|
Web: People: fixed headers fontWeight
|
2020-11-28 13:03:53 +03:00 |
|
Viktor Fomin
|
69b823ce46
|
Web: Files: fixed calculation new percent
|
2020-11-27 17:51:01 +03:00 |
|
|
|
12542c137c
|
Remove todo
|
2020-11-27 17:06:26 +03:00 |
|
|
|
b4e071081c
|
todo
|
2020-11-27 16:42:27 +03:00 |
|
|
|
b18e47492a
|
Web: Files: fixed selection and deselection of service files
|
2020-11-27 15:38:15 +03:00 |
|
|
|
daf30eebae
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-27 11:34:05 +03:00 |
|
|
|
40546da35d
|
fix create file
|
2020-11-26 20:30:57 +03:00 |
|
|
|
95ba0185db
|
Web: Files: fixed files row metadata
|
2020-11-26 17:07:43 +03:00 |
|
Alexey Kostenko
|
50ec9c371a
|
Web: Files: SharingPanel: Added Disabling LinkRow
|
2020-11-26 16:25:47 +03:00 |
|
Vladislav Makhov
|
fba407c5cb
|
Add props for privacy
|
2020-11-26 15:44:43 +03:00 |
|
Vladislav Makhov
|
c22f9b7f3f
|
Add setEncryptionAccess
|
2020-11-26 15:42:12 +03:00 |
|
|
|
56fc822099
|
Web: Files: removed files row metadata
|
2020-11-26 15:11:44 +03:00 |
|
Ilya Oleshko
|
9b1ac99bdf
|
Web: Files : Article: Added service icons to TreeFolders component
|
2020-11-26 15:02:56 +03:00 |
|
Alexey Kostenko
|
541a1bb8aa
|
Web: Files: SharingPanel: Fixed internal/external links style
|
2020-11-26 14:53:48 +03:00 |
|
|
|
b3f3bb4af3
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-11-26 14:36:24 +03:00 |
|
Ilya Oleshko
|
87eb11fbd6
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-26 12:55:00 +03:00 |
|
|
|
afc280904b
|
Web: People: fixed passwordSettings minLength
|
2020-11-26 12:27:09 +03:00 |
|
|
|
462bd090d1
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-26 08:22:40 +03:00 |
|
Diana
|
0692307df1
|
fix
|
2020-11-25 22:57:57 +03:00 |
|
|
|
ed22ffb326
|
Files: bugfix and optimization
|
2020-11-25 18:40:23 +03:00 |
|
Alexey Kostenko
|
3a9dc6b1c8
|
Web: Files: SharingPanel: Refactoring, Added toggle button and dropDown to LinkRow
|
2020-11-25 17:03:48 +03:00 |
|
Alexey Kostenko
|
8a0c8957fd
|
Web: Files: SharingPanel: Refactoring (function "linksFunction" is moved to a separate component)
|
2020-11-25 15:40:17 +03:00 |
|
Viktor Fomin
|
ebc7886762
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-25 14:57:56 +03:00 |
|
Viktor Fomin
|
3d8caa1f4d
|
Update yarn.lock files
|
2020-11-25 14:57:17 +03:00 |
|
Viktor Fomin
|
1a1e9bef8e
|
Web: Files: fixed alert
|
2020-11-25 14:37:07 +03:00 |
|
Viktor Fomin
|
d1bc59aad4
|
Web: Files: added alert
|
2020-11-25 13:50:05 +03:00 |
|
Alexey Kostenko
|
4d92a4499e
|
Web: Files: SharingPanel: Fixed indents
|
2020-11-25 09:24:54 +03:00 |
|
|
|
ab8f2c1dc1
|
Web: Files: added delete edit action after routing
|
2020-11-24 18:01:26 +03:00 |
|
Alexey Kostenko
|
437032a541
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-11-24 17:54:23 +03:00 |
|
Alexey Kostenko
|
9534f48a7d
|
Web: Files/Components: Fixed combo-button (Enable click on icon)
|
2020-11-24 17:52:23 +03:00 |
|
|
|
9c8f2c61c5
|
Web: Files: fixed getHeaderIndeterminate selector
|
2020-11-24 17:41:29 +03:00 |
|
|
|
4a1023808c
|
People: filter groups
|
2020-11-24 16:13:49 +03:00 |
|
|
|
dcccb1180f
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-24 15:12:27 +03:00 |
|
|
|
e73ce06145
|
Web: Files: fixed the display of service folders
|
2020-11-24 15:12:19 +03:00 |
|
Ilya Oleshko
|
6980d720c7
|
Web: Files : Fixed ThirdParty getOAuthToken action, added reconnect
|
2020-11-24 15:04:16 +03:00 |
|
|
|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
Ilya Oleshko
|
76387d71bb
|
Web: Files : Article : Fixed ThirdParty oAuth connect
|
2020-11-24 12:55:49 +03:00 |
|
Artem Tarasov
|
bea20b5098
|
Web: Files: VersionHistory: fixed comment display
|
2020-11-24 12:27:42 +03:00 |
|
|
|
83d9d90ac6
|
Web: Files: fixed the display of service folders
|
2020-11-24 11:46:46 +03:00 |
|
Vladislav Makhov
|
06342cf27b
|
Fix upload dialog
|
2020-11-24 10:11:47 +03:00 |
|
Vladislav Makhov
|
c3cba3a0af
|
Remove unused code
|
2020-11-24 10:11:25 +03:00 |
|
Alexey Kostenko
|
f2701388c2
|
Web: Files: SharingPanel: Fixed header styles
|
2020-11-24 06:58:20 +03:00 |
|
|
|
5fa38aa8ef
|
Web: Files: added routing to thirdParty folder
|
2020-11-23 18:16:56 +03:00 |
|
Vladislav Makhov
|
baaaef7b80
|
Refactoring
|
2020-11-23 17:28:24 +03:00 |
|
Vladislav Makhov
|
84ea70264f
|
Fix filter data
|
2020-11-23 17:27:55 +03:00 |
|
|
|
9e6c036800
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-23 15:27:20 +03:00 |
|
|
|
42b2c7ba02
|
Web: Files: added ThirdPartyMoveDialog, fixed move operations to ThirdParty folders
|
2020-11-23 15:27:06 +03:00 |
|
Viktor Fomin
|
c6a6b324e6
|
Update yarn.lock files
|
2020-11-23 14:20:52 +03:00 |
|
Viktor Fomin
|
26217ab4df
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-23 14:16:09 +03:00 |
|
Viktor Fomin
|
e3701e9aa2
|
Web: Files: put timeout in constant
|
2020-11-23 14:14:32 +03:00 |
|
Artem Tarasov
|
a6b4a8452f
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-11-23 13:58:54 +03:00 |
|
Viktor Fomin
|
f92f1e6573
|
Web: Files: remove operation type
|
2020-11-23 12:59:13 +03:00 |
|
Ilya Oleshko
|
912b53cece
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-20 16:45:07 +03:00 |
|
|
|
af77fa0f24
|
Merge branch 'develop' into bugfix/filter-fix
|
2020-11-20 16:19:52 +03:00 |
|
|
|
6463048b70
|
Web: Files: fixed thirdParty folders remove
|
2020-11-20 16:08:49 +03:00 |
|
|
|
71b6f71fd7
|
Files: fix dispose
|
2020-11-20 15:49:57 +03:00 |
|
Viktor Fomin
|
7deaecc525
|
Update yarn.lock files
|
2020-11-20 15:36:14 +03:00 |
|
Viktor Fomin
|
8ffc4b4d4a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-20 15:35:59 +03:00 |
|
Alexey Kostenko
|
32b49a02c6
|
Web: Files: SharingPanel: fixed footer in add users/groups menu
|
2020-11-20 15:02:11 +03:00 |
|
Alexey Kostenko
|
d120621f65
|
Web: Files: SharingPanel: Fixed button styles
|
2020-11-20 14:38:16 +03:00 |
|
|
|
418f86a11a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-20 13:51:34 +03:00 |
|
|
|
be081c45b6
|
Files: fixed share folder
|
2020-11-20 13:45:42 +03:00 |
|
Ilya Oleshko
|
92bcdb9f8b
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-20 13:09:13 +03:00 |
|
Artem Tarasov
|
56d2286f63
|
Merge branch 'develop' into bugfix/filter-fix
|
2020-11-20 13:09:04 +03:00 |
|
Artem Tarasov
|
f2d15f07f8
|
Web: People: Filter: changed translation of elements in the sorting list
|
2020-11-20 12:43:35 +03:00 |
|
|
|
b5a66444d7
|
Thirdparty: fix save
|
2020-11-20 12:24:17 +03:00 |
|
Viktor Fomin
|
2a175aedf4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-20 11:53:18 +03:00 |
|
Vladislav Makhov
|
1f01a3b308
|
Add encryptionUploadDialog
|
2020-11-20 11:48:35 +03:00 |
|
Ilya Oleshko
|
4ba5edbc31
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-20 10:28:47 +03:00 |
|
|
|
0337bd58da
|
Files: fixed DI
|
2020-11-20 10:22:15 +03:00 |
|
Viktor Fomin
|
ed21b37651
|
Web: Files: fixed cleaning secondary operations
|
2020-11-20 00:03:13 +03:00 |
|
|
|
2a222a94fc
|
Thirdparty: fix save
|
2020-11-19 22:17:45 +03:00 |
|
|
|
5aef0e809e
|
Files: fix get share
|
2020-11-19 21:48:16 +03:00 |
|
|
|
1ddb6804ed
|
Files: fix share thirdparty
|
2020-11-19 21:47:40 +03:00 |
|
Vladislav Makhov
|
52515b2a3c
|
Refactoring
|
2020-11-19 18:30:29 +03:00 |
|
|
|
715557e73c
|
Web: Files: rename auth_key to token
|
2020-11-19 17:55:01 +03:00 |
|
Viktor Fomin
|
11c4864e9c
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-19 16:20:27 +03:00 |
|
Viktor Fomin
|
66945edc80
|
Update yarn.lock files
|
2020-11-19 16:19:05 +03:00 |
|
Viktor Fomin
|
9cd88443f2
|
Web: Files: fixed loaders, added second
|
2020-11-19 16:11:14 +03:00 |
|
Artem Tarasov
|
c0346ddcf6
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-19 16:08:11 +03:00 |
|
|
|
2192561540
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-19 14:46:06 +03:00 |
|
|
|
b037be86b7
|
Web: Files: added change thirdparty settings to context menu, moved connect dialog
|
2020-11-19 14:46:00 +03:00 |
|
Ilya Oleshko
|
a76b6fa439
|
Web: Files : Settings : Added OAuth login for services
|
2020-11-19 14:05:07 +03:00 |
|
Artem Tarasov
|
be094640fe
|
Web: Files: Filter: fixed names of sorting items
|
2020-11-19 13:22:09 +03:00 |
|
|
|
cdf21f36da
|
Web: Files: added moveTo, copyTo operation to thirdParty folders
|
2020-11-19 12:23:54 +03:00 |
|
|
|
2aaa7f6c3b
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-19 11:41:22 +03:00 |
|
|
|
2ceb845808
|
Thirdparty: fix copy
|
2020-11-19 11:30:00 +03:00 |
|
Diana
|
80db224001
|
fix my documents
|
2020-11-19 05:56:10 +03:00 |
|
Diana
|
f32b41dff0
|
fix my documents
|
2020-11-19 05:53:50 +03:00 |
|
Vladislav Makhov
|
47554e4f1a
|
Refactoring
|
2020-11-18 20:22:52 +03:00 |
|
Viktor Fomin
|
a2e6e9cf25
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-18 18:00:28 +03:00 |
|
Viktor Fomin
|
c8f07b73bb
|
Web: Files: icon display by operation type
|
2020-11-18 17:59:39 +03:00 |
|
Viktor Fomin
|
e6007dc302
|
Web: Files: fixed label on icon, returned label
|
2020-11-18 17:29:41 +03:00 |
|
|
|
aa636918e3
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-18 16:01:18 +03:00 |
|
|
|
3f1ab45740
|
Web: Files: fixed delete thirdParty, removed recent api to thirdParty files
|
2020-11-18 15:43:48 +03:00 |
|
|
|
93410996f0
|
Merge branch 'develop' into refactoring/files-thirdparty
|
2020-11-18 15:19:36 +03:00 |
|
|
|
2909d9d240
|
Thirdparty: refactoring security, tag
|
2020-11-18 13:37:11 +03:00 |
|
|
|
3c19fda2de
|
Thirdparty: refactoring security
|
2020-11-18 11:28:43 +03:00 |
|
|
|
bce3383d54
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-18 11:01:16 +03:00 |
|
|
|
20d37596cf
|
Files: fix share
|
2020-11-17 22:36:27 +03:00 |
|
|
|
0c520416fa
|
Files: remove cache
|
2020-11-17 21:17:23 +03:00 |
|
|
|
f1f9cce600
|
Merge branch 'develop' into feature/floating-button
|
2020-11-17 19:07:08 +03:00 |
|
|
|
6cb92946be
|
fix uploadmemberphoto
|
2020-11-17 18:01:34 +03:00 |
|
|
|
f11a11d470
|
Thirdparty: refactoring
|
2020-11-17 17:56:36 +03:00 |
|
|
|
903abca3a8
|
Thirdparty: refactoring
|
2020-11-17 17:41:42 +03:00 |
|
|
|
1b03c87157
|
Thirdparty: refactoring
|
2020-11-17 17:08:54 +03:00 |
|
Viktor Fomin
|
34e361a329
|
Update yarn.lock files
|
2020-11-17 14:31:11 +03:00 |
|
Viktor Fomin
|
26c3558063
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-11-17 14:24:13 +03:00 |
|
Viktor Fomin
|
f212dc7ad9
|
Web: Files: changed progress bar to floating button
|
2020-11-17 14:23:14 +03:00 |
|
|
|
f3ebcb78fe
|
Web: Files: fixed delete ThirdParty
|
2020-11-17 14:12:36 +03:00 |
|
|
|
c666520c74
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-17 12:04:33 +03:00 |
|
Artem Tarasov
|
efacc50ac4
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-17 11:48:55 +03:00 |
|
Artem Tarasov
|
900fc894fe
|
Web: Files: VersionHistory: refactoring
|
2020-11-17 11:47:00 +03:00 |
|
|
|
76ef4fdac5
|
Web: Files: added DeleteThirdPartyDialog, refactoring
|
2020-11-17 11:46:19 +03:00 |
|
|
|
2c945b0414
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 11:18:59 +03:00 |
|
|
|
121f34946b
|
Files: added base "Only in TMFileDao" methods
|
2020-11-17 11:13:53 +03:00 |
|
Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
c6d4b5bf60
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 08:11:35 +03:00 |
|
Alexey Kostenko
|
99ae4dba20
|
Web: People: Changed Consumer to HOC
|
2020-11-17 06:39:08 +03:00 |
|
Alexey Kostenko
|
e65f2b36c7
|
Web: Files: Filter: Changed Consumer to HOC
|
2020-11-17 06:33:34 +03:00 |
|
|
|
7866ba1212
|
Files: removed dependencies
|
2020-11-16 21:30:33 +03:00 |
|
|
|
77fec89a0f
|
Files: DotNetZip replaced with SharpCompress
|
2020-11-16 19:41:14 +03:00 |
|
Viktor Fomin
|
e51c7d2dd4
|
Update yarn.lock files
|
2020-11-16 18:56:12 +03:00 |
|
Artem Tarasov
|
8d56195705
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-16 17:35:43 +03:00 |
|
Artem Tarasov
|
fe5de62a3b
|
Web: Files: VersionHistory: fixed filter reset after returning from the VersionHistory padge
|
2020-11-16 17:34:17 +03:00 |
|
|
|
cd523404f1
|
Merge branch 'develop' into refactoring/scope
|
2020-11-16 17:09:19 +03:00 |
|
Vladislav Makhov
|
0e6e97ca0c
|
Fix empty screen
|
2020-11-16 17:04:17 +03:00 |
|
Artem Tarasov
|
7f1387410c
|
Web: Files: VersionHistory: refactorung
|
2020-11-16 16:46:00 +03:00 |
|
Vladislav Makhov
|
9929aa36de
|
Add getEncryptionSupport data handling
|
2020-11-16 15:44:13 +03:00 |
|
Artem Tarasov
|
af8a8ba77b
|
Web: Files: VersionHistoryPanel: fixed render error
|
2020-11-16 15:38:57 +03:00 |
|
Artem Tarasov
|
52432308f9
|
Web: Files: VersionHistory: Loaders.HistoryRows component applied
|
2020-11-16 15:26:41 +03:00 |
|
Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
Vladislav Makhov
|
07d507b5c5
|
Added receive of encryption keys
|
2020-11-16 12:34:01 +03:00 |
|
|
|
7c228a78e5
|
Files: fix create file in thirdparty
|
2020-11-15 18:34:47 +03:00 |
|
Vladislav Makhov
|
b33b8268a1
|
Refactoring
|
2020-11-13 19:05:49 +03:00 |
|
|
|
2c85229d8b
|
Web: Files: fixed ThirdParty icons styles
|
2020-11-13 18:54:54 +03:00 |
|
|
|
862fd8c9ca
|
Web: Files: added action to connect button
|
2020-11-13 18:46:42 +03:00 |
|
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
Artem Tarasov
|
575f9af8aa
|
Web: Files: VersionHistoryPanel: added propTypes
|
2020-11-13 15:48:52 +03:00 |
|
Artem Tarasov
|
144d1894c5
|
Web: Files: Deleted unusing var
|
2020-11-13 15:48:21 +03:00 |
|
Artem Tarasov
|
fa06fb84a6
|
Web: Files: VersionHistory: added redirect when following a direct link
|
2020-11-13 15:35:16 +03:00 |
|
Artem Tarasov
|
e3ae7df15e
|
Web: Files: VersionHistory: added fileId to store
|
2020-11-13 15:34:18 +03:00 |
|
Artem Tarasov
|
e558a9a6ab
|
Web: Files: VersionHistory: added prop visibilityVersionHistoryPanel to redux
|
2020-11-13 14:51:48 +03:00 |
|
Artem Tarasov
|
60404c326a
|
Web: Files: VersionHistoryPanel: refactoring
|
2020-11-13 14:26:14 +03:00 |
|
Artem Tarasov
|
ca4c71f714
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-11-13 14:00:30 +03:00 |
|
Artem Tarasov
|
31a6f65e06
|
Web: Files: VersionHistory: getting culture moved to VersionRow
|
2020-11-13 13:58:58 +03:00 |
|
|
|
67507d707d
|
Web: Files: fixed remove services
|
2020-11-13 11:48:42 +03:00 |
|
Artem Tarasov
|
17c019304b
|
Web: Files: VersionHistoryPanel: fixed styles
|
2020-11-13 11:45:13 +03:00 |
|
