Commit Graph

4100 Commits

Author SHA1 Message Date
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