Viktor Fomin
|
df4c89cb91
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 18:09:58 +03:00 |
|
Viktor Fomin
|
0490c8c3f0
|
Update yarn.lock files
|
2020-11-10 18:08:51 +03:00 |
|
Viktor Fomin
|
c16074a861
|
web: common: bump version
|
2020-11-10 18:02:18 +03:00 |
|
Viktor Fomin
|
cfa08f5f25
|
Web: Common: fix circular dependency
|
2020-11-10 18:02:03 +03:00 |
|
Viktor Fomin
|
deb1168683
|
Web: Common: divided RowLoader and RowsLoader into two components
|
2020-11-10 17:58:19 +03:00 |
|
Viktor Fomin
|
81ca31c1b8
|
Web: Common: take styles out of components
|
2020-11-10 17:54:38 +03:00 |
|
Viktor Fomin
|
ba420d2ad6
|
Web: Common: fix props
|
2020-11-10 17:31:25 +03:00 |
|
Viktor Fomin
|
a82551568b
|
Web: People: fix props name
|
2020-11-10 17:30:43 +03:00 |
|
Viktor Fomin
|
710c169bf0
|
Web: Common: destructuring props
|
2020-11-10 17:29:11 +03:00 |
|
Ilya Oleshko
|
8a462c1e7a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 17:07:00 +03:00 |
|
Ilya Oleshko
|
cf5573c74b
|
Web: Files : Settings : Fixed style of input
|
2020-11-10 16:30:22 +03:00 |
|
|
a1541da672
|
Web: Files: added thirdParty icons
|
2020-11-10 15:12:14 +03:00 |
|
|
7e5c9beb73
|
Web: Components: added thirdParty icons
|
2020-11-10 15:10:57 +03:00 |
|
|
9aba8ec982
|
Merge pull request #120 from ONLYOFFICE/hotfix/documents-bugfix
Hotfix/documents bugfix
|
2020-11-10 14:52:52 +03:00 |
|
SuhorukovAnton
|
6e2860a7e5
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-10 14:51:33 +03:00 |
|
Artem Tarasov
|
02aed65d60
|
Web: Files: DocEditor: fixed of mobile view
|
2020-11-10 14:29:59 +03:00 |
|
Alexey Kostenko
|
a52f07e4e0
|
Web: Common: FilterInput: Decreased the minimum size of the search field
|
2020-11-10 14:28:49 +03:00 |
|
Alexey Kostenko
|
8825610fb5
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-10 13:59:55 +03:00 |
|
SuhorukovAnton
|
44e565ca37
|
x-www-form-urlencoded: add models
|
2020-11-10 13:41:32 +03:00 |
|
Artem Tarasov
|
4031a609b8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-10 13:34:04 +03:00 |
|
Artem Tarasov
|
f578e43662
|
Web: Files: Settings: refactoring
|
2020-11-10 13:31:16 +03:00 |
|
|
9b10dd39ee
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 12:59:40 +03:00 |
|
|
fa2a510a8a
|
Web: Files: added thirdParty api, added new thirdParty dialogs
|
2020-11-10 12:50:07 +03:00 |
|
Alexey Kostenko
|
8d43d5efaa
|
Web: Common: FilterInput: Fixed transition between mobile and desktop state, and change direction bug
|
2020-11-10 12:44:04 +03:00 |
|
|
1da1cde38e
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
|
2020-11-10 12:29:57 +03:00 |
|
Ilya Oleshko
|
ecefe5c859
|
Web: Files : Body : Fixed render for services folder
|
2020-11-10 11:43:05 +03:00 |
|
|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
Ilya Oleshko
|
60286af94f
|
Web: Files : Selectors : Added providerItem selector for render services folders
|
2020-11-10 11:41:42 +03:00 |
|
|
4458bca039
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-11-10 11:21:34 +03:00 |
|
|
6947185bab
|
Files: refactoring
|
2020-11-10 11:21:22 +03:00 |
|
Ilya Oleshko
|
6c0c32420a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 11:11:09 +03:00 |
|
Viktor Fomin
|
9cbe89d4b5
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 11:02:29 +03:00 |
|
|
ccf8eb8e59
|
Merge pull request #118 from ONLYOFFICE/feature/third-party-settings
Feature/third party settings
|
2020-11-10 10:51:01 +03:00 |
|
Viktor Fomin
|
834e8e6516
|
Update yarn.lock files
|
2020-11-10 10:46:26 +03:00 |
|
Viktor Fomin
|
706d0e65c7
|
web: common: bump version
|
2020-11-10 10:42:02 +03:00 |
|
Viktor Fomin
|
0a59504ccc
|
Web: Common: fix opacity const
|
2020-11-10 10:41:21 +03:00 |
|
Viktor Fomin
|
022f28c676
|
Web: Client: delete first header preloader
|
2020-11-10 10:41:00 +03:00 |
|
Viktor Fomin
|
8648abedbd
|
Web: People: delete first header preloader
|
2020-11-10 10:40:33 +03:00 |
|
Viktor Fomin
|
067ee4fc5a
|
Web: Files: delete first header preloader
|
2020-11-10 10:40:17 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Vladislav Makhov
|
633a5415c0
|
Fix url
|
2020-11-10 08:14:56 +03:00 |
|
Viktor Fomin
|
afd252e2ce
|
Web: People: fix profile action loader
|
2020-11-10 03:08:59 +03:00 |
|
Viktor Fomin
|
d34beb7caf
|
Web: Common: created profile view loader
|
2020-11-10 02:56:30 +03:00 |
|
Viktor Fomin
|
796059bbfa
|
Web: Common: added propTypes
|
2020-11-10 01:03:19 +03:00 |
|
Viktor Fomin
|
515bd0d05f
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-09 23:02:18 +03:00 |
|
Viktor Fomin
|
a7dee56194
|
Update yarn.lock files
|
2020-11-09 23:01:57 +03:00 |
|
Viktor Fomin
|
4962b0e996
|
web: common: bump version
|
2020-11-09 22:57:09 +03:00 |
|
Viktor Fomin
|
9f19173195
|
Web: People: added circle in row
|
2020-11-09 22:57:02 +03:00 |
|
Viktor Fomin
|
f553257760
|
Web: Common: fix colors
|
2020-11-09 22:56:21 +03:00 |
|
|
4dd9c6f554
|
Update yarn.lock files
|
2020-11-09 22:35:39 +03:00 |
|