Commit Graph

3970 Commits

Author SHA1 Message Date
8294090ddd web: common: bump version 2019-12-06 13:43:22 +03:00
9f8c093f02 Web: Common: fixed login page auto focus 2019-12-06 13:43:03 +03:00
8ad3b1ca1d "DeleteOldEvents" temporary removed 2019-12-06 13:32:10 +03:00
b4e5ac2e80 EF up to 3.1. 2019-12-06 13:31:24 +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
Daniil Senkiv
23363a1ee7 web.components: Heading: refactoring 2019-12-06 12:09:56 +03:00
b15bc4fc67 Web: Client: removed bootstrap from module client 2019-12-06 12:04:06 +03:00
2652c02add Web: People: removed bootstrap from people module 2019-12-06 12:03:29 +03:00
683ac13dd7 Web: Common: removed bootstrap from Common 2019-12-06 12:02:56 +03:00
b2ceba6d03 Web: Components: removed bootstrap from Components 2019-12-06 12:01:58 +03:00
86a0a6b48c Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 10:51:04 +03:00
7005413f6c Web: Common: added Common base styles 2019-12-06 10:43:48 +03:00
a6bb507317 Web: Client: added Client base styles 2019-12-06 10:43:33 +03:00
6fbaee10f5 Web: People: added People base styles 2019-12-06 10:43:11 +03:00
cff8bb3ad0 Web: Components: added base styles 2019-12-06 10:16:33 +03:00
105b4bdd3a Web: Client: fixed accessRights admins page styles 2019-12-06 09:54:32 +03:00
96a2616e61 Web: Components: fixed layout text style 2019-12-06 09:52:27 +03:00
Daniil Senkiv
3f7a026c36 People: deleted unused code 2019-12-05 20:01:34 +03:00
Daniil Senkiv
0ca8d54912 web: common: bump version 2019-12-05 20:01:08 +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
4b9637c1ae web.common: Login: fixed after (e63f0200de) 2019-12-05 19:01:16 +03:00
7185a54427 PWA: nginx conf 2019-12-05 18:26:43 +03:00
Daniil Senkiv
f42d6dc3d4 web: common: bump version 2019-12-05 16:50:22 +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
51eb6c7221 Web: Components: fixed advanced-selector styles 2019-12-05 16:32:21 +03:00
aad16f5125 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into Refactoring/remove-react-bootstrap 2019-12-05 16:14:56 +03:00
c2d272dd4d Web: Components: fixed layout styles 2019-12-05 16:13:40 +03:00
0dd95c2e78 Web: Components: deleted bootstrap styles 2019-12-05 15:18:28 +03:00
e82e9b5e7b Web: Components: fixed request-loader styles 2019-12-05 15:17:04 +03:00
5e6d5ea17d Web: Components: fixed modal-dialog styles 2019-12-05 15:16:50 +03:00
1f23794a9e Web: Components: fixed main-button styles 2019-12-05 15:16:25 +03:00
84089e3934 Web: Components: fixed loaders styles 2019-12-05 15:15:30 +03:00
cd0252bb1a Web: Components: fixed layout aside styles 2019-12-05 15:13:57 +03:00
87d1fc35e3 Web: Components: fixed svg styles 2019-12-05 15:13:04 +03:00
a38aae158c Web: Components: fixed group-buttons-menu styles 2019-12-05 15:12:32 +03:00
7fed33bf3e Web: Components: fixed filter-input styles 2019-12-05 15:12:02 +03:00
9f0c787275 Web: Components: fixed field-container styles 2019-12-05 15:11:17 +03:00
02b82f27b1 Merge branch 'master' into feature/advanced-selector-v2 2019-12-05 14:53:37 +03:00
Ilya Oleshko
a653ea9b05 web: components: bump version 2019-12-05 14:52:37 +03:00
Ilya Oleshko
0b2b2ed630 web: Components: Fixed Checkbox component property. 2019-12-05 14:52:27 +03:00
4aaecc5715 Web: Components: fixed password-input styles 2019-12-05 14:19:19 +03:00
7c327734b6 Web: Components: fixed textarea styles 2019-12-05 14:18:09 +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
bed7314551 Web: Components: fixed error-container styles 2019-12-05 14:16:02 +03:00
9e82c0817d Web: Components: fixed combobox styles 2019-12-05 14:15:03 +03:00
97238f7156 Web: Components: fixed badge styles, added Text component 2019-12-05 14:14:04 +03:00
69d3d4181d Web: Components: fixed avatar styles 2019-12-05 14:12:39 +03:00
0b1feec7af Docker: added ASC.Web.Common 2019-12-05 12:14:03 +03:00