Commit Graph

3110 Commits

Author SHA1 Message Date
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
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
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
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
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
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +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
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
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
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
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
TatianaLopaeva
715b732706 Web: People: Refactoring 2020-12-03 17:22:27 +03:00
TatianaLopaeva
126f907d19 Web: People: Canceled scrolling up when blocking and deleting a user without calling the context menu 2020-12-03 16:21:48 +03:00
TatianaLopaeva
fe9c5fcfd9 Web: Files: Refactoring 2020-12-03 15:30:31 +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
TatianaLopaeva
8c3a6298f3 Merge branch 'develop' into feature/fix-hide/show-header 2020-12-03 15:12:31 +03:00
Viktor Fomin
2482f12e3e Web: Files: fixed uploading files 2020-12-03 14:17:40 +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
TatianaLopaeva
32db9d737e Merge branch 'develop' into feature/fix-hide/show-header 2020-12-02 12:55:04 +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
Ilya Oleshko
eb2ae72026 Web: Files : Components: Hide logs 2020-12-01 17:19:07 +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
TatianaLopaeva
f9b60b5920 Web: Common: Canceled scroll up when locking and unlocking a document 2020-12-01 14:39:23 +03:00
Viktor Fomin
1c8b7115a5 Web: Common: fixed files uploading 2020-12-01 14:06:57 +03:00
f1f1ae818e Files: fix long operation 2020-12-01 12:29:08 +03:00
TatianaLopaeva
2cebf625fc Merge branch 'develop' into feature/fix-hide/show-header 2020-12-01 10:45:48 +03:00
8de24eae99 Files: openedit. AllowAnonymous 2020-12-01 10:20:15 +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
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