Commit Graph

1238 Commits

Author SHA1 Message Date
Artem Tarasov
f2d15f07f8 Web: People: Filter: changed translation of elements in the sorting list 2020-11-20 12:43:35 +03:00
Alexey Kostenko
3702bd597d Web: Common: Refactoring HOC withLayoutSize 2020-11-17 10:32:02 +03:00
Alexey Kostenko
99ae4dba20 Web: People: Changed Consumer to HOC 2020-11-17 06:39:08 +03:00
Alexey Kostenko
af8ce86d2d Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-16 12:36:55 +03:00
Viktor Fomin
4c398104cb Update yarn.lock files 2020-11-12 15:06:18 +03:00
Alexey Kostenko
913c45a00b Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-12 14:40:46 +03:00
Viktor Fomin
9890f1cc43 Update yarn.lock files 2020-11-12 13:37:13 +03:00
Viktor Fomin
0bb00e39db Web: People: added header loader 2020-11-12 13:31:19 +03:00
Alexey Kostenko
366989ea9c Web: People: Added sectionWidth prop to filterInput 2020-11-12 11:23:08 +03:00
Viktor Fomin
3dc69fc9e8 Web: People: added group loader 2020-11-12 00:12:28 +03:00
Viktor Fomin
45e9ab5aea Merge branch 'develop' into feature/filter-loader 2020-11-11 23:26:03 +03:00
d8bd2b7d21 Update yarn.lock files 2020-11-11 22:03:47 +03:00
c4411f7b00
Merge branch 'develop' into hotfix/section-loader 2020-11-11 21:54:02 +03:00
Viktor Fomin
d2a30544d6 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-11 17:38:10 +03:00
Viktor Fomin
91bc88ad28 Update yarn.lock files 2020-11-11 17:37:48 +03:00
Viktor Fomin
2cc252c2ae
Merge branch 'develop' into feature/filter-loader 2020-11-11 16:42:22 +03:00
Artem Tarasov
006ac1bb19 Update yarn.lock files 2020-11-11 16:16:30 +03:00
Alexey Kostenko
63dad62226 Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page) 2020-11-11 15:46:46 +03:00
Alexey Kostenko
7a6a9b539b Web: People: Fixed loading of the main page when switching from a profile 2020-11-11 14:09:40 +03:00
Viktor Fomin
40e2d85dbd Update yarn.lock files 2020-11-11 13:27:17 +03:00
Viktor Fomin
0852dd0814 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-10 18:25:25 +03:00
Viktor Fomin
2ebd7e882c Web: People: fix first loader 2020-11-10 18:20:56 +03:00
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
a82551568b Web: People: fix props name 2020-11-10 17:30:43 +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
Viktor Fomin
834e8e6516 Update yarn.lock files 2020-11-10 10:46:26 +03:00
Viktor Fomin
8648abedbd Web: People: delete first header preloader 2020-11-10 10:40:33 +03:00
Viktor Fomin
afd252e2ce Web: People: fix profile action loader 2020-11-10 03:08:59 +03:00
Viktor Fomin
a7dee56194 Update yarn.lock files 2020-11-09 23:01:57 +03:00
Viktor Fomin
9f19173195 Web: People: added circle in row 2020-11-09 22:57:02 +03:00
Viktor Fomin
6e8685d8d6 Update yarn.lock files 2020-11-09 16:54:13 +03:00
Viktor Fomin
b3f4bd3f64 Update yarn.lock files 2020-11-09 15:16:44 +03:00
Viktor Fomin
33ef924307 Web: People: fix first loader 2020-11-09 15:11:04 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
884cb67a35 Web: People: delete logo 2020-11-09 13:07:43 +03:00
Viktor Fomin
445b2e83b5 Web: People: delete loading label 2020-11-09 12:37:13 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
Viktor Fomin
b1f9db662d Web: People: fix color 2020-11-06 16:17:56 +03:00
Viktor Fomin
151dc898f5 Update yarn.lock files 2020-11-05 12:28:39 +03:00
Artem Tarasov
38c7faec04 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-05 11:57:55 +03:00
Artem Tarasov
ace2111197 Web: People: applied prop size for Avatar Component 2020-11-05 11:40:19 +03:00
Viktor Fomin
3bdff517f9 Web: People: rename headers components 2020-11-05 11:16:33 +03:00
Artem Tarasov
df9a1658e9 Web: People: refactoring 2020-11-05 09:44:20 +03:00
Artem Tarasov
6a4cabcedf Web: Components/Files/People: fix styles 2020-11-05 09:22:14 +03:00
Viktor Fomin
72467a70c2 Web: People: fix header loader 2020-11-04 12:24:02 +03:00
Viktor Fomin
91c254c638 Web: Common: fix main button loader 2020-11-03 18:36:19 +03:00
Vladislav Makhov
22a494a5ad yarn.lock update 2020-11-03 17:39:49 +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
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +03:00