|
|
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 |
|
