Commit Graph

5754 Commits

Author SHA1 Message Date
e88e54dad7 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-10 17:23:46 +03:00
a05139202d Merge branch 'master' into feature/files 2020-06-10 17:23:23 +03:00
2f8e09f915 fix 2020-06-10 17:22:48 +03:00
4058cd2a74 web: common: bump version 2020-06-10 12:10:09 +03:00
a5ed6e254c Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-10 12:09:49 +03:00
5e182db30c Web: Common: fixed SelectedFrame error with empty filter 2020-06-10 12:09:02 +03:00
8c868252c5 Merge branch 'master' into feature/files 2020-06-10 11:50:34 +03:00
5aef887fe1 test: fix 2020-06-10 11:49:50 +03:00
df0508ee01 Web: Files: fixed drag and drop in the trash folder 2020-06-09 11:14:16 +03:00
344916b395 TenantManager: fix 2020-06-09 10:54:05 +03:00
bdcd5eac1a web: common: bump version 2020-06-09 10:04:27 +03:00
0882db7a80 Web: Files: added setSelections function to SelectedFrame, code refactoring 2020-06-09 10:04:03 +03:00
b1ee7dbc03 Web: Common: added SelectedFrame.js, fixed DragAndDrop styles 2020-06-09 10:02:13 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
Ilya Oleshko
0d2666dcab web: common: bump version 2020-06-05 15:08:51 +03:00
Ilya Oleshko
dce000f004 Web: Common: Fixed FolderType enum 2020-06-05 15:08:32 +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
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
b569245076 rever logger 2020-06-04 16:47:27 +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
Ilya Oleshko
424b8566f9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:17:04 +03:00
Ilya Oleshko
61a45fcd3d Web: Files: Home: Apply default filter after first page load 2020-06-04 16:15:04 +03:00
Ilya Oleshko
7c5d6da7b1 Web: Files: Article: Fixed go out of page range after tree navigation 2020-06-04 16:14:18 +03:00
172b8bebfc fix 2020-06-04 16:13:39 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
5d818c0afa web: common: bump version 2020-06-04 15:54:46 +03:00
7ec68b5fc3 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-04 15:54:15 +03:00
acfaa84ee8 Web: Files: added DragAndDrop to module Files, refactoring operations panel 2020-06-04 15:54:06 +03:00
99dc0aca98 Web: Files: fixed MoveTo CopyTo translations 2020-06-04 15:51:36 +03:00
64ae28db3d Web: Common: refactoring DragAndDrop component, added new props 2020-06-04 15:49:40 +03:00
c65ab449bd Web: Common: added isDropZone prop to page-layout 2020-06-04 15:46:01 +03:00
2d4dda536c Web: Files: added new translations 2020-06-04 15:34:07 +03:00
b71442fcdc Merge branch 'master' into feature/files 2020-06-04 14:02:13 +03:00
1c25d16fc2 Products: added absolute path support 2020-06-04 14:01:25 +03:00
Ilya Oleshko
7be13a76b1 Web: Files: Article: Fixed translation key warning 2020-06-04 11:09:02 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
a14049e88f Settings: fixed GetSupportedCultures 2020-06-03 18:51:01 +03:00
81e0917847 Files: simplified getHeaders method 2020-06-03 18:04:14 +03:00
NikolayRechkin
4ead7ad5da web: common: bump version 2020-06-03 15:33:59 +03:00
NikolayRechkin
c4f856fac8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-06-03 15:33:42 +03:00
NikolayRechkin
87ba3a069a web: common: MediaViewer. fixed the image size 2020-06-03 15:33:05 +03:00
e27d33f880 web: common: bump version 2020-06-03 15:04:00 +03:00
462c513aa8 Web: Common: added withScroll prop to PageLayout 2020-06-03 15:03:33 +03:00