Commit Graph

2338 Commits

Author SHA1 Message Date
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
22e4d19458 PasswordChange: added userId 2019-09-26 12:15:01 +03:00
Ilya Oleshko
7d1b6eb79e web: components: bump version 2019-09-26 12:09:02 +03:00
Ilya Oleshko
606b35a858 web: Components: Fixed page ComboBox for Paging component 2019-09-26 12:08:39 +03:00
2034777701 added check permission for GeInviteLink 2019-09-26 11:36:49 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
adc6dc801e Notify: fixed textile 2019-09-25 17:25:28 +03:00
Daniil Senkiv
6840945d00 Web.Client: in addition to 6c3dc95c80 2019-09-25 16:44:47 +03:00
Daniil Senkiv
6c3dc95c80 Web.Client: renamed api method 2019-09-25 16:39:46 +03:00
2564a0c760 fixed start services 2019-09-25 15:55:35 +03:00
4aac6be6ab fixed start services 2019-09-25 15:49:21 +03:00
NikolayRechkin
94040b74e8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 14:14:23 +03:00
2c341d59b8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 13:56:53 +03:00
cb68c873be Web: Client: replaced component "TextInput" to "PasswordInput" 2019-09-25 13:56:31 +03:00
NikolayRechkin
206e4bedc1 web: people: added a default selection text for a filter 2019-09-25 13:51:40 +03:00
18a9c846b8 Notify: added email sender 2019-09-25 13:36:22 +03:00
37988eccc8 web: Client: Fixed rename 2019-09-25 12:46:42 +03:00
NikolayRechkin
65c0f21416 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 12:35:16 +03:00
NikolayRechkin
a4fe0375f5 web: components: bump version 2019-09-25 12:35:03 +03:00
NikolayRechkin
097b44b47f web: people: added translations 2019-09-25 12:34:28 +03:00
NikolayRechkin
beee45663b web: components: AvatarEditor: added errors messages 2019-09-25 12:30:37 +03:00
5f0f148394 web: People: Change getSelectorUserList url to optimazed 2019-09-25 11:52:39 +03:00
25b5393bb9 web: Client: Fixed rename 2019-09-25 11:49:46 +03:00
d4cc3f0c78 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 10:48:07 +03:00
52f876d9a4 web: Client: Refactoring Confirm password change methods 2019-09-25 10:47:55 +03:00
Daniil Senkiv
a6e7f5ab8d People.Client: separated getting invite links 2019-09-25 10:43:14 +03:00
1e274cc63f web: People: Added opportunity to delete group 2019-09-25 09:46:45 +03:00
17616763af web: People: Added isDisabled for inputs with inLoading 2019-09-25 09:46:12 +03:00
067b9f9b24 Update yarn locks 2019-09-25 09:45:03 +03:00
396b08527f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 09:13:11 +03:00
NikolayRechkin
88c7e56d39 web: components: bump version 2019-09-25 09:08:07 +03:00
NikolayRechkin
eca9d8ccc3 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 09:04:45 +03:00
NikolayRechkin
7bcf2a6bf8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 09:04:30 +03:00
Ilya Oleshko
ec572f53e2 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 08:49:58 +03:00
f247b4a303 Notify: fixed resources 2019-09-24 19:21:05 +03:00
680f7ed84b ResxManager: fix 2019-09-24 19:20:21 +03:00
NikolayRechkin
14f654d10c web: people: new avatar editor 2019-09-24 17:17:10 +03:00
Ilya Oleshko
1ad079e7b5 Web.Client: Confirm: PhoneActivation: Added default page. 2019-09-24 17:11:47 +03:00
NikolayRechkin
1a98489513 People: changed photo upload function 2019-09-24 17:07:24 +03:00
NikolayRechkin
f51c5d7ded web: components: new version of a avatar editor 2019-09-24 17:00:17 +03:00
515ce6dae5 People: fixed filter method 2019-09-24 15:51:03 +03:00
6d815608a0 ConfirmAuth: PasswordChange 2019-09-24 15:27:13 +03:00
11fc9d2a01 web: People: Added fetchPeopleByFilter after save group 2019-09-24 15:27:06 +03:00
1c506fbf1f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-24 15:25:55 +03:00
Daniil Senkiv
20fa73b731 Web.Client: Confirm: createUser: fixed 2019-09-24 15:22:21 +03:00
ed2caea266 fix config 2019-09-24 14:25:14 +03:00
fb5ecc5ec5 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-24 14:24:09 +03:00