Commit Graph

2296 Commits

Author SHA1 Message Date
857c486dc4 web: components: Fixed props as attributes error 2019-09-27 15:27:16 +03:00
f91e49ee6c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 15:05:45 +03:00
49ba16ba4b Web: Client: fixed change password link 2019-09-27 15:05:38 +03:00
1b293c6112 web: People: Fixed set filter by url 2019-09-27 14:42:17 +03:00
NikolayRechkin
d6c4171a82 web: components: bump version 2019-09-27 14:06:13 +03:00
NikolayRechkin
00d17e2c38 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 14:05:51 +03:00
NikolayRechkin
507a78c0e3 web: people: create an avatar for a new user 2019-09-27 14:05:35 +03:00
NikolayRechkin
ce47b822fe web: components: small change in avatar editor 2019-09-27 14:04:09 +03:00
d5b7df07b7 web: components: bump version 2019-09-27 12:43:30 +03:00
dc93fcdec8 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 12:42:40 +03:00
59a69007bc web: Components: Init Aside inside AdvancedSelector 2019-09-27 12:42:32 +03:00
Ilya Oleshko
ac8c69821e web: People: Fixed empty culture at profile viewer. 2019-09-27 12:36:31 +03:00
Ilya Oleshko
9512c0b9c8 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 12:20:32 +03:00
Ilya Oleshko
adea141498 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 12:20:13 +03:00
48b2726d78 Confirm: added uid to activation link 2019-09-27 12:20:10 +03:00
Ilya Oleshko
bae91ab561 web: People: Fixed email link errors and locale selector width at profile viewer. 2019-09-27 12:20:05 +03:00
1afcd2442c ConfirmAuthHandler: auth by uid 2019-09-27 12:18:48 +03:00
NikolayRechkin
46a02a8385 web: components: bump version 2019-09-27 12:02:19 +03:00
NikolayRechkin
c91a2aeeb1 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 12:02:09 +03:00
NikolayRechkin
48090e6fdf web: components: fixed story for avatar editor 2019-09-27 12:01:46 +03:00
Daniil Senkiv
f26867854b Web.Client: revert routing (6804a3ab6b) 2019-09-27 12:00:29 +03:00
Daniil Senkiv
c0dc7125ea Web.Core: CommonLinkUtility: fixed generating confirm link 2019-09-27 11:58:10 +03:00
NikolayRechkin
1d8e175089 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 11:52:26 +03:00
NikolayRechkin
9a2a659430 web: people: fixed create user 2019-09-27 11:52:17 +03:00
30f9612eec web: People: Fixed paging by filter url 2019-09-27 10:06:47 +03:00
74c5873c5d web: People: Changed DEFAULT_EMPLOYEE_STATUS to Active 2019-09-27 10:06:12 +03:00
Ilya Oleshko
4ff81ac474 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 08:57:49 +03:00
925a584b63 web: People: Added loading filter by url on first loading 2019-09-26 17:01:21 +03:00
34e3f72475 web: Client: Fixed dummy bug 2019-09-26 16:57:38 +03:00
d679b91ecc Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-26 16:37:10 +03:00
84ba343460 Auth: added check confirm method 2019-09-26 16:36:53 +03:00
Ilya Oleshko
c29a18dba6 web: People: Fixed fields at profile viewer. 2019-09-26 16:36:47 +03:00
50ff61e6f1 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-26 16:36:46 +03:00
9ba5348863 web: People: Moved setup of filter url to people/actions.js 2019-09-26 16:36:33 +03:00
Ilya Oleshko
fb88adaa5c web: People: Fixed ComboBox property at profile actions. 2019-09-26 16:35:02 +03:00
NikolayRechkin
11ff1f69ba web: components: bump version 2019-09-26 16:31:08 +03:00
NikolayRechkin
64e5b07aa4 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-26 16:28:01 +03:00
NikolayRechkin
380548112f web: components: added displayType property to avatar editor 2019-09-26 16:27:42 +03:00
NikolayRechkin
393341a861 web: components: added new parameters to Aside component 2019-09-26 16:09:50 +03:00
586ee3b2f7 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
2019-09-26 15:45:30 +03:00
c8b909b156 web: People: Filter Section re-written to class with setup of url by filter 2019-09-26 15:43:21 +03:00
Daniil Senkiv
6804a3ab6b Web.Client: changed routing, fixed changeEmail state 2019-09-26 15:00:23 +03:00
Daniil Senkiv
95a369a091 Web.Core: revert d511e14e8e 2019-09-26 14:59:18 +03:00
94ab6c96aa Notify: check guest 2019-09-26 14:54:53 +03:00
647a7fb2d4 Kafka: fixed onmessage error 2019-09-26 14:53:54 +03:00
20a9d01dd4 Web: Client fix password field 2019-09-26 13:12:53 +03:00
a8d4cabdaa Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Client/src/store/services/api.js
2019-09-26 13:10:23 +03:00
Daniil Senkiv
fd08ae9039 Web.Client: Confirm: added changeEmail sub-component 2019-09-26 12:45:10 +03:00
7fe7138d50 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-26 12:23:04 +03:00
e7391d01d1 Web: Client: added translations, fixed changePassword api 2019-09-26 12:22:56 +03:00