Commit Graph

697 Commits

Author SHA1 Message Date
Artem Tarasov
652371a42c fixed layout 2020-07-31 16:02:59 +03:00
Artem Tarasov
f95d788516 fixed modal 2020-07-31 15:20:12 +03:00
Artem Tarasov
b40a6d91bc added ErrorContainer if wizard not init 2020-07-31 15:05:28 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +03:00
Alexey
f497aa5ba2 Web: Client: Settings: Added saveSettingButtons component, added system for saving temporary settings without applying 2020-07-31 11:35:14 +03:00
Artem Tarasov
2e42c813b8 fixed actions 2020-07-30 13:50:13 +03:00
Artem Tarasov
2a049f8d78 before merge 2020-07-30 13:07:05 +03:00
Artem Tarasov
70b95179f0 refactoring 2020-07-29 23:27:56 +03:00
Artem Tarasov
0bafcc7b1d refactoring 2020-07-29 19:01:57 +03:00
Artem Tarasov
baf77c3979 fix styles, refactoring 2020-07-29 18:16:16 +03:00
Artem Tarasov
e949ff75ba added Layout 2020-07-29 13:05:23 +03:00
Alexey
e7d3b6000b Web: Client: Settings: Fix mobile styles on customization page 2020-07-28 10:17:32 +03:00
Alexey
7982194f5a Web: Client: Settings: Fix language-and-time-zone and customization pages, refactoring 2020-07-27 18:13:01 +03:00
Alexey
3ec06cab83 Web: Client: Settings: Fix custom-tiles page, refactoring 2020-07-27 17:24:41 +03:00
Alexey
27055fb58a Web: Client: Settings: Refactoring customization page 2020-07-27 14:39:28 +03:00
Alexey
c2ad40995e Web: Client: Settings: Added custom-titles page, updated customization page 2020-07-27 09:38:02 +03:00
Artem Tarasov
aca4ce9c32 added checking, refacktoring 2020-07-24 15:30:11 +03:00
Artem Tarasov
cbda5efd21 refactoring styles of settings-box 2020-07-24 09:39:11 +03:00
Alexey
b35af29ec8 Web: Client: Settings: Updated section header, refactoring 2020-07-23 18:56:57 +03:00
Alexey
e067346d2c Web: Client: Settings: Routing, updated tree 2020-07-23 16:37:18 +03:00
Artem Tarasov
5bf6f7de50 added onInputFileHandler 2020-07-23 16:26:32 +03:00
Artem Tarasov
8fd658ced9 added FileInput 2020-07-23 15:52:20 +03:00
Artem Tarasov
a0b99cc097 refactoring 2020-07-23 12:35:42 +03:00
Artem Tarasov
6a3922accc added functionality to change email 2020-07-23 11:16:55 +03:00
Artem Tarasov
dcee7b97b8 layout fix, added new view 2020-07-23 11:03:30 +03:00
Artem Tarasov
037bed591f styles fix 2020-07-22 18:47:37 +03:00
Artem Tarasov
109b39153b added link for generate pass 2020-07-22 15:14:50 +03:00
Artem Tarasov
96b07eaf81 layout fix 2020-07-22 14:48:19 +03:00
Artem Tarasov
9414fad3d1 fix 2020-07-22 08:52:59 +03:00
Artem Tarasov
b0585d4ec0 fix layout 2020-07-21 17:00:12 +03:00
Artem Tarasov
baaa29172d fix bug 2020-07-21 16:30:22 +03:00
Artem Tarasov
ee86ce8140 added settings pass 2020-07-21 15:10:09 +03:00
Artem Tarasov
3865909d9a fixed margin settings 2020-07-21 14:44:17 +03:00
Artem Tarasov
55c19bbd43 fixed Button 2020-07-21 14:01:54 +03:00
Artem Tarasov
098fa8dd3a fixed EmailInput 2020-07-21 13:55:54 +03:00
Artem Tarasov
d1561a1954 delete translation for tooltip pasword input 2020-07-21 13:50:14 +03:00
Artem Tarasov
228edd119d fixe PasswordInput 2020-07-21 13:49:16 +03:00
Artem Tarasov
1a8aacebdc Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Resource.Manager/Startup.cs
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
Alexey
cb0a734a78 Web: Components: Updated tree-menu in settings section 2020-07-20 16:22:52 +03:00
be81ca291d Update yarn.lock files + bump versions 2020-07-17 18:03:08 +03:00
d094546147 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
ec20c66c5d Update yarn.lock files 2020-07-17 17:43:39 +03:00
679e77a3ea Update yarn.lock files 2020-07-16 16:09:09 +03:00
098e872a38 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
78b10ab893 Update yarn.lock files 2020-07-16 14:55:40 +03:00
Artem Tarasov
2469126f7a hidden input license file 2020-07-15 14:26:49 +03:00
Artem Tarasov
7e3ba192b1 fixed file name in input type=file 2020-07-15 14:01:29 +03:00
Artem Tarasov
6d2deca3c6 layout fix 2020-07-15 11:47:21 +03:00
Artem Tarasov
84ca1146a0 layout fix 2020-07-14 17:46:00 +03:00
Artem Tarasov
80a5e224e8 added PropTypes and deleted console.log 2020-07-12 12:34:42 +03:00
Artem Tarasov
0e2da28101 added getPortalSettings after wizard completed 2020-07-10 19:00:21 +03:00
Artem Tarasov
491a3d32da added routing after completed Wizard 2020-07-10 18:08:22 +03:00
Artem Tarasov
f8e9cfc5f0 added onKeyPressHandler 2020-07-10 13:10:54 +03:00
Artem Tarasov
486dbe1fb5 layout fix 2020-07-10 11:26:16 +03:00
Artem Tarasov
92fdf4c41d added Toast 2020-07-09 17:57:53 +03:00
Artem Tarasov
5d1043af13 added Loader 2020-07-09 15:11:08 +03:00
Artem Tarasov
11be0a1ef3 added in PasswordInput NewPasswordButtonVisible from /new-login-page 2020-07-09 14:12:53 +03:00
Artem Tarasov
27ddc44211 added truncate label timezone 2020-07-09 12:47:07 +03:00
Artem Tarasov
8cacf241d5 fix 2020-07-09 11:42:28 +03:00
Artem Tarasov
6c01f7392f added method setPortalOwner 2020-07-08 18:15:50 +03:00
Artem Tarasov
6dd5c338fe fix translation and layout 2020-07-08 15:34:29 +03:00
Artem Tarasov
86be9d522b render optimization 2020-07-08 13:04:23 +03:00
Artem Tarasov
b3fe0f3fbc added .DS_Store in .gitignore 2020-07-08 11:44:06 +03:00
Artem Tarasov
07089f2fc7 added api methods 2020-07-08 11:29:44 +03:00
Artem Tarasov
621d04db58 added select language 2020-07-07 16:24:57 +03:00
Artem Tarasov
779eb155b5 added action getPortalCultures, fix routing 2020-07-07 14:50:31 +03:00
Artem Tarasov
1a730f0750 fix redirect to /wizard 2020-07-06 18:08:34 +03:00
Artem Tarasov
7cccd43f22 fix 2020-07-06 15:14:20 +03:00
Artem Tarasov
c0e5626c1f deleted unnecessary func and action in Wizard 2020-07-06 14:26:47 +03:00
Artem Tarasov
75b591ff1e added tooltip and translation Password 2020-07-06 13:38:25 +03:00
Artem Tarasov
83fc1b18c6 added Loader in Wizard page 2020-07-06 12:57:43 +03:00
Artem Tarasov
6f456eaa4e cleanup 2020-07-03 12:20:07 +03:00
Artem Tarasov
be462db7d9 Fixed styles, add fakeToken in auth/reducer, added redirect to Wizard in PrivateRoute 2020-07-02 16:56:00 +03:00
Artem Tarasov
94ee712c0e fixed warning 2020-06-30 17:29:54 +03:00
Artem Tarasov
7326d54e96 added file upload 2020-06-30 14:43:24 +03:00
Artem Tarasov
3286df2572 added Redux 2020-06-30 14:35:16 +03:00
Artem Tarasov
ed48224a7d added Redux Wizard 2020-06-29 18:07:05 +03:00
Artem Tarasov
14ddcfac38 Added translation 2020-06-29 11:34:32 +03:00
Artem Tarasov
efd6e652da deleted sub-components 2020-06-26 17:57:08 +03:00
Artem Tarasov
d911f80342 Added GroupButton for TimeZones and Languages 2020-06-26 17:47:09 +03:00
Artem Tarasov
03a355be7f added input file 2020-06-26 17:10:32 +03:00
Artem Tarasov
f412dcea1d added Modal Window 2020-06-26 13:57:05 +03:00
Artem Tarasov
07e306c6db added alternative display if owner exists 2020-06-26 11:44:32 +03:00
Artem Tarasov
9cfa89c076 Added layout for mobile devices 2020-06-25 17:47:55 +03:00
Artem Tarasov
31361df8ed Wizard page design fix 2020-06-25 12:33:10 +03:00
Artem Tarasov
36f11ff673 Created page Wizard 2020-06-19 16:47:41 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
Daniil Senkiv
71e5e3c73c Web.Client: fix 09474e8be9 2020-03-20 11:15:27 +03:00
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +03:00
Daniil Senkiv
730ca469a1 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-03-17 09:07:39 +03:00
Ilya Oleshko
8b1568701f Web.Client: Settings: Fixed admin`s row width 2020-03-16 12:19:32 +03:00
0bcfec5a19 Update yarn.lock files 2020-03-16 11:20:25 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
dependabot[bot]
2f8f43a03a
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-16 07:22:50 +00:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
f3731820cb Web: Client: change title of pages, added new translations 2020-02-18 13:15:02 +03:00
0eb0048596 Web: Client: change title of pages 2020-02-17 16:50:42 +03:00
35ee20c957 Web: Client: added logo icons 2020-02-14 16:05:32 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
NikolayRechkin
396ef70d49 web: client: small fix a loader 2020-02-06 16:13:05 +03:00
Daniil Senkiv
fff197c90c Web.Client: i18n config: debug only in development mode 2020-02-05 15:45:12 +03:00
Daniil Senkiv
77f88297ed Web.Client: removed useless changeLanguage function 2020-02-05 10:57:49 +03:00
Daniil Senkiv
ea3ab6c723 Web.Client: Settings: hidden whiteLabel page 2020-02-03 17:40:48 +03:00
Daniil Senkiv
99e9aee6df Web.Client: Settings: AccessRights: passed groupsCaption prop to AdvancedSelectors from redux 2020-02-03 17:22:22 +03:00
Daniil Senkiv
f9b390e8e7 Web.Client: Settings: added request for new customNames if user without user language changed portal language 2020-02-03 17:01:15 +03:00
Daniil Senkiv
a4d2b2ecff Web.Client: Settings: Customization: added handling error for restore greeting title 2020-02-03 16:45:12 +03:00
Daniil Senkiv
93a844e5dd Web.Client: Customization: fixed working with translations 2020-02-03 16:36:15 +03:00
3d1e4cc5f5 Web: Client: fixed accessRight admins page 2020-02-03 16:01:03 +03:00
cebb0122db web: Client: Fixed logout redirect on sing out click (issue: unknown 't' function) 2020-02-03 11:38:53 +03:00
f6ac92ad3d web: Client: Removed useless variable 2020-02-03 11:37:27 +03:00
f0cec97c3e web: common: Added ErrorBoundary component with componentDidCatch and new Error520Container show 2020-02-03 11:36:25 +03:00
f3e670e393 web: Common: Extended PeopleSelector component with Me option 2020-02-02 17:33:44 +03:00
Daniil Senkiv
33a841715b Web.Client: Settings: Common: fixed changing language 2020-01-31 15:48:41 +03:00
Daniil Senkiv
13929cabf3 Web.Client: Settings: Customization: replaced i18n method 2020-01-29 13:21:01 +03:00
Daniil Senkiv
f78f0cd374 i18n.reloadResources: fixed for reducing reloading translations 2020-01-29 13:15:46 +03:00
Daniil Senkiv
2f953e4de9 Merge branch 'master' into feature/translations 2020-01-28 17:13:00 +03:00
Daniil Senkiv
756df5b71b Web.Client: Settings: customization: fixed style 2020-01-28 16:10:58 +03:00
Daniil Senkiv
3d82ffcdcd Web.Client: Settings: removed useless container for header 2020-01-28 14:50:23 +03:00
Daniil Senkiv
60ceba9699 web.Client: fixed translation keys 2020-01-28 10:01:25 +03:00
Daniil Senkiv
96c7143192 Merge branch 'master' into feature/translations 2020-01-27 14:49:26 +03:00
effad5439c web: Added dummy Documents product 2020-01-27 14:07:02 +03:00
Daniil Senkiv
8713184d56 Web.Client: removed useless i18n config 2020-01-26 15:05:26 +03:00
Daniil Senkiv
ec2a58e5d5 Web.Client: Home: added ru translation 2020-01-26 15:02:53 +03:00
Daniil Senkiv
d0eebbe6fd Web.Client: Settings: access rights: added translations 2020-01-26 14:47:15 +03:00
Daniil Senkiv
9d82e657ed Merge branch 'master' into feature/translations
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/constants/index.js
2020-01-26 14:12:37 +03:00
Daniil Senkiv
2e7b7ff9e8 Web.Client/Common: fixed problem with working if user without user language changed portal language 2020-01-24 21:46:25 +03:00
ec7299aabf web: Common: Added ComingSoon page 2020-01-24 17:48:36 +03:00
f776054b35 ASC.Web.Client: Settings: AccessRights: hid modules tab 2020-01-24 15:50:02 +03:00
9d3af6d50e ASC.Web.Client: Settings: Whitelabel: initial focus setting 2020-01-24 11:27:01 +03:00
Daniil Senkiv
46c4bca51d web.client: Settings: Customization: triggered change combobox language after changing user language 2020-01-23 13:52:19 +03:00
Daniil Senkiv
120944cb25 Web.Client: Settings: Article: Body: fixed re-render after changing language, if user language not defined 2020-01-22 16:00:42 +03:00
Daniil Senkiv
44b7d5cbf0 Web.Client: Settings: fixed: initial language value is getting from localStorage 2020-01-21 12:09:56 +03:00
Daniil Senkiv
da1d88643d Web.Client: Home: changed redux to localStorage for storing language value 2020-01-21 12:01:53 +03:00
Daniil Senkiv
2cef64a69d Web.Client: Confirm: changed redux to localStorage for storing language value 2020-01-21 11:57:35 +03:00
Daniil Senkiv
2abf7d9ed2 Web.Client: About: changed redux to localStorage for storing language value 2020-01-21 11:37:39 +03:00
Daniil Senkiv
8c2f4dda75 Web.Client: Settings: Customization: added error handling for API requests 2020-01-20 16:49:16 +03:00
Daniil Senkiv
28b0eced9d People/Web.Client: selecting portal language, if user language not defined 2020-01-20 14:17:39 +03:00
13f63cf7b5 web: Client: Update all dependencies 2020-01-15 12:03:43 +03:00
Ilya Oleshko
232633a41d Web: Client: Security: Fixed filter sorting style 2019-12-27 15:58:18 +03:00
05674c5677 web: Client: Fixed 'countElements' is assigned a value but never used no-unused-vars 2019-12-26 15:40:44 +03:00
c8e7bc7cb6 web: Update yarn.lock files 2019-12-25 16:59:00 +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
b686e99f16 web: Common: Moved Layout and PageLayout to asc-web-common 2019-12-20 14:35:53 +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
082c3b4576 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-19 09:59:21 +03:00
49661f1b31 Web: Client: fixed paging on accessRight admins page 2019-12-19 09:59:10 +03:00
Ilya Oleshko
dd783b55c7 Web: Client: Fixed css style for ComboBox on customization page 2019-12-19 09:44:00 +03:00
063ec687f2 web: Client: Fixed license on About page 2019-12-19 09:28:53 +03:00
857a64979c Web: Client: fixed admins settings page horizontal scroll 2019-12-19 09:04:37 +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
9eed971545 web: Common: Added user role to PeopleSelector 2019-12-18 13:59:08 +03:00
2ab8a79ecd Web: Client: fixed horizontal scroll on about page 2019-12-18 11:29:10 +03:00
e63e98db9c Web: Client: fixed about page text warning 2019-12-17 09:35:23 +03:00
d63af4b637 web: client: Fixed double set of isOpen property for Selectors 2019-12-16 14:23:24 +03:00
0b8ee14130 Web: Client: fixed about page, added new translations 2019-12-16 11:52:56 +03:00
06c220634a web: client: Applied changes in AdvancedSelector on OwnerSettings page 2019-12-15 21:51:51 +03:00
84f6fba008 web: client: Applied changes in AdvancedSelector on AdminsSettings page 2019-12-15 21:39:34 +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
NikolayRechkin
07e3cefb5c web: use Service Worker in production 2019-12-13 10:19:03 +03:00
Daniil Senkiv
0bf04e8800 web.components: EmailInput: fixed readme, fixed export email utils, applied to creareUser page 2019-12-11 16:41:38 +03:00
9ddbbdc52e
Merge pull request #15 from ONLYOFFICE/feature/pwa
Feature/pwa
2019-12-11 15:23:38 +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
8c0fc47251 web: Client: Changed AdvancedSelector to PeopleSelector 2019-12-09 17:20:42 +03:00
1d475151c1 Web: Client: remove bootstrap peer dependency jquery 2019-12-09 15:37:07 +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
306e861879 web: Client: Update packages 2019-12-09 14:21:23 +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
6ada25a873 Web: Client: fixed Home page styles 2019-12-07 10:08:28 +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
8e0cf2da5e Web: Client: removed ReactToastify styles 2019-12-06 15:50:07 +03:00
b15bc4fc67 Web: Client: removed bootstrap from module client 2019-12-06 12:04:06 +03:00
86a0a6b48c Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 10:51:04 +03:00
a6bb507317 Web: Client: added Client base styles 2019-12-06 10:43:33 +03:00
105b4bdd3a Web: Client: fixed accessRights admins page styles 2019-12-06 09:54:32 +03:00
Daniil Senkiv
781833d38d moved actions from web.common to web.client and people modules 2019-12-05 20:00:53 +03:00
Daniil Senkiv
276eefe679 Moved actions for confirm pages from web.common to web.client, applying to pages 2019-12-05 16:50:07 +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