|
|
51a993b2ea
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# web/ASC.Web.Components/package.json
|
2020-07-05 14:35:14 +03:00 |
|
|
|
81ace5028d
|
Merge branch 'master' into feature/files
|
2020-07-03 18:34:27 +03:00 |
|
|
|
6c0b91a836
|
Files: converter fix
|
2020-07-03 18:33:40 +03:00 |
|
|
|
9a2c382dfc
|
Merge branch 'master' into feature/files
|
2020-07-03 17:47:29 +03:00 |
|
|
|
b9b938cdf8
|
Files: fix convert
|
2020-07-03 17:47:01 +03:00 |
|
|
|
c318086fca
|
Merge branch 'master' into feature/files
|
2020-07-03 17:37:49 +03:00 |
|
|
|
9440367b3a
|
FileConvert: fix
|
2020-07-03 17:37:14 +03:00 |
|
|
|
7cba451f89
|
Merge branch 'master' into feature/files
|
2020-07-03 14:49:26 +03:00 |
|
|
|
98b007fe35
|
Files: fix CheckConversion
|
2020-07-03 14:48:56 +03:00 |
|
|
|
be99a345f7
|
Merge branch 'master' into feature/files
|
2020-07-03 14:24:47 +03:00 |
|
|
|
13efc06874
|
Files: fix
|
2020-07-03 14:19:45 +03:00 |
|
|
|
2b6ef1e745
|
Merge branch 'master' into feature/files
|
2020-07-03 13:37:09 +03:00 |
|
|
|
ded7034ba7
|
Files: fix convert
|
2020-07-03 13:36:31 +03:00 |
|
Ilya Oleshko
|
80deafb3e3
|
Web: Files: Home: Fixed translation key
|
2020-07-03 12:37:10 +03:00 |
|
|
|
b534cb1d1f
|
web: components: bump version
|
2020-07-03 11:43:06 +03:00 |
|
|
|
023b5169b8
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-03 11:42:09 +03:00 |
|
|
|
903d474194
|
Web: Components: fixed progressBar value
|
2020-07-03 11:41:38 +03:00 |
|
|
|
151ec90f4c
|
Merge branch 'master' into feature/files
|
2020-07-03 11:35:09 +03:00 |
|
|
|
479a4e5896
|
Files: additional logging
|
2020-07-03 11:34:36 +03:00 |
|
Ilya Oleshko
|
e9fb8b95e1
|
Web: Files: Home: Added translations for context options
|
2020-07-03 11:00:25 +03:00 |
|
|
|
dc93975a51
|
fixed check confirm method
|
2020-07-02 19:14:03 +03:00 |
|
NikolayRechkin
|
f9fd3d5122
|
web: common: bump version
|
2020-07-02 17:18:03 +03:00 |
|
NikolayRechkin
|
6edf7c237e
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-07-02 17:17:44 +03:00 |
|
NikolayRechkin
|
379974e8f2
|
web: common: added a double tap event
|
2020-07-02 17:17:23 +03:00 |
|
|
|
944dbabf40
|
Web: Files: fixed click event
|
2020-07-02 13:09:32 +03:00 |
|
|
|
939f059157
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-02 11:50:40 +03:00 |
|
|
|
6a019c6c35
|
Web: Files: fixed SharingPanel render
|
2020-07-02 11:50:32 +03:00 |
|
NikolayRechkin
|
d4eac18a74
|
web: common: bump version
|
2020-07-02 11:03:21 +03:00 |
|
NikolayRechkin
|
478e03530b
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-07-02 11:03:03 +03:00 |
|
NikolayRechkin
|
1a32e11f2c
|
web: Common: added a touch events
|
2020-07-02 11:02:50 +03:00 |
|
|
|
ba4b16393e
|
Web: Files: fixed badges update, fixed markAsRead
|
2020-06-30 18:46:19 +03:00 |
|
|
|
d13c4ac3bd
|
Web: Files: fixed markAsRead
|
2020-06-30 16:54:39 +03:00 |
|
|
|
cf3ee949da
|
web: common: bump version
|
2020-06-30 15:03:28 +03:00 |
|
|
|
0025f3b858
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-06-30 15:00:57 +03:00 |
|
|
|
5c3ff62d2e
|
Web: Files: added badge click event
|
2020-06-30 15:00:44 +03:00 |
|
Ilya Oleshko
|
6c07204658
|
web: common: bump version
|
2020-06-30 12:26:21 +03:00 |
|
Ilya Oleshko
|
00d9c26640
|
Web: Common: Fixed itemId check for filter change view
|
2020-06-30 12:26:14 +03:00 |
|
Ilya Oleshko
|
d52c0a67b7
|
Web: Files: Home: Filter: Fixed init, added translation keys
|
2020-06-30 11:58:23 +03:00 |
|
Ilya Oleshko
|
f883297700
|
web: common: bump version
|
2020-06-30 11:43:48 +03:00 |
|
Ilya Oleshko
|
c2a9189d4e
|
Web: Files: Home: Filter: Added viewSettings to SortComboBox for mobile devices
|
2020-06-30 11:43:40 +03:00 |
|
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 |
|
|
|
fee7608370
|
Merge branch 'master' into feature/files
|
2020-06-29 19:16:08 +03:00 |
|
|
|
314206639f
|
Notify: fix
|
2020-06-29 19:15:18 +03:00 |
|
|
|
0c18691038
|
Merge branch 'master' into feature/files
|
2020-06-29 18:10:59 +03:00 |
|
|
|
7950db51ff
|
Notify: fix
|
2020-06-29 18:10: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 |
|
|
|
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 |
|
