Daniil Senkiv
ff47af27b9
People.Client: ProfileInfo: deleted unused ModalDialog component
2020-01-16 14:09:08 +03:00
Daniil Senkiv
de54bcf86b
Web.Common: PageLayout: fixed section-header style for content
2020-01-16 12:25:28 +03:00
Daniil Senkiv
258ec92046
People.Client: Home: deleted unused ModalDialog component
2020-01-15 18:40:50 +03:00
Daniil Senkiv
3212a46035
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-01-15 17:48:04 +03:00
Daniil Senkiv
31dd1e903f
Web.Common: PageLayout: fixed section header style
2020-01-15 17:38:40 +03:00
09426943b2
web: People: Update all dependencies
2020-01-15 11:59:25 +03:00
Daniil Senkiv
0a09aaaa07
Web.Common: AdvancedSelector: fixed styles, reverted ( c6fbf51389)
2020-01-13 16:27:18 +03:00
Daniil Senkiv
c6fbf51389
People.Client: DepartmentField: fixed border-color style for input
2020-01-13 15:24:43 +03:00
Daniil Senkiv
4a0deedd7d
People.Client: fixed placeholder, fixed GroupSelector component
2020-01-13 12:48:07 +03:00
Daniil Senkiv
2011543224
People.Client: added link to social profiles and contact information
2020-01-10 20:31:04 +03:00
Daniil Senkiv
1b78e52321
People.Client: GroupAction: added Enter handling for creating department
2020-01-10 16:41:35 +03:00
Daniil Senkiv
e7779cdec2
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-01-09 17:42:18 +03:00
Daniil Senkiv
dea42683cf
People.Client: InviteDialog: deleted unused translations
2020-01-09 17:42:05 +03:00
25fc0669f7
web: Fixed handleAnyClick for DropDown
2020-01-09 16:27:49 +03:00
Ilya Oleshko
d22352e75e
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-27 15:59:47 +03:00
a63abfc9b7
ASC.People: AvatarEditor: added file selection text for mobile devices
2019-12-27 15:56:12 +03:00
Ilya Oleshko
b1e289ebb9
Web: People: Home: Fixed filter sorting style
2019-12-27 15:55:57 +03:00
4f1080da05
ASC.People: ProfileAction: enlarged button area
2019-12-27 15:31:12 +03:00
8dcff0883d
ASC.People: Home: fixed fontWeight in user list
2019-12-27 14:26:46 +03:00
b3e65be930
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 14:03:42 +03:00
692279b4b0
ASC.People: GroupAction, ProfileAction: using combobox default option
2019-12-27 14:03:35 +03:00
06afd70b7f
web: People: Fixed font-weight in Group Name TextInput
2019-12-27 13:59:41 +03:00
Daniil Senkiv
fe044697d3
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 13:41:46 +03:00
48e56d462a
Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list
2019-12-27 13:19:35 +03:00
ddb222fd86
ASC.People: GroupAction: search block is hidden because it requires clarification of its work on large lists
2019-12-27 11:43:55 +03:00
Daniil Senkiv
9850473222
People.Client:dialogs: fixed email style
2019-12-27 11:42:44 +03:00
10918fe9e1
Web: People: fixed merge
2019-12-27 11:05:06 +03:00
87e17ff100
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js
2019-12-27 10:53:11 +03:00
5430f8c734
Web: People: fixed icon arrow clickability
2019-12-27 10:49:14 +03:00
Daniil Senkiv
8a65ac9cec
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 10:19:18 +03:00
1f15f4f1e2
ASC.People: GroupAction: truncate header text
2019-12-27 10:17:17 +03:00
Daniil Senkiv
e87b17e6c9
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 10:14:31 +03:00
d94d386f57
ASC.People: GroupAction: max-width: 1024px
2019-12-27 09:49:05 +03:00
fcdf0a0f97
ASC.People: GroupAction: Grid styled selected-items
2019-12-26 18:34:19 +03:00
a8d4d0b6a9
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-12-26 17:08:36 +03:00
e0a9fabb0b
Web: Common: fixed help-button styles
2019-12-26 17:08:24 +03:00
d1099fdb79
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-26 16:55:30 +03:00
386fa9df6e
ASC.People: ProfileAction: Fixed header text
2019-12-26 16:55:06 +03:00
3f69ca4860
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 16:23:52 +03:00
47f0428931
web: People: Replaced bind to separated methods
2019-12-26 16:23:42 +03:00
a7ad25fee5
ASC.People: GroupAction: Fixed translations
2019-12-26 16:08:24 +03:00
193651b382
Web: People: fixed profile arrow clickability
2019-12-26 15:41:26 +03:00
a6aed107fc
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-26 15:26:14 +03:00
87bfe9ffbe
ASC.People: GroupAction: indentation fixed
2019-12-26 15:26:07 +03:00
82023841f4
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 15:12:23 +03:00
cca92425d0
ASC.People: GroupAction: Fixed translations
2019-12-26 15:11:38 +03:00
1aff07e97f
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 15:11:33 +03:00
91c528a8e3
web: People: Hidden not implemented InviteAgain action
2019-12-26 15:11:24 +03:00
edd654a2a4
web: People: Change IconButton to ContextMenuButton with more actions
2019-12-26 15:10:39 +03:00
619615a2ad
ASC.People: customNames: Fixed translations
2019-12-26 14:51:14 +03:00
46dce238b2
Web: People: fixed help-button clickability
2019-12-26 13:49:41 +03:00
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
Daniil Senkiv
54121b1323
People.Client: fixed TreeMenu colors
2019-12-26 12:00:15 +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
Daniil Senkiv
239dfe56c0
Merge branch 'master' into feature/separated-modal-dialogs
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
2019-12-19 11:36:00 +03:00
Daniil Senkiv
021541c7a3
People.Client: dialogs: ChangeEmailDialog: fixed, added new lifecycle method
2019-12-19 10:36:35 +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
Daniil Senkiv
f787b010ee
People.Client: dialogs: changeEmailDialog: fixed disabling button
2019-12-18 16:30:51 +03:00
9ac0e2c8c9
web: People: Refactoring of GroupAction + fixed onCancelSelector by self click
2019-12-18 16:24:09 +03:00
Daniil Senkiv
3aad0ff8e3
People.Client: Home: changeEmailDialog: fixed error after finishing request
2019-12-18 16:14:27 +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
Daniil Senkiv
1681a0698f
People.Client: dialogs: removed unused translation wrapper, renamed components
2019-12-17 10:58:42 +03:00
Daniil Senkiv
5aec0beba5
People.Client: dialogs: added ModalDialogContainer with common parts, applied to dialogs
2019-12-17 09:46:10 +03:00
Daniil Senkiv
16b6ba47e5
People.Client: dialog: ChangePhoneDialog: added Todo description for future replacement
2019-12-17 09:10:25 +03:00
Daniil Senkiv
760c6b3110
People.Client: dialog: ChangeEmailDialog: rename prop newEmail to email
2019-12-17 09:06:02 +03:00
Daniil Senkiv
ad6f1c3e46
People.Client: dialog: ChangeEmailDialog: moved id from state to props
2019-12-17 08:52:56 +03:00
157dc1c7d6
Merge branch 'master' into feature/ef
2019-12-16 17:58:49 +03:00
Daniil Senkiv
69896e85fe
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-16 17:19:44 +03:00
Daniil Senkiv
921bf871ba
People.Client: ProfileAction: added dataDialog prop for handling any dialog through one function
2019-12-16 17:08:44 +03:00
Daniil Senkiv
40923113ea
People.Client: changed names of state variables
2019-12-16 16:16:36 +03:00
Daniil Senkiv
c5ba56b370
People.Client: refactoring, changed state structure for applied ModalDialogs
2019-12-16 16:08:00 +03:00
Ilya Oleshko
31fd91d5f4
Web: People: Fixed Link truncate for People row
2019-12-16 15:20:18 +03:00
Daniil Senkiv
c350a2429c
People.Client: Dialogs: changed import, renamed Invite component
2019-12-16 14:34:18 +03:00
Daniil Senkiv
a601f8f93d
People.Client: Dialogs: added ChangePhoneDialog component, applied to Profile component
2019-12-16 14:15:52 +03:00
Daniil Senkiv
3177aa5026
People.Client: Dialogs: added DeleteProfileEverDialog component, applied to Home and Profile component
2019-12-16 13:23:32 +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
Daniil Senkiv
8a9788c61c
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-14 13:46:24 +03:00
Daniil Senkiv
db13e239b2
People.Client: applied changeEmailDialog, changePasswordDialog to Profile component
2019-12-14 13:12:43 +03:00
Daniil Senkiv
49da1505b3
People.Client: Dialogs: added DeleteSelfProfileDialog component, applied to Home and Profile component
2019-12-14 12:45:31 +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
Daniil Senkiv
62d87d2625
People.Client: Dialogs: added ChangePasswordDialog component, applied to Home and ProfileAction component
2019-12-13 20:34:57 +03:00
5eeff88737
web: New packages fixes
2019-12-13 16:58:09 +03:00
Daniil Senkiv
1f82fe7ea7
People.Client: ChangeEmailDialog: deleted unused button
2019-12-13 13:29:49 +03:00
NikolayRechkin
3fb01e78ac
web: forbade a scalability
2019-12-13 13:25:09 +03:00
Daniil Senkiv
61c9ad6e3e
People.Client: ChangeEmailDialog: added new propTypes
2019-12-13 12:24:52 +03:00
Daniil Senkiv
ad77105f83
PeopleClient: ChangeEmailDialog: added new parameter for disabling buttons
2019-12-13 12:19:45 +03:00
Daniil Senkiv
a0f40567d9
People.Client:Dialogs: added ChangeEmailDialog component, applied to Home and ProfileAction component
2019-12-13 12:01:16 +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
Daniil Senkiv
babb7875d5
Merge branch 'master' into refactoring/text-heading
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Import/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js
# web/ASC.Web.Components/src/components/text/index.js
2019-12-11 13:45:04 +03:00
Ilya Oleshko
ff1d6a0603
Web: People: Fixed import page
2019-12-11 11:18:48 +03:00
Daniil Senkiv
d62de9827e
1. Web.Components: Text: change proptype fontSize from [number, string] to string. Applied to other components.
...
2. Web.Components: Link: fixed isTextOverflow prop working
3. Web.Components: RadioButtonGroup, RadioButton: fixed readme
2019-12-10 17:12:38 +03:00
Daniil Senkiv
440c4cb528
Merge branch 'master' into refactoring/text-heading
...
# Conflicts:
# web/ASC.Web.Components/src/components/modal-dialog/index.js
2019-12-10 12:20:26 +03:00
NikolayRechkin
4bb2b08d2e
Merge branch 'master' into feature/pwa
2019-12-10 10:37:41 +03:00
26d3e3d29d
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
...
Refactoring/remove react bootstrap
2019-12-10 10:26:08 +03:00
Daniil Senkiv
6b6c4569cf
Merge branch 'master' into refactoring/text-heading
2019-12-10 09:36:05 +03:00
Daniil Senkiv
b0b1b45127
Web.components: RadioButtonGroup: added new props: width, orientation, changed proptype spacing from number to string, applied changes to other components
2019-12-10 09:28:45 +03:00
NikolayRechkin
f6f12dea46
web: people: small fix
2019-12-10 09:16:21 +03:00
33c35b1177
Merge branch 'master' into feature/ef
2019-12-09 21:46:43 +03:00
8c0fc47251
web: Client: Changed AdvancedSelector to PeopleSelector
2019-12-09 17:20:42 +03:00
NikolayRechkin
ca5e501e2b
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-12-09 16:08:48 +03:00
NikolayRechkin
29433b0232
web: people: changed the use of the avatar editor
2019-12-09 16:07:04 +03:00
NikolayRechkin
94581bdd39
People: deleted unused code
2019-12-09 15:59:34 +03:00
f0ce75cf7d
Web: People: remove bootstrap peer dependency jquery
2019-12-09 15:36:30 +03:00
a77aef1970
Merge branch 'master' into Refactoring/remove-react-bootstrap
...
# Conflicts:
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
2019-12-09 15:29:04 +03:00
Daniil Senkiv
d3f06c8d3e
Merge branch 'master' into refactoring/text-heading
2019-12-09 15:24:23 +03:00
Daniil Senkiv
f275c5b258
web.common: renamed Heading component to Headline
2019-12-09 15:12:25 +03:00
452a3ebc4a
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
2019-12-09 15:10:01 +03:00
714e8af2b5
web: People: Update packages
2019-12-09 14:26:42 +03:00
750bd11adf
web: Update packages React, Redux
2019-12-09 13:46:20 +03:00
7ded8ae4cd
web: Components: Update packages (storybook, babel, jest, css-loader, postcss)
2019-12-09 12:33:39 +03:00
3f9ec420be
web: Update yarn.lock files
2019-12-09 11:47:14 +03:00
c477b3b61b
web: Update yarn.lock files
2019-12-09 09:19:26 +03:00
cfccfd4093
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Common/package.json
2019-12-09 09:16:18 +03:00
45f94155ab
web: Common: Added and applied new displayType "auto" for AdvancedSelector v2
2019-12-08 21:47:45 +03:00
4fd452e603
web: People: Replaced AdvancedSelector to GroupSelector
2019-12-06 16:47:22 +03:00
Daniil Senkiv
24d06b6fbe
Web.common: added Heading component, applied to web.client and people modules
2019-12-06 16:13:48 +03:00
4b51e4ad4f
Merge branch 'master' into Refactoring/remove-react-bootstrap
...
# Conflicts:
# products/ASC.People/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Common/.storybook/styles.scss
# web/ASC.Web.Components/.storybook/styles.scss
2019-12-06 15:58:10 +03:00
8c289784a8
Web: People: removed ReactToastify styles
2019-12-06 15:49:45 +03:00
08db3b32b3
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
fc5ea3d5fa
Merge branch 'master' into Refactoring/remove-react-bootstrap
2019-12-06 12:15:53 +03:00
c9939b0da1
.net core up to 3.1
2019-12-06 12:12:51 +03:00
2652c02add
Web: People: removed bootstrap from people module
2019-12-06 12:03:29 +03:00
86a0a6b48c
Merge branch 'master' into Refactoring/remove-react-bootstrap
2019-12-06 10:51:04 +03:00
6fbaee10f5
Web: People: added People base styles
2019-12-06 10:43:11 +03:00
Daniil Senkiv
3f7a026c36
People: deleted unused code
2019-12-05 20:01:34 +03:00
Daniil Senkiv
781833d38d
moved actions from web.common to web.client and people modules
2019-12-05 20:00:53 +03:00
8bd3c86d2b
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/package.json
# 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/components/icon-button/index.js
# Changed (by Text component changes):
# web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js
# web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/groups/header.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/options/body.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/selector.js
# web/ASC.Web.Common/src/components/people-selector/index.js
2019-12-05 14:17:45 +03:00
d564e6d9be
web: People: Changed AdvancedSelector to PeopleSelector
2019-12-04 17:53:01 +03:00
a047332f9c
Merge branch 'master' into feature/ef
2019-12-04 13:42:31 +03:00
ea60dbe63f
DI: AccountLinker
2019-12-04 13:39:18 +03:00
Daniil Senkiv
fac36adde8
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-04 12:38:54 +03:00
Daniil Senkiv
3ec6c287c0
web.components: Text: refactoring, separating component to 3 components, apply changes
2019-12-04 12:36:13 +03:00
17f99fb6f1
Web: People: removed reactstrap from people module
2019-12-04 10:11:13 +03:00
73d9ad590e
Web: People: removed README.md
2019-12-04 10:09:36 +03:00
3dc8c87a94
EF: DbTenantService
2019-12-03 18:20:21 +03:00
NikolayRechkin
c0c69badf3
first version of a progressive web application
2019-12-03 17:04:40 +03:00
7b66b23686
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
2019-12-03 16:41:03 +03:00
4128d43d89
web: Update yarn.lock files
2019-12-03 16:24:13 +03:00
6b357c1bc8
Merge branch 'master' into feature/advanced-selector-v2
2019-12-03 15:35:39 +03:00
Daniil Senkiv
ece2a12763
People.Client: Article: MainButton: fixed after ( 1ccb08b70d), fixed copying after displaying dialog
2019-12-02 16:55:16 +03:00
997cfa5fda
EF: Updated Dependencies. Optimized logging and userPhotoManager
2019-11-29 12:22:20 +03:00
d44f0ea5f0
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-29 12:22:14 +03:00
ae4a3af443
ASC.Web.Common: made a general layout for all clients
2019-11-28 16:36:55 +03:00
f46c12cc32
Update yarn.lock files
2019-11-27 14:26:20 +03:00
506704c54a
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-27 14:14:07 +03:00
a6a28a4a72
Merge pull request #10 from ONLYOFFICE/feature/asc-web-common
...
Feature/asc web common
2019-11-27 10:04:51 +03:00
4e69ebebd2
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
...
# Conflicts:
# web/ASC.Web.Components/src/components/field-container/README.md
# web/ASC.Web.Components/src/components/field-container/index.js
2019-11-26 14:20:14 +03:00
74a624a8b9
update yarn.lock files
2019-11-26 14:04:37 +03:00
19fcc09e25
People.Client: ProfileAction: fix warnings:
...
- Warning: validateDOMNesting(...): <p> cannot appear as a descendant of <p>.
- Warning: validateDOMNesting(...): <table> cannot appear as a descendant of <p>.
2019-11-26 11:56:51 +03:00
14f92deedb
Merge branch 'master' into feature/asc-web-common
2019-11-26 11:42:57 +03:00
a2c8fae6a4
web: People: Fixed broken logo on login from People page
2019-11-26 09:52:34 +03:00
3fdf474e25
web: People: Fixed login from People page
2019-11-26 09:48:27 +03:00
0639865df0
Web: People: fixed toolitp font on create user page
2019-11-25 16:34:33 +03:00
d13e729282
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
2019-11-25 15:18:34 +03:00
538511a4dc
EF: options
2019-11-25 14:49:21 +03:00
de2603bea9
Web: People: fixed tooltip text on edit profile page
2019-11-25 14:16:19 +03:00
af3a819b1a
Web: People: fixed tooltips font on profile edit page
2019-11-25 13:31:37 +03:00
3586867429
EF: DbUserService
2019-11-25 12:49:12 +03:00
e1b8682025
global replace HelpButtonHeaderContent with helpButtonHeaderContent
2019-11-25 12:00:40 +03:00
10fd09750d
Merge branch 'master' into feature/asc-web-common
2019-11-22 16:49:04 +03:00
1043cbc68b
web: Common: Removed old not used code
2019-11-22 15:40:51 +03:00
7976dfdb77
web: Components: Added export PublicRoute, PublicRoute
2019-11-22 14:52:04 +03:00
59d4674885
web: Common: Added PrivateRoute
2019-11-22 14:41:57 +03:00
9052dae3ca
People.Client: GroupAction: responsive design
2019-11-22 12:14:50 +03:00
02d853dbff
web: components: link: fix warnings
...
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
in Unknown (at customization.js:158)
in Trans (at customization.js:155)
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
in Unknown (at ProfileInfo.js:214)
in Trans (at ProfileInfo.js:211)
2019-11-21 18:24:58 +03:00
035d729c9c
web: People: Replaced PrivateRoute to ASC.Web.Common realization
2019-11-21 17:34:17 +03:00
63b839ef3a
People.Client: ProfileAction: validate trimmed field values
2019-11-21 13:53:01 +03:00
2a0812c8c5
People.Client: ProfileAction: added scroll to fields with errors
2019-11-21 13:40:34 +03:00
7cb2262837
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/store/people/actions.js
2019-11-20 14:29:52 +03:00
4d2db41258
Merge branch 'master' into feature/layout-scrolling
2019-11-20 11:41:10 +03:00
3080756461
web: People: Hide paging if total count less then pageCount
2019-11-20 11:37:17 +03:00
96a3a60c1c
web: People: Fixed mass re-render on group-buttons actions
2019-11-20 11:27:33 +03:00
df767e3849
web: People: Fixed setSelected value
2019-11-20 10:44:24 +03:00
83f7201bfa
Web: People: added help-button header content to people pages
2019-11-20 09:45:39 +03:00
85bcc75f16
web: People: Moved some common utils to ASC.Web.Common
2019-11-19 15:35:56 +03:00
325a42f66b
web: components: row: added custom shouldComponentUpdate function
2019-11-19 14:33:33 +03:00
ef0d51ab47
web: People: Moved some common constants to ASC.Web.Common
2019-11-19 14:10:56 +03:00
74530bfa76
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/src/App.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-19 13:34:36 +03:00
2a9e3d1870
web: People: Replaced services folder to ASC.Web.Common realization
2019-11-19 12:40:33 +03:00
18b0cdab2d
web: People: Moved api methods: resendUserInvites and getShortenedLink into ASC.Web.Common
2019-11-18 13:52:37 +03:00
Ilya Oleshko
502060e4b2
web: People: Fixed rendering of data preview before import.
2019-11-18 11:57:54 +03:00
d05565107c
EF: init commit
2019-11-15 18:04:05 +03:00
23e3d28857
web: Replaced history to asc-web-common variant
2019-11-15 16:44:54 +03:00
Ilya Oleshko
98ed6e94d3
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-11-15 16:33:41 +03:00
a75d6e7ecc
web: Removed auth folder from store (after change to asc-web-common variant)
2019-11-15 16:29:49 +03:00
