Commit Graph

550 Commits

Author SHA1 Message Date
1bb5ecc87a web: Fix PageLayout component 2019-07-12 11:15:17 +03:00
baab3142f8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Components/src/components/page-layout/index.js
2019-07-12 10:16:22 +03:00
Andrey Savikhin
00042cedab web: components: fix PageLayout 2019-07-11 22:47:07 +03:00
129fbfc4ff web: components: rename variables 2019-07-11 18:10:42 +03:00
1e60926dd8 web: components: rename variables 2019-07-11 18:02:48 +03:00
af6128c38b web: components: rename variables 2019-07-11 17:59:06 +03:00
ba7e64a5a5 web: components: rename variables 2019-07-11 17:40:55 +03:00
2b1392b336 added /products/ASC.People/Data/ into .gitignore 2019-07-11 17:25:06 +03:00
97107a3337 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 16:59:18 +03:00
NikolayRechkin
2071aa5481 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 16:40:20 +03:00
NikolayRechkin
c211139fbb web: components: changed date input 2019-07-11 16:39:52 +03:00
4dfb892833 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 16:35:01 +03:00
Ilya Oleshko
173f480207 Web: Fixed dynamic width of DropDownItem component 2019-07-11 16:27:55 +03:00
382bfb77ce Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 16:21:47 +03:00
151514f3d8 web: components: backdrop and device moved from /layout/sub-components/ 2019-07-11 16:21:39 +03:00
355278cfd1 Requesting administrative privileges for install/uninstall/start/stop 2019-07-11 16:02:33 +03:00
Ilya Oleshko
0108f46f7b Web: Fixed Avatar component styles 2019-07-11 15:26:29 +03:00
Ilya Oleshko
790d199320 Web: Fixed Avatar component error with editAction property 2019-07-11 15:18:18 +03:00
fcc188c0d4 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 14:43:17 +03:00
d6d05f5165 web: Added PageLayout component (first approximation) 2019-07-11 14:43:07 +03:00
5bd6bf7197 Server: remove watch(api/lock people) 2019-07-11 14:17:08 +03:00
8bbe5149a1 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 14:10:25 +03:00
a194b2a2c4 Stop services before build
fix dotnet services
2019-07-11 14:08:20 +03:00
ae47acabdc Update lodash package 2019-07-11 13:56:10 +03:00
1af2396d38 Start/stop, install/uninstall services via nssm 2019-07-11 13:24:10 +03:00
NikolayRechkin
e71e2072db Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-11 12:40:07 +03:00
NikolayRechkin
7b1f77ac37 web: components: changed input-block 2019-07-11 12:39:36 +03:00
NikolayRechkin
074a258999 web: components: changed icon button 2019-07-11 12:38:30 +03:00
9053c40fa1 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	.gitignore
2019-07-11 12:11:51 +03:00
57ac44dd76 Added npm-local folder with asc-web-components 2019-07-11 12:10:24 +03:00
NikolayRechkin
d97ee5a0e7 web: components: new IconButton component 2019-07-11 11:35:17 +03:00
d849570961 added *.log into .gitignore 2019-07-11 09:35:00 +03:00
fd0f9f3d15 Build: run npm with --prefix 2019-07-10 19:00:37 +03:00
df8c22ed45 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-10 18:16:56 +03:00
5e3e0e0504 web: Fix Checkbox component (styles from TreeNodeMenu) 2019-07-10 18:16:47 +03:00
4dfe1780f4 Fix resolve autofac for products 2019-07-10 17:49:00 +03:00
Daniil Senkiv
9803dc022c Web: components: Link: refactoring 2019-07-10 17:20:56 +03:00
Ilya Oleshko
a71a9129eb Web: Fixed Avatar component, added new props for editing action 2019-07-10 17:05:34 +03:00
735d3596fd fix config 2019-07-10 16:49:03 +03:00
04b8fdce2a Studio: client folder 2019-07-10 16:33:22 +03:00
Ilya Oleshko
b712b3cad5 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-07-10 16:21:27 +03:00
Ilya Oleshko
96a58f0fe6 Web: Fixed GroupButton component refs errors 2019-07-10 16:21:10 +03:00
38f61c3eb3 fix nginx 2019-07-10 16:20:01 +03:00
Ilya Oleshko
996b30571f Web: Fixed people GroupButtonsMenu story example 2019-07-10 16:19:53 +03:00
Ilya Oleshko
af6356db23 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-07-10 16:17:27 +03:00
29138376a2 People: added homepage for production 2019-07-10 16:01:41 +03:00
303af9a3fb Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-10 15:50:15 +03:00
2a666937aa web: Fix Checkbox component 2019-07-10 15:50:06 +03:00
Ilya Oleshko
43587d91fc Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-07-10 15:20:49 +03:00
NikolayRechkin
39c4cfbcf0 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-10 15:15:13 +03:00