Commit Graph

2964 Commits

Author SHA1 Message Date
Daniil Senkiv
e04a0bee27 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-07 10:15:15 +03:00
Daniil Senkiv
e6f13f3dfb web.Client: saved culture and greetingSettings after logout; deleted unused data "settingsTree" 2019-11-07 10:14:26 +03:00
Daniil Senkiv
dc09621f5d Web.Api: added unconditional getting greetingSettings;
Web.Client: moved greetingSettings from setting reducer to auth reducer
2019-11-07 10:06:13 +03:00
Ilya Oleshko
decd932548 web: People: Fixed fetching profile after avatar saving action at profile view page 2019-11-07 09:50:52 +03:00
Ilya Oleshko
793a008a49 web: People: Reworked email actions at profile view page 2019-11-07 09:49:50 +03:00
Ilya Oleshko
3238104d74 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-07 09:31:43 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
Daniil Senkiv
5a9ea7618a Web.Client: Settings: customization: fixed component lifecycle 2019-11-06 17:02:39 +03:00
Ilya Oleshko
8e2ff9f218 web: People: Reworked profile view page from functional approach to class 2019-11-06 14:51:31 +03:00
Daniil Senkiv
011683b777 Web.Client: Settings: Customization: greeting settings: fixed and separated logic for save and restore buttons 2019-11-06 14:48:32 +03:00
Daniil Senkiv
7d159d8659 Web.Client/Server: renamed companyName to greetingSettings 2019-11-06 14:32:04 +03:00
Daniil Senkiv
656d82010b Web.Client: applied getting companyName(greetingTitle) to all Confirm sub-components, removed customNames file 2019-11-06 14:17:13 +03:00
Daniil Senkiv
a877f9d0dd Web.Client/Server: added getting companyName from initial api request, applied to Login component 2019-11-06 14:14:23 +03:00
Ilya Oleshko
62753a8d8e Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-06 13:50:05 +03:00
89b1a0956a SettingsManager: cache 2019-11-06 11:55:59 +03:00
87e76575d8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-06 11:38:07 +03:00
95c1746c04 Web: Client: fixed showing admins and users on accessRights page, renamed reducer fields 2019-11-06 11:35:09 +03:00
741f12a326 web: Components: Removed viewport from Buttons story (error on open) 2019-11-06 10:16:12 +03:00
4ac50115da web: components: bump version 2019-11-06 10:08:36 +03:00
c2e1593042 web: Storybook: Upgrade to v5.2.5 2019-11-06 10:08:09 +03:00
Ilya Oleshko
63299b2430 web: Components: Fixed property validation for drop-down items at ContextMenuButton component 2019-11-06 10:02:04 +03:00
Ilya Oleshko
b07a6eb570 web: People: Added ru translations at profile page. 2019-11-06 09:54:00 +03:00
Daniil Senkiv
e8d1c3bb46 Web.Client: Login: applied greetingTitle to login page 2019-11-05 17:14:56 +03:00
Daniil Senkiv
c2f8ddc0af Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-05 17:03:15 +03:00
Daniil Senkiv
a914ace184 Web.Client: Settings: Customization: applied dropDownMaxHeight prop after changes (00b421556b) 2019-11-05 17:03:04 +03:00
Ilya Oleshko
c93e65d67f web: components: bump version 2019-11-05 16:56:43 +03:00
Ilya Oleshko
e17d4d8125 web: Components: Fixed existing children for DropDown component 2019-11-05 16:56:30 +03:00
Ilya Oleshko
d362b35867 web: components: bump version 2019-11-05 16:43:02 +03:00
Ilya Oleshko
b177a5a227 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-05 16:42:33 +03:00
Ilya Oleshko
00b421556b web: Components: Fixed using maxHeight parameter if there are less elements than specified in parameter for DropDown component 2019-11-05 16:42:17 +03:00
Daniil Senkiv
a153d90082 Web.Client/Server: Settings: added changing greetingTitle 2019-11-05 16:15:47 +03:00
7a9c490467 Settings: fixed automapper settings 2019-11-05 15:34:00 +03:00
9d114185ad Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
2019-11-05 15:16:33 +03:00
e9ffc8f363 Web: Client: added loader to accessRights page, fixed selected users bug, replace selector functions, added new translations 2019-11-05 15:13:21 +03:00
Ilya Oleshko
3632adfcc3 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-05 14:29:08 +03:00
Ilya Oleshko
2e2e5a1838 web: components: bump version 2019-11-05 14:28:54 +03:00
Ilya Oleshko
12f7d76bf9 web: Components: Fixed bug with wrong width calculating for GroupButtonsMenu component 2019-11-05 14:28:44 +03:00
77085f7510 web: People: Fixed api getUser refactoring bug 2019-11-05 13:31:03 +03:00
26420fd2b8 DI: Notify 2019-11-05 13:20:00 +03:00
Daniil Senkiv
bee0c91442 Web.Client: Settings: applied current translation keys 2019-11-05 11:51:27 +03:00
Daniil Senkiv
3c36446d2b Web.Client: Settings: change link in settingsTree 2019-11-05 11:19:26 +03:00
Daniil Senkiv
ba88e13503 Web.Client: Settings: Layout: refactoring, rewritten utils function for settingsTree with any nesting, added new functions 2019-11-05 10:45:16 +03:00
Daniil Senkiv
fd1f1aaa93 Web.Client: Settings: settingsTree: added tKey property for translation keys, remove title unused property 2019-11-05 10:40:39 +03:00
Daniil Senkiv
7e7af6a1cf Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-05 10:36:29 +03:00
0801877060 DI: ASC.Studio.Notify.
Settings: AutoMapper
2019-11-01 16:56:47 +03:00
Daniil Senkiv
61ac78982b Web.client: Settings: Body: Header: deleted unused state variable 2019-11-01 16:12:48 +03:00
Daniil Senkiv
76383bbb91 Web.client: Settings: moved settingsTree from constants to utils 2019-11-01 16:11:35 +03:00
dc3ccbe7b7 Web: Client: refactoring accessRights code, added new translations, refactoring api requests 2019-11-01 15:09:16 +03:00
Daniil Senkiv
d7369489e1 Web.Client: Settings: remove redux usage in Layout sub-components 2019-11-01 14:31:59 +03:00
d7a4dd7fed Merge branch 'master' into refactoring/di 2019-11-01 12:41:30 +03:00