Commit Graph

56 Commits

Author SHA1 Message Date
11348e5fba Update yarn.lock files 2020-10-07 12:58:38 +03:00
63ee865d98 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/utils/index.js
2020-10-05 15:37:09 +03:00
978b67f7a7 Update yarn.lock files 2020-10-05 14:46:07 +03:00
d00d16ee02 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/utils/index.js
#	web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
c008acee57 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
2020-10-01 17:32:12 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +03:00
f2b0cdf1af Web: Moved HeadlineLoader to ASC.Web.Common 2020-09-24 13:37:54 +03:00
7b4441676e Update yarn.lock files 2020-09-19 18:35:17 +03:00
a4cb368513 Update yarn.lock files 2020-09-16 18:39:06 +03:00
3b691247b2 Update yarn.lock files 2020-09-15 23:29:13 +03:00
986e53608d Update yarn.lock files 2020-09-15 22:55:11 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
65fbf2247e Update yarn.lock files 2020-09-11 22:51:28 +03:00
323823981a Update yarn.lock files 2020-09-09 22:25:31 +03:00
a2f050590b Update yarn.lock files 2020-09-04 21:04:05 +03:00
0eb3b2b4d3 Update yarn.lock files 2020-09-02 12:30:53 +03:00
062a3a793f Update yarn.lock files 2020-08-31 17:45:37 +03:00
d9f70df70a Update yarn.lock files 2020-08-31 12:42:36 +03:00
a4a9234328 Web: Common: added react-resize-detector package, fixed styles 2020-08-31 10:03:19 +03:00
8d11e1b0c8 Web: Clients: Changed interaction with serviceWorker 2020-08-19 20:00:41 +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
NikolayRechkin
b7e40eefdd update yarn.lock files 2020-06-25 11:01:47 +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
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
b526b61bdd Update yarn.lock files 2020-02-26 13:01:04 +03:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
Ilya Oleshko
9b04501b43 Web: Common: Layout: Fixed styling icons of modules 2020-02-14 09:36:14 +03:00
a94adb0a96 web: Components: Added ref support to the Button component; 2020-02-02 14:01:43 +03:00
e96c1de666 web: Common: Update all dependencies 2020-01-15 11:52:45 +03:00
c8e7bc7cb6 web: Update yarn.lock files 2019-12-25 16:59:00 +03:00
b686e99f16 web: Common: Moved Layout and PageLayout to asc-web-common 2019-12-20 14:35:53 +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
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
d08ba81c85 web: Common: Update packages 2019-12-09 14:13:26 +03:00
7ded8ae4cd web: Components: Update packages (storybook, babel, jest, css-loader, postcss) 2019-12-09 12:33:39 +03:00
45f94155ab web: Common: Added and applied new displayType "auto" for AdvancedSelector v2 2019-12-08 21:47:45 +03:00
c8a772837f web: Update yarn.lock 2019-12-06 16:40:57 +03:00