Commit Graph

1355 Commits

Author SHA1 Message Date
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +03:00
9f8ff83084 Update yarn.lock files 2020-12-25 16:24:26 +03:00
2b08c711dc Update Create-react-app to v4.0.1 2020-12-25 16:01:04 +03:00
20900eeb72 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-12-25 12:09:52 +03:00
9350f1189e Bump version to v0.0.5 2020-12-24 12:22:48 +03:00
76d7ed6c73 Merge branch 'master' into develop
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
7803696e01 Update yarn.lock files 2020-12-23 12:43:27 +03:00
1d5fc44dac Web: People: Added target for link 2020-12-23 11:57:09 +03:00
cffb61d1a5 Web: People: Added translation for success of sending the invitation 2020-12-23 11:43:53 +03:00
352ec309b8 Web: People: Fixed displaying errors on language change 2020-12-23 11:34:21 +03:00
2d9906f6a1 Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users 2020-12-22 15:34:19 +03:00
50b45b785a Web: People: fixed access to editing the profile for the user, fixed the registration date 2020-12-22 14:55:35 +03:00
06de1efbae Update yarn.lock files 2020-12-22 11:59:57 +03:00
4f8c04a10f Web: People: Fixed displaying SectionHeader loader 2020-12-22 11:50:44 +03:00
a54a735cfa Web: People: Fixed displaying not found language in combobox 2020-12-22 11:36:07 +03:00
Alexey Kostenko
c3fbf9fc93 Web: Files/People: Removed hover on mobile devices in page navigation buttons 2020-12-21 17:56:25 +03:00
853f8fa8df Web: People: fixed access to the profile 2020-12-18 15:44:04 +03:00
8f3de38301 Web: People: hid edit button if profile is disabled 2020-12-18 15:36:00 +03:00
TatianaLopaeva
02949cc644 Web: People: Article: Deleted useless console.log. 2020-12-18 09:47:15 +03:00
f42fc72cf9 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-17 21:03:48 +03:00
53f510ae18 Bump version to v0.0.4 2020-12-17 21:00:36 +03:00
TatianaLopaeva
def290f8eb Web: People: Fixed displaying of header (Android). 2020-12-17 20:16:26 +03:00
326d234773 Update yarn.lock files 2020-12-17 18:35:04 +03:00
de4e0de1ed Web: People: remove useless console.log from ProfileInfo 2020-12-17 17:40:10 +03:00
42a496f442 Web: People: removed componentDidMount from filter, fixed profile group select 2020-12-17 17:37:22 +03:00
9da7eb90b0 Web: People: fixed minDate, maxDate to profile dates 2020-12-17 15:17:32 +03:00
c573e23b0b Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 12:37:41 +03:00
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
2b766b2862 Web: People: fixed Row checkedProps 2020-12-17 12:36:02 +03:00
Ilya Oleshko
2fe145d556 Web: People : Home : Fixed group menu out of screen 2020-12-17 12:19:18 +03:00
d849ac9c38 Web: People: Fixed empty phone and password inputs in ProfileAction 2020-12-17 12:08:57 +03:00
91a9255bbc Web: People: fixed access to action menu 2020-12-17 11:11:12 +03:00
bc2bea064f Web: People: added minDate to DatePicker 2020-12-17 11:09:44 +03:00
02698ae515 Web: People: fixed GroupAction translations 2020-12-17 11:06:46 +03:00
41bca489bb Fixed versions (About version) 2020-12-16 19:09:56 +03:00
Artem Tarasov
a0f5261576 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-14 20:59:14 +03:00
Ilya Oleshko
460b1ec0d9 Web: People : Home : Fixed fetch users after profile navigation 2020-12-11 16:03:48 +03:00
TatianaLopaeva
aa6eebb51b Web: Files/People: Home: Fixed the displaying load of section header 2020-12-11 14:21:37 +03:00
Artem Tarasov
72a21a1def Merge branch 'develop' into bugfix/dropdown-fix 2020-12-10 20:46:24 +03:00
356ace1c57 Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:14:58 +03:00
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
Alexey Kostenko
abda53a082 Web: Files/People/Common: Fixed header styles 2020-12-10 13:31:53 +03:00
Alexey Kostenko
1a53841499 Web: Files/People/Common: Fixed header style 2020-12-10 09:48:35 +03:00
Artem Tarasov
6511557445 Web: Components/People: applied prop showDisabledItems 2020-12-09 13:09:41 +03:00
Artem Tarasov
fb10d00272 Web: Files/Components/Common/People: z-index fix 2020-12-09 10:59:04 +03:00
Artem Tarasov
854acc0b1a Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-08 23:03:42 +03:00
4d88b2fc28 Update yarn.lock files 2020-12-08 18:37:19 +03:00
ce4a3e3338 Update yarn.lock files 2020-12-08 18:17:46 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
Artem Tarasov
34d246deaf Web: Components/Files/People: z-index fix 2020-12-08 14:16:23 +03:00
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Ilya Oleshko
bd13067d0b Web: Added fast-deep-equal 2020-12-08 14:08:26 +03:00
Artem Tarasov
071f6c27c3 Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-12-08 13:15:02 +03:00
Ilya Oleshko
4147d2f31a Web: Fixed temp loaders 2020-12-07 11:11:04 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
Artem Tarasov
93da24a63a Web: Common/Files/People: fixed z-index 2020-12-04 14:58:37 +03:00
0784453daf Fix errors on login and logout 2020-12-04 14:21:51 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00
a39192ff21 Web: Common: added new containers styles, added classNames to people and files containers 2020-12-03 18:03:05 +03:00
f10f6b8d3b Update yarn.lock files 2020-11-30 15:11:23 +03:00
4ad116937a Merge branch 'develop' into bugfix/fix-empty-screen-description 2020-11-30 13:27:35 +03:00
c029a2df04 Web: People: fixed text alignment 2020-11-30 12:15:45 +03:00
8c965fa4e1 Web: People: changed empty screen description, fixed icons alignment 2020-11-28 13:44:31 +03:00
a0adc29899 Web: People: fixed alignment and color of icons 2020-11-28 13:15:30 +03:00
83e4db1e7f Web: People: removed useless buttons styles 2020-11-28 13:05:10 +03:00
2b7480a200 Web: People: fixed headers fontWeight 2020-11-28 13:03:53 +03:00
afc280904b Web: People: fixed passwordSettings minLength 2020-11-26 12:27:09 +03:00
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