|
|
6f8ed00dff
|
Web: Common: Replaced getFoldersTree with single @root request
|
2020-10-22 18:51:31 +03:00 |
|
|
|
949cc1bd56
|
Startup revert
|
2020-10-22 17:32:53 +03:00 |
|
|
|
86a15c35aa
|
Added root folder request
|
2020-10-22 17:17:20 +03:00 |
|
|
|
d2c26c2669
|
Merge pull request #105 from ONLYOFFICE/feature/avatar-fix
Feature/avatar fix
|
2020-10-21 17:57:13 +03:00 |
|
Alexey Kostenko
|
5ce0299f8f
|
Merge branch 'develop' into feature/avatar-fix
|
2020-10-21 09:17:00 +03:00 |
|
Alexey Kostenko
|
8804048a2c
|
web: components: bump version
|
2020-10-21 09:09:54 +03:00 |
|
Alexey Kostenko
|
ef6145abd5
|
Web: Components: Removed rotate buttons (will be fixed in the next version)
|
2020-10-21 09:09:45 +03:00 |
|
|
|
2b59f1a34d
|
Merge pull request #104 from ONLYOFFICE/feature/files-recent
Feature/files recent
|
2020-10-20 19:25:34 +03:00 |
|
|
|
352c04fd5f
|
Merge branch 'develop' into feature/files-recent
|
2020-10-20 19:14:43 +03:00 |
|
|
|
c9640e4599
|
Merge pull request #103 from ONLYOFFICE/feature/people-filter-empty-screen
Feature/people filter empty screen
|
2020-10-20 17:34:28 +03:00 |
|
|
|
31f3958e0a
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-20 15:33:43 +03:00 |
|
|
|
24a594b74c
|
SocketIO: disable ping
|
2020-10-20 12:33:38 +03:00 |
|
Vladislav Makhov
|
d012d8f724
|
Add new context menu item: "Open location".
|
2020-10-20 11:04:50 +03:00 |
|
Alexey Kostenko
|
f2711a7eca
|
Web: Components: Fixed creating cropped image, when resize
|
2020-10-20 10:17:09 +03:00 |
|
Vladislav Makhov
|
967a01061a
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# 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/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-10-20 09:23:58 +03:00 |
|
Vladislav Makhov
|
897a9cc24b
|
Fix folder creation
|
2020-10-20 09:09:25 +03:00 |
|
|
|
b9cb483d65
|
DIHelper: fix
|
2020-10-19 22:11:23 +03:00 |
|
|
|
05a6034b05
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 20:53:59 +03:00 |
|
|
|
16bada18d0
|
Merge pull request #93 from ONLYOFFICE/feature/files-favorites
Feature/files favorites
|
2020-10-19 18:58:48 +03:00 |
|
Vladislav Makhov
|
500ac20bdc
|
Adding to recent then create file.
|
2020-10-19 18:56:35 +03:00 |
|
Vladislav Makhov
|
e0dacb3a60
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 18:20:36 +03:00 |
|
Vladislav Makhov
|
2757a785a0
|
Merge branch 'develop' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 17:54:41 +03:00 |
|
Alexey Kostenko
|
5adc0f8697
|
Web: People: Added loader when switching groups
|
2020-10-19 14:15:04 +03:00 |
|
TatianaLopaeva
|
2dd956c700
|
Update yarn.lock files
|
2020-10-19 13:41:22 +03:00 |
|
TatianaLopaeva
|
2509d7128e
|
web: components: bump version
|
2020-10-19 13:26:51 +03:00 |
|
TatianaLopaeva
|
41d0c3e9d9
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 12:11:34 +03:00 |
|
Vladislav Makhov
|
fee23e5947
|
Fix code after merge
|
2020-10-19 10:58:24 +03:00 |
|
|
|
af1bf4a56e
|
Refactoring: lazy
|
2020-10-18 22:00:38 +03:00 |
|
|
|
181ac04fd8
|
DI: register fix
|
2020-10-18 19:34:30 +03:00 |
|
|
|
5cddd2061d
|
Files: fixed delete
|
2020-10-16 19:05:21 +03:00 |
|
|
|
79e07ed817
|
Files: fixed create folder
|
2020-10-16 17:39:13 +03:00 |
|
|
|
0b258114cc
|
Merge pull request #101 from ONLYOFFICE/feature/files
Feature/files
|
2020-10-16 17:15:24 +03:00 |
|
Vladislav Makhov
|
3578340bcd
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
|
2020-10-16 17:15:14 +03:00 |
|
|
|
18ef6e7cb6
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-10-16 16:57:21 +03:00 |
|
|
|
38cd808b4e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-16 16:44:18 +03:00 |
|
|
|
a6d9908d00
|
Web: Files: remove duplicate fetchFolder
|
2020-10-16 16:45:44 +03:00 |
|
|
|
70b736998b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
|
2020-10-16 16:44:10 +03:00 |
|
|
|
ed50f3bc98
|
Update yarn.lock files
|
2020-10-16 16:38:11 +03:00 |
|
Ilya Oleshko
|
c8cfe099ce
|
Web: Files : RowContent : Disable file actions inside recycle
|
2020-10-16 16:33:25 +03:00 |
|
|
|
fc20655f0a
|
web: common: bump version
|
2020-10-16 16:27:42 +03:00 |
|
|
|
2ea8e5cf1c
|
Web: Files: Applied prettier style fix
|
2020-10-16 16:27:22 +03:00 |
|
|
|
2ab62c351e
|
Web: People: Applied prettier style fix
|
2020-10-16 16:23:51 +03:00 |
|
|
|
5eed00dd28
|
Removed sq bugs and code smells
|
2020-10-16 16:21:59 +03:00 |
|
TatianaLopaeva
|
14af00ffd7
|
Web: Added styles and changed images by layout
|
2020-10-16 16:21:33 +03:00 |
|
|
|
00c5f40cf8
|
Web: Client: Applied prettier style fix
|
2020-10-16 16:20:12 +03:00 |
|
|
|
f78d6c14f3
|
web: components: bump version
|
2020-10-16 16:18:11 +03:00 |
|
|
|
142c6d5e07
|
Web: Common: Added prettier package
|
2020-10-16 16:17:49 +03:00 |
|
Vladislav Makhov
|
e58a88af29
|
Fix code after merge
|
2020-10-16 16:16:51 +03:00 |
|
|
|
8058981447
|
Web: Components: Applied prettier style fix
|
2020-10-16 16:16:01 +03:00 |
|
Ilya Oleshko
|
312856acf1
|
Web: Files : RowContent : Auto formatting, disable file actions inside recycle
|
2020-10-16 16:12:37 +03:00 |
|
