Ilya Oleshko
|
8a462c1e7a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 17:07:00 +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 |
|
|
|
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 |
|
Ilya Oleshko
|
6c0c32420a
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-11-10 11:11:09 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Vladislav Makhov
|
0df2b1e956
|
web: common: bump version
|
2020-11-09 18:48:08 +03:00 |
|
Ilya Oleshko
|
3411513117
|
web: common: bump version
|
2020-11-09 18:31:13 +03:00 |
|
Ilya Oleshko
|
b16448bea3
|
Web: Common: Article: Fixed after merge
|
2020-11-09 18:30:57 +03:00 |
|
Vladislav Makhov
|
078bb238fd
|
Add url to store
|
2020-11-09 16:15:36 +03:00 |
|
Vladislav Makhov
|
fee439b390
|
Refactoring
|
2020-11-09 15:11:46 +03:00 |
|
Artem Tarasov
|
c2dfeb591c
|
web: common: bump version
|
2020-11-09 12:43:27 +03:00 |
|
Artem Tarasov
|
3c557194df
|
Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows
|
2020-11-09 12:38:35 +03:00 |
|
Artem Tarasov
|
612661a22b
|
Web: Files/Common: MainButton: fixed line-height
|
2020-11-06 16:43:14 +03:00 |
|
Artem Tarasov
|
c791fa29aa
|
Web: Files/Common: PageLayout: fixed margin-top in Header
|
2020-11-06 16:15:03 +03:00 |
|
Artem Tarasov
|
d8a384adba
|
web: common: bump version
|
2020-11-06 14:23:37 +03:00 |
|
Artem Tarasov
|
173017ddbb
|
Web: Common: AdvancedSelector: fixed layout
|
2020-11-06 12:48:08 +03:00 |
|
|
|
3cf56b13ea
|
Web: Common: added thirdparty api
|
2020-11-06 12:07:48 +03:00 |
|
Artem Tarasov
|
678d31cc32
|
Web: Common: GroupSelector: fixed placeholder
|
2020-11-05 23:59:44 +03:00 |
|
Artem Tarasov
|
91019b19bd
|
web: common: bump version
|
2020-11-05 11:50:08 +03:00 |
|
Artem Tarasov
|
481abf40f8
|
Web: Common: applied prop size for Avatar Component
|
2020-11-05 11:39:09 +03:00 |
|
|
|
04003a0fa4
|
Web: Common: update lock file
|
2020-11-03 17:26:47 +03:00 |
|
Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
Artem Tarasov
|
8507650485
|
Web: Common: PageLayout: fixed selection items
|
2020-11-03 12:23:46 +03:00 |
|
Artem Tarasov
|
5f6e0e60e8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
|
2020-11-02 13:36:03 +03:00 |
|
|
|
440395d341
|
Web: Common: fixed update main height timeout
|
2020-10-30 17:22:49 +03:00 |
|
Ilya Oleshko
|
bf879ce810
|
web: common: bump version
|
2020-10-30 14:25:22 +03:00 |
|
Ilya Oleshko
|
797afe5c72
|
Web: Common: changed ReactResizeDetector refreshRate
|
2020-10-30 14:24:24 +03:00 |
|
|
|
ea21d49ddc
|
Web: Common: fixed main container height
|
2020-10-30 12:08:34 +03:00 |
|
|
|
13c690e183
|
Web: Common: fixed main container height
|
2020-10-29 18:18:00 +03:00 |
|
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
Alexey Kostenko
|
694ccfcec1
|
web: common: bump version
|
2020-10-29 10:55:13 +03:00 |
|
Alexey Kostenko
|
55830ab25c
|
Web: Common/Files: PeopleSelector: Added counter to footer button
|
2020-10-29 10:55:06 +03:00 |
|
Alexey Kostenko
|
19f1984e73
|
Web: Common/Files: GroupSelector: Added counter to footer button
|
2020-10-29 10:54:10 +03:00 |
|
Alexey Kostenko
|
638eacd052
|
Web: Common: AdvancesSelector: Added showCounter prop to AdvancesSelector
|
2020-10-29 10:44:17 +03:00 |
|
Artem Tarasov
|
e9144b7f67
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-10-28 14:07:50 +03:00 |
|
|
|
d241c610fe
|
web: common: bump version
|
2020-10-28 13:37:32 +03:00 |
|
|
|
c53446f5bc
|
Web: Common: fixed main container height
|
2020-10-28 13:35:06 +03:00 |
|
Artem Tarasov
|
40f0693727
|
web: common: bump version
|
2020-10-27 15:16:38 +03:00 |
|
Artem Tarasov
|
e4599f8279
|
Web: Files: VersionHistory: added props borderBottom for header(tablet)
|
2020-10-27 15:15:57 +03:00 |
|
Vladislav Makhov
|
3b6883595a
|
Move selector to auth
|
2020-10-27 14:47:07 +03:00 |
|
Vladislav Makhov
|
81f0342127
|
web: common: bump version
|
2020-10-27 14:46:39 +03:00 |
|
Vladislav Makhov
|
eab8d8e8e2
|
update yarn.lock
|
2020-10-27 14:28:56 +03:00 |
|
Vladislav Makhov
|
6249fd948d
|
web: common: bump version
|
2020-10-27 14:16:39 +03:00 |
|
|
|
b548870886
|
Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector
|
2020-10-27 13:15:06 +03:00 |
|
Vladislav Makhov
|
64a72b522f
|
Update yarn.lock
|
2020-10-27 10:49:55 +03:00 |
|
Vladislav Makhov
|
d91e79c011
|
web: common: bump version
|
2020-10-27 10:25:59 +03:00 |
|
Artem Tarasov
|
5ef8010b53
|
web: common: bump version
|
2020-10-26 15:41:05 +03:00 |
|
Artem Tarasov
|
5c07f4a631
|
Web: Common: PageLayout: fixed padding between filter and row
|
2020-10-26 14:24:09 +03:00 |
|
Artem Tarasov
|
faf0adf664
|
Web: Common: PageLayout: fixed layout section-header
|
2020-10-26 13:53:42 +03:00 |
|
