Commit Graph

1723 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
TatianaLopaeva
e64b93da30 Merge branch 'develop' into feature/fix-hide/show-header 2020-11-27 11:22:50 +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
56fc822099 Web: Files: removed files row metadata 2020-11-26 15:11:44 +03:00
Alexey Kostenko
541a1bb8aa Web: Files: SharingPanel: Fixed internal/external links style 2020-11-26 14:53:48 +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
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
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
TatianaLopaeva
f5ffeeca92 Web: Common: Changed the condition for moving from tablet to desktop (for documents) 2020-11-24 12:56:11 +03:00
TatianaLopaeva
bcadb285c2 Web: Common: Rename id for scroll 2020-11-24 11:26:10 +03:00
TatianaLopaeva
df1cc9bc80 Web: Common: Changed the conditions for scrolling the page up 2020-11-24 11:15:37 +03:00
Alexey Kostenko
f2701388c2 Web: Files: SharingPanel: Fixed header styles 2020-11-24 06:58:20 +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