Daniil Senkiv
|
203e0f9810
|
Web.Api: SettingsController: fixed handling displayName for getting time zones
|
2019-11-12 12:18:11 +03:00 |
|
Daniil Senkiv
|
92a2f17929
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-11-12 12:15:03 +03:00 |
|
|
b2dc574943
|
Settings: fixed di
|
2019-11-12 11:47:49 +03:00 |
|
Daniil Senkiv
|
629f9a4656
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-11-12 11:23:04 +03:00 |
|
|
118bc9e2dd
|
Merge pull request #7 from ONLYOFFICE/refactoring/di
Refactoring/di
|
2019-11-12 11:10:31 +03:00 |
|
|
a79c5c02e4
|
Web: Client: fixed TabContainer rerender on accessRights page
|
2019-11-12 09:57:49 +03:00 |
|
|
0c82308d7c
|
web: components: bump version
|
2019-11-12 09:54:19 +03:00 |
|
|
945e4422e1
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-12 09:52:58 +03:00 |
|
|
d703467e9b
|
Web: Components: added Scrollbar to TabContainer
|
2019-11-12 09:52:27 +03:00 |
|
|
a3bee291a2
|
Added comments
|
2019-11-11 18:45:17 +03:00 |
|
|
26c8d56219
|
DI: refactoring. Added EmployeeWraperHelper
|
2019-11-11 18:42:07 +03:00 |
|
Ilya Oleshko
|
05327bbe86
|
web: components: bump version
|
2019-11-11 17:03:04 +03:00 |
|
Ilya Oleshko
|
754d05cb82
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-11-11 17:02:43 +03:00 |
|
Daniil Senkiv
|
239c56813d
|
Web.Client: Settings: fixed problem with defining path
|
2019-11-11 16:53:35 +03:00 |
|
|
86e4bbeca5
|
Web: Client: added Tabs container to accessRight page
|
2019-11-11 16:42:03 +03:00 |
|
Ilya Oleshko
|
459365256e
|
web: Components: Fixed RowContainer component tests
|
2019-11-11 16:05:33 +03:00 |
|
|
9c96050c8c
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-11 15:58:28 +03:00 |
|
|
f9424ced2d
|
Web: Components: added new tabs-container test
|
2019-11-11 15:58:19 +03:00 |
|
|
69cc76a240
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-11-11 15:57:41 +03:00 |
|
|
6d1858676f
|
web: components: fix article-pin-panel height
|
2019-11-11 15:57:17 +03:00 |
|
Ilya Oleshko
|
1c7b86777b
|
web: Components: Added tests in Row component
|
2019-11-11 15:46:54 +03:00 |
|
|
469d052e23
|
web: components: bump version
|
2019-11-11 15:29:01 +03:00 |
|
|
ecfba6af55
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-11 15:28:26 +03:00 |
|
|
2cbeb016c2
|
Web: Components: fixed TabContainer styles
|
2019-11-11 15:28:13 +03:00 |
|
|
ee88810446
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-11-11 15:00:47 +03:00 |
|
|
64dd026049
|
web: components: bump version
|
2019-11-11 15:00:32 +03:00 |
|
|
688a2913f8
|
web: components: footer with bottom alignment in modal dialog with aside view
|
2019-11-11 15:00:18 +03:00 |
|
Ilya Oleshko
|
3459e673a0
|
web: components: bump version
|
2019-11-11 14:56:41 +03:00 |
|
Ilya Oleshko
|
1d03111bd7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-11-11 14:55:49 +03:00 |
|
Ilya Oleshko
|
f888c3e2ba
|
web: Components: Added tests in ContextMenu component
|
2019-11-11 14:55:39 +03:00 |
|
Ilya Oleshko
|
41c0d12076
|
web: Components: Bulky functions are broken into many small ones in ContextMenu component
|
2019-11-11 14:55:05 +03:00 |
|
|
ebd5b238cd
|
Web: Client: added sorter by first name/last name to accessRights page, added translations, applied a field filter for api requests
|
2019-11-11 13:57:19 +03:00 |
|
|
9d2862bf9e
|
Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
|
2019-11-11 12:03:49 +03:00 |
|
Ilya Oleshko
|
4c9679b0bd
|
web: Components: Fixed readme of ContextMenu component
|
2019-11-11 11:12:44 +03:00 |
|
Ilya Oleshko
|
a7ed0e8910
|
web: Components: Fixed story of ContextMenu component
|
2019-11-11 11:12:30 +03:00 |
|
Ivan Habarov
|
ee29f1e01b
|
web: components: improved adaptability
|
2019-11-11 11:00:58 +03:00 |
|
|
9640fb7633
|
Web: Client: added loader on accessRights page
|
2019-11-11 09:45:52 +03:00 |
|
|
50f06898d7
|
Merge branch 'master' into refactoring/di
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2019-11-10 18:22:02 +03:00 |
|
|
6ac10fac2f
|
ISettings replaced with ISettingsExt
|
2019-11-08 18:11:30 +03:00 |
|
Ilya Oleshko
|
0e9bd627a1
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-11-08 15:50:41 +03:00 |
|
Ilya Oleshko
|
bd9d2d7dcf
|
web: components: bump version
|
2019-11-08 15:50:30 +03:00 |
|
Ilya Oleshko
|
5e10486975
|
web: Components: Fixed getUserRole conditions for Layout component
|
2019-11-08 15:50:13 +03:00 |
|
|
ed4269eb83
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-08 15:41:10 +03:00 |
|
|
ffa5ba9a1f
|
Web: Client: added filterInput to accessRights page
|
2019-11-08 15:41:03 +03:00 |
|
|
32781a87e2
|
DI: refactoring. Extract settings helpers
|
2019-11-08 15:21:51 +03:00 |
|
Ilya Oleshko
|
5a2fc248d3
|
web: components: bump version
|
2019-11-08 15:04:48 +03:00 |
|
Ilya Oleshko
|
967e0f62c6
|
web: Components: Fixed getUserRole function for module admins at Layout component
|
2019-11-08 15:04:33 +03:00 |
|
Ilya Oleshko
|
7a569af04c
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-11-08 14:52:13 +03:00 |
|
Ilya Oleshko
|
4e1ae0d953
|
web: Client: Hide Settings for People module administrator
|
2019-11-08 14:49:12 +03:00 |
|
|
da90f1d99f
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-08 14:05:12 +03:00 |
|
|
19b1a0a825
|
Web: Client: fixed paging navigation on accessRights page, deleted OwnerId from settingController
|
2019-11-08 14:05:06 +03:00 |
|
Ivan Habarov
|
16efc9b8fe
|
web: components: bump version
|
2019-11-08 12:04:47 +03:00 |
|
|
13dd41db34
|
Merge pull request #6 from ONLYOFFICE/feature/empty-container-v2
Feature/empty container v2
|
2019-11-08 11:37:38 +03:00 |
|
|
b66970c03a
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-08 11:29:03 +03:00 |
|
|
88ab13fcc6
|
Web: Client: fixed paging on accessRights page
|
2019-11-08 11:28:56 +03:00 |
|
Daniil Senkiv
|
fd0d8b48be
|
Web.Client: added expanded message fro authorized users
|
2019-11-08 10:56:47 +03:00 |
|
Daniil Senkiv
|
282cf20997
|
Web.Client: Settings: Customization: fixed in constructor: select first item in timezone and language comboboxes, if not found current value from redux
|
2019-11-08 10:55:35 +03:00 |
|
|
cddd6ce1ed
|
Web: Client: fixed paging visibility
|
2019-11-08 09:48:57 +03:00 |
|
|
43fb0bd7b5
|
Web: Client: added paging to accessRights page, added new translations, added filter to accessRights page, renamed actions, deleted unused selectors, added filter to getListAdmins api
|
2019-11-08 09:27:00 +03:00 |
|
Ivan Habarov
|
9113cd75a9
|
Replaced EmptyContentButtonsContainer to div
|
2019-11-07 17:58:13 +03:00 |
|
Ivan Habarov
|
4af1526736
|
New version of component EmptyScreenContainer, transition to use css-grid
|
2019-11-07 17:58:12 +03:00 |
|
Ivan Habarov
|
6a0634c97b
|
Changed EmptyContentDescriptionContainer to using only Text.Body component
|
2019-11-07 17:57:48 +03:00 |
|
Ivan Habarov
|
ca1f100a02
|
web: Components: Init new version of EmptyScreenContainer
|
2019-11-07 17:56:56 +03:00 |
|
Daniil Senkiv
|
66b4be5ad7
|
web: components: bump version
|
2019-11-07 17:12:14 +03:00 |
|
Daniil Senkiv
|
6ccca21fb3
|
Web.Client: Settings: Customization: fixed: select first item in timezone and language comboboxes, if not found current value from redux
|
2019-11-07 17:12:00 +03:00 |
|
Daniil Senkiv
|
73bdaf53b4
|
Web.Components: Link: fixed text-decoration style
|
2019-11-07 16:43:53 +03:00 |
|
Daniil Senkiv
|
59efd48c37
|
web: components: bump version
|
2019-11-07 15:47:26 +03:00 |
|
Daniil Senkiv
|
2f623c4ed6
|
Web.Components: LinkWithDropdown/DropDownItem: removed color, fontSize props
|
2019-11-07 15:47:04 +03:00 |
|
Daniil Senkiv
|
711c266ae3
|
web: components: bump version
|
2019-11-07 15:01:52 +03:00 |
|
Daniil Senkiv
|
70f86f7958
|
Web.Components: added prop color to DropDownItem component, applied to LinkWithDropdown component
|
2019-11-07 15:00:18 +03:00 |
|
Daniil Senkiv
|
a968c197df
|
Web.Components: LinkWithDropdown: added rotation arrow depending on state
|
2019-11-07 14:53:02 +03:00 |
|
Daniil Senkiv
|
6080717e4f
|
Web.Component: LinkWithDropdown: fixed text styles
|
2019-11-07 13:45:36 +03:00 |
|
Daniil Senkiv
|
ed2e75a4be
|
Web.Components: added prop fontSize to DropDownItem component, applied to LinkWithDropdown component
|
2019-11-07 12:38:55 +03:00 |
|
Daniil Senkiv
|
3c3f40a65d
|
Web.Components: LinkWithDropdown: fixed passing prop fontSize
|
2019-11-07 12:25:05 +03:00 |
|
Daniil Senkiv
|
e38d56c79b
|
Web.Components: LinkWithDropdown: added className prop
|
2019-11-07 12:19:34 +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 |
|
|
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 |
|
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 |
|
|
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 |
|
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 |
|
|
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 |
|