Commit Graph

293 Commits

Author SHA1 Message Date
4a57d0d646 web: common: bump version 2020-10-09 14:58:32 +03:00
798170e402 web: common: bump version 2020-10-08 12:43:21 +03:00
Artem Tarasov
608109f4a0 web: common: bump version 2020-10-08 10:29:06 +03:00
1475af5f28 web: common: bump version 2020-10-07 12:49:50 +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
3de5601671 web: common: bump version 2020-10-05 14:28:41 +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
e936ab4fc0 web: common: bump version 2020-10-01 13:16:53 +03:00
TatianaLopaeva
2c1adaadde web: common: bump version 2020-10-01 09:04:56 +03:00
TatianaLopaeva
015b985755 web: common: bump version 2020-10-01 09:01:15 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
Artem Tarasov
235193fb6b web: common: bump version 2020-09-30 11:45:47 +03:00
Artem Tarasov
5b5018a214 web: common: bump version 2020-09-30 10:44:06 +03:00
ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
Ilya Oleshko
dea73cfbad web: common: bump version 2020-09-28 14:48:45 +03:00
Alexey Kostenko
10fd501560 web: common: bump version 2020-09-28 09:13:49 +03:00
0e6f803f0b web: common: bump version 2020-09-24 16:54:50 +03:00
0a52fb4449 web: common: bump version 2020-09-24 15:32:11 +03:00
12099717ed web: common: bump version 2020-09-24 15:07:26 +03:00
f2b0cdf1af Web: Moved HeadlineLoader to ASC.Web.Common 2020-09-24 13:37:54 +03:00
Alexey Kostenko
634534afbb Web: Common: Bump version 2020-09-22 15:49:42 +03:00
Artem Tarasov
33903723fd web: common: bump version 2020-09-22 15:44:05 +03:00
5e8ae65235 web: common: bump version 2020-09-22 15:33:31 +03:00
fe0d4a16b5 web: common: bump version 2020-09-22 14:15:22 +03:00
2c3a8dfc44 web: common: bump version 2020-09-22 10:16:38 +03:00
Artem Tarasov
ff84c7cbf1 web: common: bump version 2020-09-21 14:54:54 +03:00
Artem Tarasov
916eb0439c web: common: bump version 2020-09-19 23:28:37 +03:00
548b6c428d web: common: bump version 2020-09-19 18:27:08 +03:00
eb3336ad6a web: common: bump version 2020-09-18 17:07:17 +03:00
5b070d3509 web: common: bump version 2020-09-18 15:57:36 +03:00
Artem Tarasov
a04ca81999 web: common: bump version 2020-09-18 11:19:53 +03:00
Alexey Kostenko
24a92d7e67 Web: Common/Components: Bump version 2020-09-17 16:50:37 +03:00
Alexey Kostenko
7474fcf681 Web: common: bump version 2020-09-17 09:18:54 +03:00
68d43001c3 web: common: bump version 2020-09-15 15:48:55 +03:00
01a8aa22b4 web: common: bump version 2020-09-15 14:47:53 +03:00
718a6e2ebb web: common: bump version 2020-09-09 22:03:33 +03:00
aa2632a3a0 web: common: bump version 2020-09-09 21:50:17 +03:00
Artem Tarasov
d7237f43ba web: common: bump version 2020-09-09 18:06:58 +03:00
Alexey
ddd3a70b67 web: common: bump version 2020-09-09 14:46:24 +03:00
9899880bff web: common: bump version 2020-09-07 17:32:02 +03:00
cf53c32ff4 web: common: bump version 2020-09-04 20:54:50 +03:00
22b7b8ff52 web: common: bump version 2020-09-04 15:57:06 +03:00
Ilya Oleshko
728b00ab93 web: common: bump version 2020-09-04 13:56:49 +03:00
0b208d2fa2 web: common: bump version 2020-09-02 12:19:46 +03:00
Artem Tarasov
f28406832b web: common: bump version 2020-09-01 18:33:54 +03:00
Ilya Oleshko
a2a2e6cda2 web: common: bump version 2020-09-01 16:07:15 +03:00
Ilya Oleshko
8e04466542 web: common: bump version 2020-09-01 15:26:59 +03:00
Artem Tarasov
d560610396 web: common: bump version 2020-09-01 10:15:27 +03:00
fa6144919e web: common: bump version 2020-08-31 17:36:05 +03:00