|
b686e99f16
|
web: Common: Moved Layout and PageLayout to asc-web-common
|
2019-12-20 14:35:53 +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 |
|
|
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 |
|
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 |
|
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 |
|
|
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 |
|