Commit Graph

1290 Commits

Author SHA1 Message Date
f747e0e4fc IDE0028, IDE0016, IDE0029, IDE0032 2019-08-15 16:56:54 +03:00
9bee426464 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/Layout.js
2019-08-15 16:52:56 +03:00
8a2310c8e1 web: Client: Re-written StudioLayout 2019-08-15 16:47:00 +03:00
Ilya Oleshko
3c8ceade5d Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 16:42:57 +03:00
Ilya Oleshko
7ec81c6501 web: Components: Fixed Layout story error. 2019-08-15 16:42:42 +03:00
b426004f70 IDE0019, IDE0020 2019-08-15 16:41:38 +03:00
96dd3cd657 IDE0017 2019-08-15 16:35:18 +03:00
NikolayRechkin
52e1ad7d71 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 16:28:52 +03:00
3636df7a24 IDE0031 2019-08-15 16:28:29 +03:00
5dcbe56092 web: People: Decreased count of PeopleLayout render 2019-08-15 16:27:50 +03:00
NikolayRechkin
d7096f61da web: components: added a select in filter item 2019-08-15 16:27:13 +03:00
c7d163b37d IDE0016 2019-08-15 16:20:23 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
Daniil Senkiv
937c1de58f Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 16:08:44 +03:00
Daniil Senkiv
696431cb37 Web: components: LinkWithDropdown: fixed README 2019-08-15 16:08:19 +03:00
Daniil Senkiv
edad39ed33 Web: People: translated Layout [EN] 2019-08-15 16:07:16 +03:00
d9be7211f6 IDE0018 2019-08-15 16:05:50 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f8f2c94962 IDE0034 2019-08-15 16:00:20 +03:00
e1234d900c web: Client: Added loading portal settings 2019-08-15 15:46:53 +03:00
c11896b962 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 15:34:39 +03:00
778d58664a web: components: Fixed warning Module not found: Error: Can't resolve './locale' 2019-08-15 15:34:23 +03:00
ac6dcf34a0 web: components: Removed useless import 2019-08-15 15:07:41 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
93ae8acba9 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:54:26 +03:00
Ilya Oleshko
8758b7a6e9 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:54:01 +03:00
Ilya Oleshko
5765554125 web: People: Profile: Fixed departments link type and isSelf option 2019-08-15 14:53:49 +03:00
2ac4246122 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:53:17 +03:00
475b0cb8e5 web: Storybook: Fixed 'styled-components' resolution 2019-08-15 14:53:07 +03:00
3ebea6f0bc ResourceManager: fix 2019-08-15 14:52:47 +03:00
2a8adce631 ResourceManager: fixed 2019-08-15 14:40:44 +03:00
65563552fa Packages updated 2019-08-15 14:33:57 +03:00
Ilya Oleshko
63ac932a3d web: Components: Added manualX property for DropDown component and story. 2019-08-15 14:08:49 +03:00
6a1220efe2 web: People: Added styled-components 2019-08-15 13:30:55 +03:00
14e995a7ec fix 2019-08-15 12:23:59 +03:00
234c77419f ResourceManager: check exist 2019-08-15 12:14:10 +03:00
697af9ca32 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 12:11:11 +03:00
97a84cde69 web: Client: Re-written Login page to styled components 2019-08-15 12:02:03 +03:00
109b41bfa6 web: Client: Added styled-components 2019-08-15 12:01:31 +03:00
1fa6b0e140 web: components: Moved styled-components to peerDependencies 2019-08-15 12:00:43 +03:00
ddfbab4c24 Resources: notify 2019-08-15 11:44:27 +03:00
Ilya Oleshko
0045a52a6a web: People: Profile: Fixed context options mapping 2019-08-15 11:16:19 +03:00
427b880f3b web: People: Refactoring: Moved function 2019-08-15 10:50:54 +03:00
d4d0cd687d web: People: Refactoring: Removed useless imports; 2019-08-15 10:50:31 +03:00
4d18d6a894 web: Client: Refactoring: Moved actions and reducers to store folder;
Moved utils to store/services folder;
Made Home component lazy;
2019-08-15 10:48:16 +03:00
Ilya Oleshko
9486d11f56 web: People: Profile: Moved back to PageLayout 2019-08-15 10:21:04 +03:00
4e70bd627f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-14 17:52:12 +03:00
1ecb618bfb web: people: Added restricted prop to PrivateRoute (to prevent direct movement to Admin's functional) 2019-08-14 17:52:03 +03:00
Ilya Oleshko
8a145d998a Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-14 17:24:56 +03:00
Ilya Oleshko
e3fd281af4 web: People: Fixed paging options. Fixed totalPages checking. 2019-08-14 17:24:41 +03:00