|
|
1870e125f9
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-12-26 12:24:00 +03:00 |
|
|
|
a45db44549
|
Web: People: fixed clickability of department icon
|
2019-12-26 12:23:54 +03:00 |
|
|
|
763136b4b3
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-12-26 12:12:20 +03:00 |
|
|
|
3241a4f25c
|
web: People: Fixed goBack actions
|
2019-12-26 12:12:13 +03:00 |
|
NikolayRechkin
|
779e04eb5b
|
web: people: added placeholder for filter input field
|
2019-12-26 11:46:05 +03:00 |
|
Daniil Senkiv
|
19f391bf0d
|
Merge branch 'master' into feature/separated-modal-dialogs
|
2019-12-26 10:15:09 +03:00 |
|
Daniil Senkiv
|
567f006285
|
People.Client: Profile: createUserForm: added hasError prop to EmailInput
|
2019-12-25 18:23:46 +03:00 |
|
|
|
aea429a0ad
|
Api: people. Fixed saving contacts
|
2019-12-25 18:16:29 +03:00 |
|
Daniil Senkiv
|
9b480c349b
|
Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# web/ASC.Web.Components/package.json
|
2019-12-25 17:44:37 +03:00 |
|
Daniil Senkiv
|
b739b15c77
|
People.Client: dialogs: replaced functions to arrow functions
|
2019-12-25 17:28:38 +03:00 |
|
Daniil Senkiv
|
14b88b8d56
|
People.client: changeEmailDialog: fixed translations
|
2019-12-25 17:21:04 +03:00 |
|
Daniil Senkiv
|
bb39cb5611
|
people.client: changeEmailDialog: added prop user instead of 2 props
|
2019-12-25 17:18:49 +03:00 |
|
Daniil Senkiv
|
7bc8e59172
|
people.client: fixed conflict
|
2019-12-25 16:43:03 +03:00 |
|
|
|
ff5de59b3e
|
ASC.People: ProfileAction: Fixed translations
|
2019-12-25 15:58:12 +03:00 |
|
Ilya Oleshko
|
6f969da694
|
Web: People: Fixed profile info order on Profile page
|
2019-12-25 13:37:11 +03:00 |
|
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 |
|
Daniil Senkiv
|
177b50909e
|
Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
|
2019-12-25 11:37:34 +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 |
|
Daniil Senkiv
|
fca6ed2675
|
People.Client: dialogs: ChangeEmailDialog: fixed error "Can't perform a React state update on an unmounted component."
|
2019-12-23 14:01:01 +03:00 |
|
Daniil Senkiv
|
157f1c7d10
|
web.components: EmailInput: changed util for validating email, applied changes to EmailInput component. Applied EmailInput changes for all using places. Fixed readme.
Added new translations for validation errors.
|
2019-12-23 12:02:03 +03:00 |
|
Daniil Senkiv
|
2b74c0c4b5
|
People.Client: dialogs: ChangeEmailDialog: added keyup Enter handling
|
2019-12-20 15:24:17 +03:00 |
|
Daniil Senkiv
|
68b0afe9ad
|
People.Client: dialogs: ChangeEmailDialog: added translations
|
2019-12-20 15:23:07 +03:00 |
|
Daniil Senkiv
|
5a472bb41b
|
Merge branch 'master' into feature/separated-modal-dialogs
|
2019-12-20 15:06:13 +03:00 |
|
Daniil Senkiv
|
dd182088cc
|
People.Client: dialogs: ChangeEmailDialog: applied FieldContainer, deleted disabling send button
|
2019-12-20 14:46:51 +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
|
40bbe9a0d9
|
Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
|
2019-12-20 11:37:11 +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 |
|
Daniil Senkiv
|
85cd5c41ba
|
People.Client: dialogs: ModalDialogContainer: fixed styles
|
2019-12-19 14:05:08 +03:00 |
|
Daniil Senkiv
|
305a3b229f
|
People.Client: dialogs: InviteDialog: added ru translations
|
2019-12-19 14:03:40 +03:00 |
|
Daniil Senkiv
|
b3e17009d4
|
People.Client: dialogs: deleted cancel button
|
2019-12-19 13:38:32 +03:00 |
|
|
|
ead6333081
|
Web: People: fixed help-button position
|
2019-12-19 12:27:45 +03:00 |
|
Daniil Senkiv
|
729f681411
|
Merge branch 'master' into feature/separated-modal-dialogs
|
2019-12-19 12:05:50 +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 |
|
