Commit Graph

1693 Commits

Author SHA1 Message Date
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
bfcd495815 Web: Files: fixed SharingPanel styles 2020-06-22 16:59:04 +03:00
8b5c7f842a Web: Files: fixed context-menu actions 2020-06-22 15:20:24 +03:00
c9dd9c57d7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-22 14:26:39 +03:00
12aa58e26b Web: Files: fixed TreeFolders render 2020-06-22 14:26:20 +03:00
Alexey
1a93002655 Web: Files: Added translation: "Link for portal users" 2020-06-22 11:27:52 +03:00
Alexey
c8a48b0755 Web: Files: Link for portal users 2020-06-22 10:45:28 +03:00
Ilya Oleshko
59d5b843a1 Web: Files: Home: Fixed home re-rendering after change property for tree 2020-06-19 13:10:43 +03:00
259c004838 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-06-18 17:50:40 +03:00
235e10a645 Web: Files: VersionHistory: Added simple version viewer 2020-06-18 17:49:07 +03:00
8a62a57de9 Web: Files: Fixed undefined error 2020-06-18 17:46:10 +03:00
2968205e53 Web: Files: fixed TreeFolders styles, added DragAndDrop validation 2020-06-18 16:43:21 +03:00
2cd534e7fb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-18 14:31:46 +03:00
e6108694df Web: Files: VersionHistory: Added back button 2020-06-18 14:31:38 +03:00
2d627baa71 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-18 10:42:05 +03:00
19eacb0099 Web: Files: added DragAndDrop to TreeFolders 2020-06-18 10:41:56 +03:00
6d86341900 Web: Files: Added opportunity to go to version history page by click on badge 2020-06-18 10:31:51 +03:00
6121a2c580 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-17 17:20:39 +03:00
39a5a75998 UI version page: init 2020-06-17 17:20:32 +03:00
6a241f7f93 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-17 11:40:35 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
Ilya Oleshko
51d7984c91 Web: Fixed header icons width to 17px 2020-06-17 11:26:18 +03:00
53bb74f26f Web: Files: Replaced icons in FolderTree 2020-06-17 10:50:30 +03:00
Ilya Oleshko
2bdbb60545 Web: Files: App: Use Studio layout only if we need it 2020-06-16 19:28:09 +03:00
Ilya Oleshko
42f4b01dbf Web: Files: DocEditor: Fixed height after change router 2020-06-16 19:26:54 +03:00
Ilya Oleshko
55574cd2de Web: Files: Home: Fixed first select, added closing menu after operations 2020-06-16 18:21:38 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
4d403544f6 Web: Files: fixed mouseUp function 2020-06-16 17:28:11 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
2b9dbcbe81 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-15 13:48:39 +03:00
024b973a1f Web: Files: changed the logic of Drag And Drop, added tooltip of operations 2020-06-15 13:48:27 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
1f15d39445 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-06-13 18:32:07 +03:00
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
df0508ee01 Web: Files: fixed drag and drop in the trash folder 2020-06-09 11:14:16 +03:00
0882db7a80 Web: Files: added setSelections function to SelectedFrame, code refactoring 2020-06-09 10:04:03 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
Ilya Oleshko
be6b6eb3ad Merge branch 'master' into feature/files 2020-06-05 14:25:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
Ilya Oleshko
1d53e84d7f Web: Files: Home: Fixed filter type for selector 2020-06-05 12:02:54 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
06a7e81a49 Files: feed. FoldersModule 2020-06-04 19:36:43 +03:00
70376338ce Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:48:24 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
Ilya Oleshko
d14268ab66 Web: Files: Home: Fixed context menu triggering 2020-06-04 16:47:37 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00