Commit Graph

865 Commits

Author SHA1 Message Date
Ilya Oleshko
e44a78a94b Web: People: Fixed translations on Profile page 2019-12-25 13:36:32 +03:00
Ilya Oleshko
ca1eb07e8c Web: People: Fixed max-width CSS property for User page 2019-12-25 12:47:44 +03:00
10739ad361 ASC.People: ProfileAction: createUserForm: unnecessary code removed 2019-12-25 11:24:43 +03:00
51e9f790b4 ASC.People: ProfileAction: Added remove button for contact information 2019-12-25 09:57:57 +03:00
38cffb5471 ASC.People: ProfileAction: CSS styles and translations changed 2019-12-24 14:15:49 +03:00
47d4ba6f17 ASC.People: ProfileAction: InfoFieldContainer: using Heading from asc-web-components 2019-12-24 12:48:35 +03:00
Nikolay Rechkin
9e0995ac00
Merge pull request #17 from ONLYOFFICE/feature/ef
Feature/ef
2019-12-24 10:54:47 +03:00
10e9a07c18 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-24 09:56:14 +03:00
ddf5a606a1 web: Update yarn.lock files 2019-12-24 09:56:03 +03:00
6a4e992c70 ASC.People: Home page: user link fontWeight changed 2019-12-24 09:52:54 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
224e6adc45 Merge branch 'master' into feature/consumers 2019-12-23 15:57:49 +03:00
2b5dd8b3cf Merge branch 'master' into feature/ef 2019-12-23 15:47:10 +03:00
Ilya Oleshko
122b315a5a Web: People: Fixed Import button visibility at Article component 2019-12-23 14:06:29 +03:00
b686e99f16 web: Common: Moved Layout and PageLayout to asc-web-common 2019-12-20 14:35:53 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
Ilya Oleshko
0552ee6673 Web: People: Fixed row side info truncate for Text component at People row 2019-12-20 11:58:08 +03:00
Daniil Senkiv
c16cd68f8f Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-20 10:50:45 +03:00
Daniil Senkiv
9933f626b3 People.Client: Home: added translations 2019-12-19 15:21:24 +03:00
ead6333081 Web: People: fixed help-button position 2019-12-19 12:27:45 +03:00
ed66ce7dc4
Merge pull request #18 from ONLYOFFICE/feature/advanced-selector-v2
Feature/advanced selector v2
2019-12-19 12:02:42 +03:00
Ilya Oleshko
774edf4485 Web: People: Fixed info containers width for Profile page 2019-12-19 11:48:09 +03:00
218ece84e4 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
2019-12-19 10:15:25 +03:00
Ilya Oleshko
c52c2ead85 Web: People: Fixed truncate user with single group on Home page 2019-12-19 09:48:46 +03:00
Ilya Oleshko
a08a8a89d1 Web: People: Fixed color of side information about user on Home page 2019-12-18 16:40:16 +03:00
84c159c73d Merge branch 'master' into feature/ef 2019-12-18 16:36:36 +03:00
9ac0e2c8c9 web: People: Refactoring of GroupAction + fixed onCancelSelector by self click 2019-12-18 16:24:09 +03:00
Ilya Oleshko
c82216951d Web: People: Fixed header actions buttons for Reassign page 2019-12-18 15:14:27 +03:00
Ilya Oleshko
e685a143ad Web: People: Fixed header actions buttons for ProfileAction page 2019-12-18 15:14:12 +03:00
Ilya Oleshko
cc6022f7b8 Web: People: Fixed header actions buttons for Profile page 2019-12-18 15:13:56 +03:00
Ilya Oleshko
60d02cb4a6 Web: People: Fixed header actions buttons for Import page 2019-12-18 15:13:37 +03:00
Ilya Oleshko
f8a2ca1884 Web: People: Fixed header actions buttons for Home page 2019-12-18 15:13:21 +03:00
Ilya Oleshko
74f3a9dc6d Web: People: Fixed header actions buttons for GroupAction page 2019-12-18 15:12:49 +03:00
4079f59b1e Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	web/ASC.Web.Components/src/components/advanced-selector/index.js
# Modified:
#       web/ASC.Web.Components/src/components/AdvancedSelector/AdvancedSelector.js
2019-12-18 15:11:09 +03:00
5379b1b7eb web: People: Added onCancel handler for selectors 2019-12-18 14:41:36 +03:00
157dc1c7d6 Merge branch 'master' into feature/ef 2019-12-16 17:58:49 +03:00
Ilya Oleshko
31fd91d5f4 Web: People: Fixed Link truncate for People row 2019-12-16 15:20:18 +03:00
Ilya Oleshko
dcf9c3ec2c Web: People: Increased space between contacts 2019-12-16 12:24:12 +03:00
77b1f2b252 web: Update yarn.lock files 2019-12-15 18:26:17 +03:00
3b88c07178 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/src/components/index.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/src/components/advanced-selector/index.js
#	web/ASC.Web.Components/src/components/help-button/index.js
#	web/ASC.Web.Components/src/index.js
#       web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed]
#
2019-12-14 12:32:31 +03:00
5eeff88737 web: New packages fixes 2019-12-13 16:58:09 +03:00
NikolayRechkin
3fb01e78ac web: forbade a scalability 2019-12-13 13:25:09 +03:00
Daniil Senkiv
c9bf214df8 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-13 10:31:48 +03:00
NikolayRechkin
07e3cefb5c web: use Service Worker in production 2019-12-13 10:19:03 +03:00
2758fb1dfb Merge branch 'master' into feature/ef 2019-12-12 17:53:54 +03:00
Daniil Senkiv
1d084ab4e1 People: applied EmailInput component to ProfileAction component 2019-12-12 15:59:18 +03:00
Ilya Oleshko
b0023c3f14 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-11 15:30:35 +03:00
Ilya Oleshko
f7aca727ac Web: People: Fixed usage ComboButton on GroupAction page 2019-12-11 15:25:44 +03:00
9ddbbdc52e
Merge pull request #15 from ONLYOFFICE/feature/pwa
Feature/pwa
2019-12-11 15:23:38 +03:00