Commit Graph

5020 Commits

Author SHA1 Message Date
133ba4f715 Merge branch 'feature/redesign' of github.com:ONLYOFFICE/AppServer into feature/redesign 2020-02-13 11:12:58 +03:00
507cd94e98 Merge branch 'master' into feature/redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-02-13 11:09:37 +03:00
336eaa6742 web: components: bump version 2020-02-13 10:39:20 +03:00
0538252147 web: common: bump version 2020-02-13 10:39:09 +03:00
b5510540aa Web: Common: added logo to header 2020-02-13 10:38:49 +03:00
de4b4a0dde Files: DI 2020-02-12 18:21:58 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
9cb4e91d4a Web: Components: fixed tree margin 2020-02-12 16:44:01 +03:00
Ilya Oleshko
cc4eb46c01 web: common: bump version 2020-02-12 16:18:41 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
cafece5778 web: components: bump version 2020-02-12 15:26:57 +03:00
2655813d8c web: common: bump version 2020-02-12 15:26:41 +03:00
6d530d2c8e Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign 2020-02-12 15:26:25 +03:00
70598c21c7 Web: Common: fixed PageLayout filter position on mobile version 2020-02-12 15:26:16 +03:00
NikolayRechkin
143624d535 web: components: bump version 2020-02-12 14:36:03 +03:00
NikolayRechkin
45cd442c13 Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign 2020-02-12 14:35:41 +03:00
NikolayRechkin
f8fec933c3 web: components: fix a select in FilterInput 2020-02-12 14:35:25 +03:00
52876c8932 Web: Components: removed margin from row-container 2020-02-12 14:19:41 +03:00
f8eec21893 Web: Common: fixed PageLayout section-body padding 2020-02-12 14:18:57 +03:00
00246f7f9f Files: Startup 2020-02-12 13:48:58 +03:00
0da5b85eb8 Files: DI, EF 2020-02-12 13:29:10 +03:00
bc647d9c3d web: common: bump version 2020-02-12 13:08:58 +03:00
78e8504d67 web: components: bump version 2020-02-12 13:08:28 +03:00
43f662acd1 Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign 2020-02-12 13:07:45 +03:00
d03c28fe59 Web: Components: fixed input user-select, fixed filter colors 2020-02-12 13:07:39 +03:00
dfb53cbfea Web: Common: fixed filter position 2020-02-12 13:04:37 +03:00
8298a77717 Web: Client: fixed tree icons 2020-02-12 13:03:23 +03:00
124d243d1c Web: Components: fixed tree-menu margin 2020-02-12 13:02:27 +03:00
Ilya Oleshko
1d7bdb03b0 People.Client: Home: Fixed GroupButtonsMenu size with pined Aside on mobile 2020-02-12 11:40:56 +03:00
76f9319d4a web: Components: Added dropDownMaxHeight for ComboBox in FilterItem 2020-02-12 10:47:18 +03:00
159bdc1a72 Merge branch 'master' into feature/redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-02-12 09:40:56 +03:00
Ilya Oleshko
da37ffcb11 web: components: bump version 2020-02-12 09:36:37 +03:00
Ilya Oleshko
6701f3cdb7 Web: Components: Icon: Fixed svg icons, no more mask 2020-02-12 09:36:19 +03:00
965e8df12b Core: Resources 2020-02-11 18:41:40 +03:00
816231d9e9 Files: DI 2020-02-11 18:15:39 +03:00
fdf5b27903 Files: DI 2020-02-11 18:10:30 +03:00
e6e38befa8 web: common: bump version 2020-02-11 16:49:07 +03:00
36d5f594ae web: Common: Fixed invalid iconName mapping 2020-02-11 16:48:48 +03:00
c900a319de Added update user list after remove disabled user 2020-02-11 15:28:18 +03:00
9fd33a1ef8 Files: DI 2020-02-11 15:10:06 +03:00
cc6b4db2f1 Files: DI 2020-02-11 14:51:45 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +03:00
1291be98e3 Autofac: fix 2020-02-11 13:47:04 +03:00
3e61074a44 Files: DI 2020-02-11 12:39:32 +03:00
Ilya Oleshko
9ee88c327d web: common: bump version 2020-02-11 11:23:59 +03:00
Ilya Oleshko
3b08321c32 web: components: bump version 2020-02-11 11:23:49 +03:00
Ilya Oleshko
917fc0ebd1 Web: Components: DropDown: Fixed change direction 2020-02-11 11:23:30 +03:00
Ilya Oleshko
ebceb3b346 People.Client: Home: Fixed default DropDown direction for action button 2020-02-11 11:12:39 +03:00
Ilya Oleshko
0e8adf3066 Web: Common: PageLayout: Fixed Article pin on mobile 2020-02-11 11:11:34 +03:00
2d73943b81 Files: DI 2020-02-10 19:04:54 +03:00