Commit Graph

4374 Commits

Author SHA1 Message Date
Alexey
8cb95b4a64 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-30 09:41:04 +03:00
Alexey
a3dd53878e Web: Files/Common: added ViewSelector component 2020-06-30 09:40:09 +03:00
Vladislav Makhov
8742342873 Remove cancel button from modal 2020-06-30 08:13:12 +03:00
Vladislav Makhov
199d266f18 Fix header style in modal window 2020-06-30 08:12:21 +03:00
Vladislav Makhov
582f6b1110 Fix font style 2020-06-30 08:01:54 +03:00
Vladislav Makhov
1ea6db8538 Update password field using PasswordInput component 2020-06-30 07:28:04 +03:00
Vladislav Makhov
97fa7010ea Set scale prop at the "sign in" button 2020-06-30 06:48:14 +03:00
Vladislav Makhov
a93ee38107 Rename remember text 2020-06-30 06:45:30 +03:00
Vladislav Makhov
fb386a8783 Change "forgot password" styles 2020-06-30 06:44:08 +03:00
Vladislav Makhov
8eaf1f02b7 Make greetingTitle black 2020-06-30 06:39:14 +03:00
Vladislav Makhov
df996552c3 Make Header component is available on login page 2020-06-30 06:26:31 +03:00
6c2352d4e5 Merge branch 'master' into feature/files 2020-06-29 17:54:33 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
Vladislav Makhov
05263bf36e Remove logo from FormContainer 2020-06-29 17:12:32 +03:00
c6975459cb Merge branch 'master' into feature/files 2020-06-29 16:54:44 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
6d05a77b60 Merge branch 'master' into feature/files 2020-06-29 12:40:47 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
461fc55f22
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
2020-06-28 16:23:36 +03:00
155e0b2c9b Backup: fix 2020-06-28 14:46:16 +03:00
2d1d09096c web: common: bump version 2020-06-26 17:41:11 +03:00
6bf6a774ef Web: Common: fix hammer off error 2020-06-26 17:40:24 +03:00
1626d179ee web: common: bump version 2020-06-26 15:59:13 +03:00
6e37032e21 web: components: bump version 2020-06-26 15:58:43 +03:00
792f8ff7a8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-26 15:55:54 +03:00
0c9fa66e36 Web: Common: added new api methods 2020-06-26 15:52:46 +03:00
6d40997d09 Web: Components: removed badge from tree-menu, fixed tree styles 2020-06-26 15:51:47 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
817d0d1bb1 Thumb: fix 2020-06-26 11:01:37 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
29a0e752bb Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
1798e7bb7b web: components: bump version 2020-06-25 18:14:06 +03:00
e2a80c0e0c Web: Components: Passed event to onClick handler 2020-06-25 18:11:34 +03:00
23945aeb24 Api: backup removed 2020-06-25 16:25:03 +03:00
b01b3d85f8 Backup: fix 2020-06-25 16:10:28 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
1871959768 fix 2020-06-25 15:17:22 +03:00
2fe2c2167b Merge branch 'master' into feature/thumbnails
# Conflicts:
#	ASC.Web.sln
2020-06-25 15:01:38 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
NikolayRechkin
b7e40eefdd update yarn.lock files 2020-06-25 11:01:47 +03:00
NikolayRechkin
9046c068fa web: common: bump version 2020-06-25 10:53:25 +03:00
NikolayRechkin
1337df1101 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-06-25 10:51:05 +03:00
NikolayRechkin
06fc4e9e33 web: common: MediaViewer. added a touch swipe events 2020-06-25 10:50:24 +03:00
d30a6a2186 web: components: bump version 2020-06-24 14:07:39 +03:00
3c619cfb40 Web: Components: fixed TreeFolders styles 2020-06-24 14:06:07 +03:00
SuhorukovAnton
e21d99e361 Thumbnails: fix 2020-06-23 14:19:12 +03:00
SuhorukovAnton
cce4d5fa7a Thumbnails: delete unnecessary 2020-06-23 14:14:13 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
a0dcf31041 web: components: bump version 2020-06-22 15:21:56 +03:00
2d232ffcb7 Web: Common: added onMouseDown event to DragAndDrop 2020-06-22 15:21:13 +03:00
NikolayRechkin
1d719ec3cb web: common: bump version 2020-06-22 09:53:54 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
10bcd867cc Web: Common: Api: Added getFileVersion 2020-06-18 17:45:35 +03:00
c672728b43 Web: Components: Export Box component 2020-06-18 17:45:01 +03:00
76e7ba73c4 web: components: bump version 2020-06-18 10:43:22 +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
d07e8e2322 Web: Components: added new styles to tree-node 2020-06-18 10:08:36 +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
571d41ac78 web: common: bump version 2020-06-17 17:16:05 +03:00
572fa4c3a5 Web: Files: fixed selector value, added new fields in folders 2020-06-17 17:15:15 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
f5ac2aa70f web: common: bump version 2020-06-17 11:41:17 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
9267ffe9b1 web: common: bump version 2020-06-16 11:49:44 +03:00
22a7df50b7 Web: Common: added DnD styles 2020-06-16 11:49:22 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
ceeff0b0c0 web: common: bump version 2020-06-15 15:41:34 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
a4645f72ef web: common: bump version 2020-06-15 13:49:37 +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
7f0498f299 Web: Common: changed the logic of Drag And Drop 2020-06-15 13:46:42 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
Ilya Oleshko
e2cef60f0f web: components: bump version 2020-06-11 15:55:13 +03:00
Ilya Oleshko
9ab3b7557b web: common: bump version 2020-06-11 15:55:03 +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
31bbd13805 web: common: bump version 2020-06-11 10:19:57 +03:00
10b03928b8 Web: Common: fixed viewScrollTop undefined value 2020-06-11 10:16:14 +03:00
7c96f27214 web: common: bump version 2020-06-11 09:56:35 +03:00
0ab8c4d872 Web: Common: fixed select items with scroll 2020-06-11 09:54:33 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
4058cd2a74 web: common: bump version 2020-06-10 12:10:09 +03:00
5e182db30c Web: Common: fixed SelectedFrame error with empty filter 2020-06-10 12:09:02 +03:00
3c66bbb607 Merge branch 'master' into feature/backup 2020-06-09 10:48:07 +03:00
bdcd5eac1a web: common: bump version 2020-06-09 10:04:27 +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
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
b569245076 rever logger 2020-06-04 16:47:27 +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
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
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
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +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
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
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
NikolayRechkin
e62de10128 web: common: bump version 2020-06-01 12:17:34 +03:00
NikolayRechkin
d8e804df2e web: common: MediaViewer. Fixed a scroll buttons style 2020-06-01 12:17:00 +03:00
d60f5e73b0 web: common: bump version 2020-05-29 09:31:45 +03:00
1613c1a06e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-29 09:31:06 +03:00
cb98c4ccbb Web: Common: added dropzone to PageLayout, added DragAndDrop export 2020-05-29 09:25:28 +03:00
NikolayRechkin
9cf8585a11 web: common: bump version 2020-05-29 00:07:09 +03:00
NikolayRechkin
a633e0f6aa Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-29 00:05:56 +03:00
NikolayRechkin
ec914dfc04 web: common: MediaViewer. fixed a image-viewer for safari 2020-05-29 00:05:37 +03:00
c367922d9c Web: Common: added DragAndDrop component 2020-05-28 17:18:50 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
4ac1fd815a web: common: bump version 2020-05-28 10:01:50 +03:00
fa634b7e53 Web: Common: fixed FolderType enum 2020-05-28 10:00:35 +03:00
5edf43ebb2 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-28 09:36:11 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
NikolayRechkin
8e6df7371f web: common: bump version 2020-05-28 09:07:12 +03:00
NikolayRechkin
3226154cb3 web: common: fixed styles 2020-05-28 09:06:18 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
NikolayRechkin
a1f55209a9 web: common: bump version 2020-05-26 15:07:26 +03:00
NikolayRechkin
b4499b54a5 web: common: MediaViewer. Fixed a playlist position 2020-05-26 15:06:59 +03:00
Ilya Oleshko
5cba165a0e web: common: bump version 2020-05-26 12:54:29 +03:00
Ilya Oleshko
fc12479c03 web: components: bump version 2020-05-26 12:54:19 +03:00
Ilya Oleshko
fb8cccc6ea Web: Common: Removed fake api 2020-05-26 12:53:34 +03:00
Ilya Oleshko
0b24a1d671 Web: Components: Removed faker 2020-05-26 12:52:31 +03:00
NikolayRechkin
9e3997eaf2 web: common: bump version 2020-05-25 17:59:23 +03:00
NikolayRechkin
f64fedfb88 web: common: MediaViewer. deleted unused code 2020-05-25 17:58:39 +03:00
NikolayRechkin
d401368e52 web: common: bump version 2020-05-25 16:23:27 +03:00
NikolayRechkin
0cbb5e55ea Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-25 16:23:00 +03:00
NikolayRechkin
22ce7c7381 web: common: fixed playlist change 2020-05-25 16:21:14 +03:00
48411e4c9d Merge branch 'master' into feature/files 2020-05-22 14:01:04 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
4299f91ab5 Merge branch 'master' into feature/files 2020-05-22 12:54:19 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
NikolayRechkin
d6792ba727 web: common: bump version 2020-05-21 10:10:39 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
NikolayRechkin
51b504827b web: common: bump version 2020-05-21 10:05:16 +03:00
NikolayRechkin
4e4b37fe13 web: common: MediaViewer. Fixes for pull request 2020-05-20 13:40:41 +03:00
6cd1cf9541 web: common: bump version 2020-05-20 10:56:04 +03:00
5207769230 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 10:55:34 +03:00
3b8805ab88 Web: Common: added copy and move API 2020-05-20 10:55:26 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
NikolayRechkin
70456dc651 web: common: bump version 2020-05-19 00:15:18 +03:00
NikolayRechkin
20cf39f908 web: common: MediaViewer. Refactoring 2020-05-19 00:12:48 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
4b89f35538 Web: Files: fixed sharing panel selected options 2020-05-18 11:34:07 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
8a32228bc8 web: common: bump version 2020-05-18 09:25:17 +03:00
NikolayRechkin
1fe2c562bc web: common: MediaViewer. refactoring 2020-05-17 20:00:45 +03:00
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
6e31e618ef Web: Files: fixed download as 2020-05-15 21:25:31 +03:00
8c11f5364c Web: Files: added download files upload with progress 2020-05-15 21:02:56 +03:00
f97e690773 Web: Files: added sharing api 2020-05-15 18:47:35 +03:00
91d287a2d5 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
2020-05-14 17:14:59 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
NikolayRechkin
6bfad7069d web: common: MediaViewer. fixed a file deletion 2020-05-14 11:47:57 +03:00
NikolayRechkin
22a0046f1f web: files: MediaViewer. file deletion 2020-05-13 16:20:23 +03:00
NikolayRechkin
7c2c986e60 web: common: fixed progress for touch devices 2020-05-13 11:01:55 +03:00
NikolayRechkin
c9108fe3da web: common: MediaViewer. Fixed a styles 2020-05-13 10:18:28 +03:00
NikolayRechkin
ca23997dc3 web: common: MediaViewer. fixed a styles 2020-05-12 17:05:22 +03:00
NikolayRechkin
c0fc5cc21d web: common: MediaViewer. Changed a playlist 2020-05-10 13:43:54 +03:00
NikolayRechkin
2b7cf5386a web: common: MediaViewer. Conversion 2020-05-09 21:11:54 +03:00
Ilya Oleshko
11cde4c7e7 web: components: bump version 2020-05-08 16:25:47 +03:00
Ilya Oleshko
45ed12eb2a Web: Components: Added indeterminate property for Checkbox inside Row 2020-05-08 16:25:38 +03:00
38af94ec11 web: components: bump version 2020-05-08 15:43:54 +03:00
7cbbf41340 Web: Components: fixed onClick action for link-with-dropdown, updated README.md file 2020-05-08 15:41:01 +03:00
NikolayRechkin
fda955966d Merge branch 'feature/files' into feature/media-viewer 2020-05-08 10:27:58 +03:00
NikolayRechkin
2aacf2ab36 web: common: MediaViewer. fix 2020-05-08 10:18:50 +03:00
65ad687d02 web: components: bump version 2020-05-08 09:16:18 +03:00
b22f40c7ef Web: Components: fixed progress-bar styles for Firefox 2020-05-08 09:13:02 +03:00
f547df107e Merge branch 'master' into feature/files 2020-05-07 14:40:51 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
NikolayRechkin
1bd0dd0a73 web: common: MediaViewer. Fix 2020-05-06 18:02:44 +03:00
NikolayRechkin
e4cea2ff4f web: common: MediaViewer. added a current file id 2020-05-06 16:36:17 +03:00
NikolayRechkin
278487054c web: common: bump version 2020-05-06 12:53:36 +03:00
NikolayRechkin
3afb210225 Merge branch 'feature/files' into feature/media-viewer 2020-05-05 18:53:33 +03:00
NikolayRechkin
7aa1af45e8 web: common: MediaViewer. created a README 2020-05-05 18:50:24 +03:00
NikolayRechkin
dc2ea73955 web: common: MediaViewer. Changed a story 2020-05-05 16:23:29 +03:00
NikolayRechkin
ea9907ce41 web: common: MediaViewer. video viewer 2020-05-05 16:15:33 +03:00
NikolayRechkin
717d76b273 web: common: MediaViewer. Fixed a image viewer 2020-05-05 16:02:21 +03:00
NikolayRechkin
cab53265dd web: common: MediaViewer. New icons 2020-05-05 12:22:58 +03:00
NikolayRechkin
41d08c3d26 web: components: bump version 2020-05-05 12:04:58 +03:00
NikolayRechkin
9f52ba9520 web: components: new icons 2020-05-05 12:04:49 +03:00
NikolayRechkin
bbc8faf617 web: components: bump version 2020-05-02 19:40:09 +03:00
NikolayRechkin
df22a59814 web: components: fix icons 2020-05-02 19:39:46 +03:00
NikolayRechkin
9578065435 web: components: bump version 2020-05-01 12:00:33 +03:00
NikolayRechkin
e3fd2bb587 web: components: new icons 2020-05-01 12:00:16 +03:00
NikolayRechkin
f8218bf17f web: common: MediaViewer. stop playing invisible video/audio 2020-04-30 11:37:16 +03:00
NikolayRechkin
62fee1ecfe web: common: MediaViewer. refactoring video viewer 2020-04-30 11:20:30 +03:00
NikolayRechkin
4e11abf2a2 web: common: MediaViewer. refactoring 2020-04-30 10:35:02 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
NikolayRechkin
4ec2c14ed4 web: common: MediaViewer. Button handlers. Component property descriptions 2020-04-29 17:11:01 +03:00
02d0a0b7ec web: common: bump version 2020-04-28 17:43:44 +03:00
30bc96584c Web: Common: fixed display progress-bar 2020-04-28 17:41:34 +03:00
92dca843f0 web: common: bump version 2020-04-28 11:59:46 +03:00
5722074692 web: components: bump version 2020-04-28 11:59:32 +03:00
ea4f050ede Web: Common: removed unused props from the pageLayout 2020-04-28 11:58:09 +03:00
ce513e5a50 Web: Components: reworked the progress-bar logic 2020-04-28 11:56:48 +03:00
NikolayRechkin
59a3f9c665 web: common: MediaViewer. Refactoring 2020-04-25 21:03:13 +03:00
NikolayRechkin
c1121ba621 web: common: MediaViewer. adaptive viewer size 2020-04-25 19:49:00 +03:00
NikolayRechkin
e826dac989 web: components: MediaViewer. Refactoring 2020-04-24 21:53:30 +03:00
NikolayRechkin
714f37294b web: common: MediaViewer. added audio support 2020-04-24 15:28:17 +03:00
Ilya Oleshko
72980c6bdd web: common: bump version 2020-04-24 11:30:26 +03:00
Ilya Oleshko
7569b50083 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-04-24 10:17:14 +03:00
Ilya Oleshko
a06fc5a656 Web: Common: Api: Added openEdit for files api 2020-04-24 10:15:07 +03:00
NikolayRechkin
7c8e567879 web: common: first version of MediaViewer 2020-04-24 00:44:47 +03:00
NikolayRechkin
c9e4d23394 Merge remote-tracking branch 'remotes/origin/feature/files' into feature/media-viewer 2020-04-23 13:58:02 +03:00
2330693b7d web: common: bump version 2020-04-23 13:08:41 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
NikolayRechkin
f8749e437a web: common: bump version 2020-04-23 12:37:56 +03:00
7b76d26e29 web: common: bump version 2020-04-23 12:04:55 +03:00
fa68bedd98 Web: Files: added upload files 2020-04-23 11:55:45 +03:00
NikolayRechkin
324b1c4ceb web: common: MediaViewer. added common styles 2020-04-22 20:44:09 +03:00
NikolayRechkin
bb94d506c0 web: common: fix video viewer 2020-04-21 13:49:23 +03:00
b55ef3aa37 Merge branch 'master' into feature/files 2020-04-20 11:19:17 +03:00
NikolayRechkin
921bde3d9e web: common: first version of the video viewer 2020-04-20 09:32:27 +03:00
NikolayRechkin
1b918fca81 web: common: init video viewer 2020-04-19 23:09:12 +03:00
NikolayRechkin
1820a6a828 web: common: init MediaViewer 2020-04-19 23:06:17 +03:00
c5ff09ac09 Added DI for Voip 2020-04-17 17:07:44 +03:00
Ilya Oleshko
8c349b0ee2 Merge branch 'master' into feature/files 2020-04-16 16:10:55 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
c788c6f223 Merge branch 'master' into feature/files 2020-04-16 09:45:03 +03:00
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
Ilya Oleshko
a87a4b187f Merge branch 'master' into feature/files 2020-04-15 14:32:29 +03:00
a1e1cd17be FileHandler: fix 2020-04-15 13:46:24 +03:00
c7e1cf7b95 web: components: bump version 2020-04-14 13:34:27 +03:00
fc77267633 Web: Components: added subtitle to empty screen container 2020-04-14 13:27:42 +03:00
Ilya Oleshko
c57af32d0d web: components: bump version 2020-04-13 15:56:57 +03:00
Ilya Oleshko
d986751205 Web: Components: Changed DropDown dynamic container from FixedSizeList to VariableSizeList. 2020-04-13 15:56:47 +03:00
e5d4709463 web: common: bump version 2020-04-07 11:13:17 +03:00
000505b656 Web: Common: added share access rights enum 2020-04-07 11:10:32 +03:00
da42fb0f42 web: common: bump version 2020-04-07 10:31:33 +03:00
df7718c6a3 Web: Common: added sharing api 2020-04-07 10:17:57 +03:00
Ilya Oleshko
f0916c4782 Merge branch 'master' into feature/files 2020-04-02 17:48:36 +03:00
df549c6e6a web: common: bump version 2020-04-02 12:16:05 +03:00
8b95f6af27 Web: Files: moved shareData to redux, added new api requests, refactoring 2020-04-02 12:15:35 +03:00
e199ff703a Web: Common: removed unused styles from AdvancedSelector 2020-03-31 13:50:28 +03:00
e9e6032914 web: common: bump version 2020-03-30 14:35:43 +03:00
b71743cabe Web: Common: removed ComboBox from advansedSelector, added embeddedComponent 2020-03-30 14:31:50 +03:00
Ilya Oleshko
c833bbbca6 web: components: bump version 2020-03-30 10:23:44 +03:00
Ilya Oleshko
9eca35fa60 Web: Components: Added contextButtonSpacerWidth property for Row component, fixed readme 2020-03-30 10:23:26 +03:00
8141654772 web: components: bump version 2020-03-28 13:21:38 +03:00
841c2b9c28 web: common: bump version 2020-03-28 13:20:50 +03:00
f701a1b000 Web: Common: added new propTypes to AdvancedSelector 2020-03-28 13:20:27 +03:00
7cdbe7c079 Web: Common: added ability to display combobox in footer of advanced selector, added new props to PeopleSelector and GroupSelector 2020-03-28 13:10:32 +03:00
d9b043496a Web: Components: added key icon, added class name to combo-button 2020-03-28 13:04:12 +03:00
Ilya Oleshko
3a5ce4971f web: components: bump version 2020-03-26 17:13:37 +03:00
Ilya Oleshko
f825b3b108 web: common: bump version 2020-03-26 17:13:25 +03:00
Ilya Oleshko
80acbc1061 Web: Common: Added application of columnCount parameter inside FilterInput component 2020-03-26 17:11:58 +03:00
Ilya Oleshko
17d2a678d1 Web: Components: Added columnCount property for DropDown component 2020-03-26 17:10:14 +03:00
63bf49d256 Web: Files: added DeleteDialog dialog, added removeFiles api request 2020-03-24 14:36:47 +03:00
Daniil Senkiv
a0b3345fc6 web: common: bump version 2020-03-23 13:47:59 +03:00
Daniil Senkiv
cf5946dece Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-23 13:47:40 +03:00
Daniil Senkiv
c38f4022de web.files: MainButton: fix selector 2020-03-23 13:47:28 +03:00
51c83460cd Web: Files: added TreeFolders update after rename or delete action 2020-03-23 13:42:37 +03:00
Daniil Senkiv
8ff996e72d web: common: bump version 2020-03-20 16:01:14 +03:00
Daniil Senkiv
46bc8fdeb7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-20 15:59:34 +03:00
Daniil Senkiv
7a2ae47eb0 Web.Files/Common: Filter: add folder param instead of hash param 2020-03-20 15:59:06 +03:00
805713f2a0 web: common: bump version 2020-03-20 15:15:21 +03:00
04f28c2a71 Web: Files: replaced rootFolders to treeFolders 2020-03-20 14:59:07 +03:00
Ilya Oleshko
8c2bfb53f1 web: components: bump version 2020-03-20 13:37:26 +03:00
Ilya Oleshko
dff6d378c5 Web: Components: RowContent: Fixed ignoring onClick 2020-03-20 12:00:56 +03:00
Daniil Senkiv
71e5e3c73c Web.Client: fix 09474e8be9 2020-03-20 11:15:27 +03:00
978cf0e34e Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
2020-03-19 16:07:16 +03:00
b25eb5b914 web: common: bump version 2020-03-19 15:26:31 +03:00
eadec341c6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-03-19 15:25:40 +03:00
c1782f774a Web: Files: added Empty TrashDialog with translations 2020-03-19 15:25:11 +03:00
Daniil Senkiv
102f838a6a Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-19 15:17:14 +03:00
Ilya Oleshko
5d8a94324e web: common: bump version 2020-03-19 15:07:24 +03:00
Ilya Oleshko
8269dc8560 Web: Common: Api: Files: Added getFoldersTree request 2020-03-19 15:07:05 +03:00
Daniil Senkiv
25d796b309 web: components: bump version 2020-03-19 15:06:04 +03:00
Daniil Senkiv
09474e8be9 People.Client: replace FilterInput from asc-web-components to asc-web-common, delete asc-web-components FilterInput 2020-03-19 15:05:57 +03:00
Daniil Senkiv
bdac987529 web: common: bump version 2020-03-19 14:52:16 +03:00
Daniil Senkiv
e9243547e2 Web.Common: Filter: fix work with selectors 2020-03-19 14:52:02 +03:00
Daniil Senkiv
df76148505 web: common: bump version 2020-03-19 13:49:25 +03:00
Daniil Senkiv
9d0cef81dd Web.Common: fix folderTree 2020-03-19 13:49:16 +03:00
Daniil Senkiv
9b8f2f69a6 web: common: bump version 2020-03-19 11:40:58 +03:00
Daniil Senkiv
4b20b8578c Web.Files: Filter: apply withSubfolders param correctly 2020-03-19 11:40:42 +03:00
Daniil Senkiv
c1bbf62609 Web.Files: get info about author of file before showing interface with fix 2020-03-19 09:15:58 +03:00
Daniil Senkiv
339f8cfcfb web: common: bump version 2020-03-18 15:11:07 +03:00
Daniil Senkiv
0faa3a74ed Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-18 15:10:14 +03:00
Daniil Senkiv
dacbf30366 Web.Files: get info about author of file before showing interface 2020-03-18 15:09:56 +03:00
7314c218eb web: common: bump version 2020-03-18 13:09:26 +03:00
62374a5fda web: components: bump version 2020-03-18 13:09:17 +03:00
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +03:00
Ilya Oleshko
2d70a7fbcc web: common: bump version 2020-03-18 11:42:38 +03:00
Ilya Oleshko
cb9a587f7a Web: Common: Constants: Added FileAction constant 2020-03-18 11:39:43 +03:00
Daniil Senkiv
730ca469a1 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-03-17 09:07:39 +03:00
be472d5f24 web: components: bump version 2020-03-16 13:30:15 +03:00
ea33270edb Web: Components: fixed tree menu 2020-03-16 13:29:45 +03:00
Ilya Oleshko
87f208b033 web: components: bump version 2020-03-16 12:22:00 +03:00
Ilya Oleshko
8b1568701f Web.Client: Settings: Fixed admin`s row width 2020-03-16 12:19:32 +03:00
Ilya Oleshko
5028b1ce52 Web: Components: RowContent: Fixed default width 2020-03-16 12:18:35 +03:00
0bcfec5a19 Update yarn.lock files 2020-03-16 11:20:25 +03:00
52a9ff98d0 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-03-16 11:02:13 +03:00
d694819eda web: common: bump version 2020-03-16 10:49:47 +03:00
0ed02f88a0 web: components: bump version 2020-03-16 10:49:34 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
c6d13463ab Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-03-16 10:25:18 +03:00
dependabot[bot]
2f8f43a03a
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-16 07:22:50 +00:00
4c09c402f4 web: components: bump version 2020-03-16 09:49:29 +03:00
638e5e9657 Web: Components: downgraded version rc-tree 2020-03-16 09:49:12 +03:00
dependabot[bot]
e4e7cce565
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Components
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:55:11 +00:00
8119d2884e web: components: bump version 2020-03-13 18:29:12 +03:00
7b346ed102 Web: Components: updated rc-tree package 2020-03-13 18:27:58 +03:00
Daniil Senkiv
d920cc30f7 web: common: bump version 2020-03-13 18:11:48 +03:00
Daniil Senkiv
17aebb0ba0 Web.Files/Common: filter on real data 2020-03-13 18:11:15 +03:00
Ilya Oleshko
3ec713c32d web: common: bump version 2020-03-13 12:08:41 +03:00
Ilya Oleshko
cb5836af98 Web: Common: FilterInput: Removed useless prop from sorting ComboBox 2020-03-13 12:08:28 +03:00
Daniil Senkiv
0fcee867a3 web: common: bump version 2020-03-13 10:55:47 +03:00
Daniil Senkiv
2d9840e78b Web.Files/Common: Filter: add withSubFolders param 2020-03-13 10:55:25 +03:00
Daniil Senkiv
d7f55ea7a6 web: common: bump version 2020-03-13 09:31:07 +03:00
Daniil Senkiv
114e31fb37 Web.Common: FilterInput: fix styles 2020-03-13 09:30:54 +03:00
Daniil Senkiv
d65b09f003 web: common: bump version 2020-03-12 16:22:59 +03:00
Daniil Senkiv
ae6f0a6ef9 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-12 15:57:43 +03:00
Daniil Senkiv
2597cbfdb4 Web.Common: FilterInput: added selectors 2020-03-12 15:57:23 +03:00
025f177d9a web: common: bump version 2020-03-11 17:20:56 +03:00
5bab7b0259 web: components: bump version 2020-03-11 17:20:45 +03:00
1ff9356ea7 Web: Common: added progress-bar to PageLayout 2020-03-11 17:18:47 +03:00
8ecc223156 Web: Components: fixed progress-bar rerender 2020-03-11 17:18:12 +03:00
153052a9a0 web: components: bump version 2020-03-11 16:14:45 +03:00
b08e9f83c4 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-03-11 16:14:18 +03:00
7941f4ff05 Web: Components: added progress-bar component 2020-03-11 16:12:04 +03:00
Ilya Oleshko
ba0f5e6fca web: common: bump version 2020-03-11 14:16:06 +03:00
Ilya Oleshko
594c1a776b Web: Common: Api: Files: Added file creating API requests 2020-03-11 14:15:44 +03:00
Ilya Oleshko
0b8c870e19 web: common: bump version 2020-03-11 13:53:59 +03:00
Ilya Oleshko
4e45f96b7a Web: Common: Api: Files: Fixed request payload 2020-03-11 13:53:49 +03:00