Commit Graph

1493 Commits

Author SHA1 Message Date
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
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +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
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
b1c8fd8b67 web: common: bump version 2020-11-09 22:15:31 +03:00
d012aa6071 Merge branch 'develop' into feature/filter-loader
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-11-09 22:15:04 +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
Alexey Kostenko
56bdfb9826 Web: Common: FilterInput: Fixed reset filter 2020-11-09 17:52:24 +03:00
Viktor Fomin
372db7f819 Web: Common: added isRectangle props in readme 2020-11-09 16:49:37 +03:00
Viktor Fomin
b857e98a79 web: common: bump version 2020-11-09 16:39:41 +03:00
Viktor Fomin
8b72b19401 Web: Common: fix column gap 2020-11-09 16:38:13 +03:00
Viktor Fomin
3d5b3a9784 Web: Common: added rectangle or circle props in rows loader 2020-11-09 16:25:59 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
Alexey Kostenko
c19be92b35 Web: Common: FilterInput: Fixed component initialization 2020-11-09 16:05:53 +03:00
Viktor Fomin
a6352c87ee Web: Common: added title props for loaders 2020-11-09 16:02:08 +03:00
Alexey Kostenko
6bfaae5d2f Web: Common: FilterInput: Fixed filter when selected new item filter items, fixed infinite rendering in small mobile devices 2020-11-09 16:01:29 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
Viktor Fomin
f053f78e47 web: common: bump version 2020-11-09 15:11:44 +03:00
Viktor Fomin
86c5962621 Web: Common: added readme for stories 2020-11-09 14:45:57 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
c427dbd03d web: common: bump version 2020-11-09 13:12:07 +03:00
Viktor Fomin
d12dbd797c Web: Common: fix loaders if not auth 2020-11-09 13:08:51 +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
Viktor Fomin
adc6347d21 Web: Common: fix story for header loader 2020-11-09 12:35:48 +03:00
Viktor Fomin
a7da70bb8b Web: Common: fix loader style opacity constant 2020-11-09 12:35:06 +03:00
Viktor Fomin
950dca9a2a Web: Common: added prop types 2020-11-09 12:34:25 +03:00
Viktor Fomin
55143dfbd0 Web: Common: fix props 2020-11-09 12:33:59 +03:00
Viktor Fomin
ac7b6bf362 Web: Common: fix header loader opacity 2020-11-09 12:33:13 +03:00
Viktor Fomin
7c5e683be2 Web: Common: added decorator section in storybook 2020-11-09 12:32:11 +03:00
Alexey Kostenko
433d0d399f Web: Common: FilterInput: Fixed filter when added/removed filter items 2020-11-09 12:12:26 +03:00
Alexey Kostenko
20f92245f4 Web: Common: FilterInput: Fixed adding elements when screen zooms in 2020-11-09 09:26:03 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
Viktor Fomin
291869e830 web: common: bump version 2020-11-06 18:39:02 +03:00
Viktor Fomin
d8e541498c Web: Common: add header loader 2020-11-06 18:26:32 +03:00
Viktor Fomin
24bdcdf04d Web: Common: create header loader stories 2020-11-06 18:25:40 +03:00
Viktor Fomin
0134d7a2d8 Web: Common: fix logo 2020-11-06 17:45:54 +03:00
Viktor Fomin
eaa7e270bb Web: Common: add logoUrl setting 2020-11-06 17:44:51 +03:00
Viktor Fomin
916d8f9b0c Web: Common: create header loader 2020-11-06 17:43:59 +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
Viktor Fomin
98dabb19ab Web: Common: use ternary operator 2020-11-06 15:58:30 +03:00
Viktor Fomin
2d78e10011 Web: Common: hide AddonPanel 2020-11-06 15:51:31 +03:00
Viktor Fomin
ffd23c59b4 Web: Common: create stories 2020-11-06 15:39:31 +03:00
Viktor Fomin
2f8ecce840 Web: Common: add props 2020-11-06 15:38:53 +03:00
Viktor Fomin
b9a0c235b3 Web: Common: add props 2020-11-06 15:38:36 +03:00
Viktor Fomin
1a384ae0cd Web: Common: add props 2020-11-06 15:38:20 +03:00
Viktor Fomin
b5fb1e583e Web: Common: add props 2020-11-06 15:38:05 +03:00
Viktor Fomin
a7be2b8ab7 Web: Common: fix and add new loader style constants 2020-11-06 15:21:01 +03:00
Viktor Fomin
8f5490d1c3 Web: Common: refactoring loaders 2020-11-06 15:20:06 +03:00
Viktor Fomin
c298711379 Web: Common: fix props circle 2020-11-06 15:00:11 +03:00
Viktor Fomin
3c52b86599 Web: Common: fix props rectangle 2020-11-06 14:59:37 +03:00
Artem Tarasov
d8a384adba web: common: bump version 2020-11-06 14:23:37 +03:00
Alexey Kostenko
3f77abc3c9 Web: Common: FilterInput: Refactoring, removed unused methods 2020-11-06 13:28:31 +03:00
Alexey Kostenko
8d10326c44 Web: Common: FilterInput: Fixed hidden elements when screen zooms out 2020-11-06 13:07:08 +03:00
Artem Tarasov
173017ddbb Web: Common: AdvancedSelector: fixed layout 2020-11-06 12:48:08 +03:00
Artem Tarasov
678d31cc32 Web: Common: GroupSelector: fixed placeholder 2020-11-05 23:59:44 +03:00
Viktor Fomin
151dc898f5 Update yarn.lock files 2020-11-05 12:28:39 +03:00
Viktor Fomin
ed84e89b94 web: common: bump version 2020-11-05 12:24:33 +03:00
Viktor Fomin
63015ca2bd Web: Common: fix color 2020-11-05 12:23:50 +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
Viktor Fomin
e2a32c10d6 Web: Common: added one row 2020-11-05 11:16:55 +03:00
Viktor Fomin
e4f6dd255e Web: Common: rename headers components 2020-11-05 11:15:15 +03:00
Viktor Fomin
1c2e8e5c67 Web: Common: create headline loader 2020-11-04 12:27:56 +03:00
Viktor Fomin
37fc3fff7c Web: Common: added x, y props 2020-11-04 12:24:52 +03:00
Viktor Fomin
46a9fe2e45 Web: Common: Create head loader 2020-11-04 12:21:13 +03:00
Viktor Fomin
0efd774bba Web: Common: Create rows loader 2020-11-04 01:54:44 +03:00
Viktor Fomin
a591a48e13 Web: Common: create tree folder loader 2020-11-03 23:00:43 +03:00
Viktor Fomin
234b323633 Web: Common: fix coordinate x 2020-11-03 22:59:36 +03:00
Viktor Fomin
c58a22748c Web: Common: Create circle loader 2020-11-03 20:22:32 +03:00
Viktor Fomin
f02e32894b Web: Common: added rectangle loader 2020-11-03 18:37:08 +03:00
Viktor Fomin
e99cdff1ad Web: Common: fix column size 2020-11-03 18:35:44 +03:00
Viktor Fomin
e9d3fe1775 Web: Common: added props for rectangle loader 2020-11-03 18:34:39 +03:00
Viktor Fomin
6ffd937480 Web: Common: fix loader style constant 2020-11-03 18:33:32 +03:00
04003a0fa4 Web: Common: update lock file 2020-11-03 17:26:47 +03:00
Viktor Fomin
8ec67a1c03 Web: Common: Create FilterLoader stories 2020-11-03 15:56:33 +03:00
Viktor Fomin
f1d5b08521 Web: Common: Fix filter loader 2020-11-03 15:55:51 +03:00
Viktor Fomin
1e4558a646 Web: Common: Create rectangle loader 2020-11-03 15:55:14 +03:00
Viktor Fomin
354fbe6038 Web: Common: added loader style constant 2020-11-03 15:54:21 +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
Artem Tarasov
61443b6e0a Web: Common: PageLayout: fixed position SectionToggler 2020-10-26 13:02:52 +03:00
Artem Tarasov
5f59dc385b Web: Common: PageLayout: fix article layout 2020-10-26 12:32:51 +03:00
Artem Tarasov
ebc9ae958b Web: Common: PageLayout: fixed article-pin-panel size 2020-10-26 11:59:46 +03:00
Artem Tarasov
b787b58b6c Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-10-26 09:32:29 +03:00
Vladislav Makhov
7b458a72c9 Merge branch 'develop' into feature/private-room
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-10-23 15:49:10 +03:00
cb849577fb Update yarn.lock files 2020-10-23 13:45:17 +03:00
b585313aa5 Update yarn.lock files 2020-10-23 12:21:57 +03:00
f6e261fc59 web: common: bump version 2020-10-23 12:02:09 +03:00
dc667af6ad Web: Common: Fixed login error handling 2020-10-23 11:51:53 +03:00
9df3a1cf64 Web: Files: Fixed display folder icon 2020-10-22 19:32:45 +03:00
2f86aef863 Web: Common: Applied display order on getRootForlders 2020-10-22 19:19:44 +03:00
6f8ed00dff Web: Common: Replaced getFoldersTree with single @root request 2020-10-22 18:51:31 +03:00
Alexey Kostenko
64a49dae95 web: common: bump version 2020-10-22 14:13:06 +03:00
Alexey Kostenko
bb00498c44 Web: Common/Components/Files: Fixed filter and file create field styles 2020-10-22 14:10:58 +03:00
Vladislav Makhov
06ecce0ca5 Add "isEncryptionSupport" mock. 2020-10-21 17:08:36 +03:00
Alexey Kostenko
3ff8dbca5e web: common: bump version 2020-10-21 16:54:43 +03:00
Alexey Kostenko
5f4921d341 Web: Files/Components/Common: Fixed row styles 2020-10-21 16:54:22 +03:00
Alexey Kostenko
d8fa9b1b60 Web: Common/Components: Style fix in filter and rowContainer 2020-10-21 15:05:08 +03:00
352c04fd5f
Merge branch 'develop' into feature/files-recent 2020-10-20 19:14:43 +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
05a6034b05
Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 20:53:59 +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
TatianaLopaeva
2dd956c700 Update yarn.lock files 2020-10-19 13:41:22 +03:00
ed50f3bc98 Update yarn.lock files 2020-10-16 16:38:11 +03:00
fc20655f0a web: common: bump version 2020-10-16 16:27:42 +03:00
142c6d5e07 Web: Common: Added prettier package 2020-10-16 16:17:49 +03:00
69bca43c6c web: common: bump version 2020-10-16 15:58:30 +03:00
f2fcf077a2 Web: Common: Fixed start PageLayout story and README 2020-10-16 15:56:35 +03:00
0181514267 Web: Common: Fixed self link 2020-10-16 15:55:47 +03:00
1a484f1805 Web: Common: Applied prettier style fix 2020-10-16 15:38:04 +03:00
7251a1e4d8 Web: Common: Fixed error handling 2020-10-16 15:24:37 +03:00
Vladislav Makhov
3491938aa4 Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-16 14:33:20 +03:00
Vladislav Makhov
ccab1949d5 Merge branch 'feature/files' 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/store/files/selectors.js
2020-10-16 11:28:31 +03:00
Ilya Oleshko
3e66f95546 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-15 13:39:31 +03:00
TatianaLopaeva
14bb36900c Update yarn.lock files 2020-10-15 11:22:58 +03:00
TatianaLopaeva
917cbe8a38 web: common: bump version 2020-10-15 10:56:17 +03:00
TatianaLopaeva
d4d7c9db0d Web: Common: fixed changing language of title toastr 2020-10-15 10:55:47 +03:00
Vladislav Makhov
02faf2a407 Refactoring 2020-10-14 19:01:53 +03:00
ea97ca05c2 Update yarn.lock files 2020-10-14 17:57:29 +03:00
d442e490f4 web: common: bump version 2020-10-14 17:47:23 +03:00
53c77d1a81 Web: Common: Removed useless folder param from API Files->getFolder with filter 2020-10-14 17:46:40 +03:00
Vladislav Makhov
4531619362 Merge branch 'feature/files' into feature/files-favorites 2020-10-14 13:45:13 +03:00
bac77e0ebd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
2020-10-13 18:17:31 +03:00
49f5a52433 Update yarn.lock files 2020-10-13 16:52:17 +03:00
2884bd8de3 web: common: bump version 2020-10-13 16:33:22 +03:00
746ecc7f40 Web: Clients: Fixed applying single cursor on loading 2020-10-13 16:20:49 +03:00
5d76e7e6b0 Web: Redesigned displaying of loading processes 2020-10-13 15:51:14 +03:00
bcbefb8f26 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-13 15:08:22 +03:00
Vladislav Makhov
632f83927b Merge branch 'feature/files' into feature/files-favorites 2020-10-13 14:26:31 +03:00
Artem Tarasov
24a0fe17b4 web: common: bump version 2020-10-13 13:45:40 +03:00
Artem Tarasov
a4a959f972 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 13:43:16 +03:00
3d34978bf0 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-13 13:39:10 +03:00
01f00d49ae web: common: bump version 2020-10-13 13:32:46 +03:00
1d4b3785bb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-13 13:31:24 +03:00
0712677297 Web: Common: fixed MediaViewer close, fixed share dropdown styles 2020-10-13 13:30:26 +03:00
TatianaLopaeva
4ef2db2ed0 Web: Update yarn.lock 2020-10-13 12:37:34 +03:00
TatianaLopaeva
dbdc134ef0 web: common: bump version 2020-10-13 12:18:48 +03:00
TatianaLopaeva
ac697d28fc Web: Added getLanguage selector 2020-10-13 12:17:45 +03:00
TatianaLopaeva
f0299db016 Update yarn.lock 2020-10-13 11:14:09 +03:00
TatianaLopaeva
8d09a45fab web: common: bump version 2020-10-13 10:54:49 +03:00
TatianaLopaeva
6a0e34a7a2 Web: Common: Added language into array of useEffect 2020-10-13 10:52:44 +03:00
577fc5ac70 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
2020-10-12 15:36:26 +03:00
Vladislav Makhov
22da8b836d fix after merge 2020-10-12 15:31:21 +03:00
Artem Tarasov
8453611714 Web: Common: added SettingsFiles loader 2020-10-12 14:52:49 +03:00
Vladislav Makhov
a179ae0e6c Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-12 14:45:53 +03:00
Vladislav Makhov
7aaeddedb2 Add pushing to recently viewed 2020-10-12 14:37:52 +03:00
Vladislav Makhov
9ea5a648e9 Fix code after merge 2020-10-12 11:02:22 +03:00
Vladislav Makhov
2476b306f9 Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	web/ASC.Web.Common/src/api/files/index.js
#	web/ASC.Web.Components/package.json
2020-10-12 10:04:24 +03:00
ee6307e288 Web: People: Added hack for build machine only 2020-10-09 19:14:48 +03:00
3afd5dedda web: common: bump version 2020-10-09 19:07:10 +03:00
f4ed52d985 Web: Added and applied new API method getDocServiceUrl 2020-10-09 19:06:50 +03:00
a01fb879a4 Web: Common: remove duplicate getIsLoaded selector 2020-10-09 18:28:02 +03:00
615f514bfd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-10-09 17:24:50 +03:00
Artem Tarasov
128d25ef9b web: common: bump version 2020-10-09 16:11:00 +03:00
Artem Tarasov
421d71c4fe Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Common/src/components/Loaders/index.js
2020-10-09 15:58:50 +03:00
Artem Tarasov
5a5fb5b036 Web: Common: added ProfileViewLoader 2020-10-09 15:57:04 +03:00
1dfd7afe1c Update yarn.lock files 2020-10-09 15:07:41 +03:00
4a57d0d646 web: common: bump version 2020-10-09 14:58:32 +03:00
065c8daaa0 Web: People: Applied Filter loader 2020-10-09 14:57:43 +03:00
226d4c6cc5 Web: Files: Add and applied Filter loader 2020-10-09 14:23:40 +03:00
a969f26f05 Web: Common: fixed getFoldersTree api 2020-10-09 00:23:36 +03:00
cedca7b3c3 Web: Common: added rootFolderType to getFoldersTree api 2020-10-08 23:56:57 +03:00
4e84d5f5ae Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-10-08 16:58:09 +03:00
Vladislav Makhov
b4d3dc0114 Fix code after merge 2020-10-08 16:23:57 +03:00
798170e402 web: common: bump version 2020-10-08 12:43:21 +03:00
34575dab83 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-08 12:43:07 +03:00
e3fde6fd77 Web: Common: fixed main height 2020-10-08 12:42:59 +03:00
Vladislav Makhov
c59be4f0dd Fix code after merge 2020-10-08 11:08:58 +03:00
Artem Tarasov
608109f4a0 web: common: bump version 2020-10-08 10:29:06 +03:00
Artem Tarasov
e1fd3f211a Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword 2020-10-08 10:28:36 +03:00
6cf7358b92 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-08 10:25:37 +03:00
Vladislav Makhov
a72c087e2a Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-08 10:18:06 +03:00
cbcf6bef85 Web: Files: removed auth selectors from files 2020-10-07 17:23:02 +03:00
Vladislav Makhov
b24bc1f05a Merge branch 'feature/files' into feature/files-favorites
# 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
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-07 17:11:40 +03:00
9d87b8de09
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
2020-10-07 16:52:54 +03:00
ca37d2134d Web: Files: Applied API changes on server in files filtering 2020-10-07 16:41:05 +03:00
TatianaLopaeva
34506827b5 Update yarn.lock 2020-10-07 15:53:29 +03:00
Vladislav Makhov
e7fc2fef13 Add Recent to the tree node. 2020-10-07 14:26:08 +03:00
42a1b993f1 web: common: bump version 2020-10-07 14:06:43 +03:00
63f6e26eea Web: Common: added new selectors, added rootFolderName field to getFoldersTree api 2020-10-07 14:06:28 +03:00
11348e5fba Update yarn.lock files 2020-10-07 12:58:38 +03:00
1475af5f28 web: common: bump version 2020-10-07 12:49:50 +03:00
cbde3120aa Web: Common: Removed Layout and StudioLayout components 2020-10-07 12:48:38 +03:00
7fb3ce6c09 Web: People: Added groups for API people loading 2020-10-06 19:07:10 +03:00
f9bf1dc7d7 Web: Common: Removed useless code 2020-10-06 18:18:36 +03:00
Vladislav Makhov
e265dbf7c5 fix index by agreement 2020-10-06 15:03:29 +03:00
3ad873f1c8 Web: People: Restored fields in filtering data 2020-10-06 12:46:10 +03:00
fcc1ca32dd Web: Fixed showing Error404 before user not loaded 2020-10-06 11:53:56 +03:00
Vladislav Makhov
1992be53b8 Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
2020-10-06 11:40:12 +03:00
af756a1e76 Web: Fixed opening @self profile view 2020-10-06 11:33:53 +03:00
8f086d1183 Web: Fixed NavMenu crash on currentProduct equals null 2020-10-06 10:10:42 +03:00
8d7cf4f2dc Web: Replaced getCurrentModule with getCurrentProduct selector 2020-10-05 20:56:36 +03:00
a6bc650da6 Web: Common: NavMenu refactoring 2020-10-05 18:25:01 +03:00
63ee865d98 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/utils/index.js
2020-10-05 15:37:09 +03:00
978b67f7a7 Update yarn.lock files 2020-10-05 14:46:07 +03:00
3de5601671 web: common: bump version 2020-10-05 14:28:41 +03:00
d00d16ee02 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/utils/index.js
#	web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
Vladislav Makhov
e697ae9cff Minor fixes 2020-10-02 10:41:24 +03:00
7bbba5f158 Web: People: Re-written Home/Body with selectors and reselect + refactoring 2020-10-01 22:01:52 +03:00
Artem Tarasov
b4c144df74 Web: Common: refactoring createPasswordHash 2020-10-01 19:04:10 +03:00
c008acee57 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
2020-10-01 17:32:12 +03:00
e936ab4fc0 web: common: bump version 2020-10-01 13:16:53 +03:00
3b2648b18c Web: Common: fixed main wrapper height 2020-10-01 13:16:31 +03:00
Artem Tarasov
053b3c902c refactoring getPortalSettings 2020-10-01 11:42:59 +03:00
Artem Tarasov
db7ac80645 refactoring getPortalSettings 2020-10-01 09:56:22 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
TatianaLopaeva
2261880855 Added language into array of useEffect(StudioLayout) and refactoring changeLanguage function 2020-10-01 09:08:25 +03:00
TatianaLopaeva
2c1adaadde web: common: bump version 2020-10-01 09:04:56 +03:00
TatianaLopaeva
015b985755 web: common: bump version 2020-10-01 09:01:15 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
Artem Tarasov
45e70f6d11 fixed missing hashSettings after logout 2020-10-01 00:46:33 +03:00
Artem Tarasov
17d999f538 refactoring 2020-10-01 00:44:49 +03:00