Commit Graph

4827 Commits

Author SHA1 Message Date
e989bc0b75 web: components: bump version 2020-09-15 22:43:55 +03:00
d750335924 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-09-15 22:43:37 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
c4b686daa3 web: components: bump version 2020-09-15 22:33:53 +03:00
0f704b7f5e Web: Components: Replaced package react-avatar-editor to with local code 2020-09-15 22:33:19 +03:00
4d3bc676ce Web: Components: Styled AvatarEditor 2020-09-15 22:31:52 +03:00
a9ce44a563 Web: Components: Changed svg icons 2020-09-15 22:30:19 +03:00
7c5a7dcbb8 Web: Components: Added contentHeight/contentWidth to ModalDialog 2020-09-15 22:29:14 +03:00
57f2025cd9 Web: Components: Renamed isContainsFile to existImage 2020-09-15 22:27:58 +03:00
TatianaLopaeva
96d0d94535 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 17:40:31 +03:00
TatianaLopaeva
a3adea3c27 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
Vladislav Makhov
8da994f92c Web: Common: fix login error handling 2020-09-15 17:35:57 +03:00
68d43001c3 web: common: bump version 2020-09-15 15:48:55 +03:00
4e34836e4e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-15 15:47:47 +03:00
3c0d0c0523 Web: Common: fixed filter styles 2020-09-15 15:10:12 +03:00
Artem Tarasov
fcf878dd6b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 15:06:00 +03:00
Artem Tarasov
2c831475f1 web: components: bump version 2020-09-15 14:51:44 +03:00
Artem Tarasov
1c3d96ee95 Web:Components: TreeMenu: added props isEmptyRootNode 2020-09-15 14:50:14 +03:00
01a8aa22b4 web: common: bump version 2020-09-15 14:47:53 +03:00
584bee8198 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-15 14:47:03 +03:00
01d6e7d3ad Web: Commpon: fixed the display of the filter selector element 2020-09-15 14:46:53 +03:00
Artem Tarasov
7b33aeb6da web: components: bump version 2020-09-15 13:15:18 +03:00
Artem Tarasov
2e3f2075c1 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 13:15:10 +03:00
Artem Tarasov
dea62a40f7 Web:Components: added props isFullFillSelection, gapBetweenNodes, gapBetweenNodesTablest 2020-09-15 13:14:11 +03:00
2800aa92fe Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 10:39:05 +03:00
Alexey Kostenko
33cce1d47e web: components: bump version 2020-09-15 09:02:44 +03:00
Alexey Kostenko
72ac3e9b15 Web: Client/Components: Fix dropDown styles on wizard 2020-09-15 09:02:24 +03:00
c760b61f92 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-14 22:04:48 +03:00
90b73fa631 Web: Componnets: Styling AvatarEditor on desktop 2020-09-14 22:04:40 +03:00
Artem Tarasov
d731e2cafa Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-14 14:35:36 +03:00
Artem Tarasov
2bcf9ca3bb web: components: bump version 2020-09-14 14:32:56 +03:00
Vladislav Makhov
7cc130bdc9 Web: Common: sorting dropdown is now hiding, when option clicked 2020-09-14 14:02:11 +03:00
Alexey
525412c98c web: components: bump version 2020-09-14 08:52:06 +03:00
Alexey
69b8d0ec7d Web: Files/People/Components: Content rendered without columns on mobile devices 2020-09-14 08:51:54 +03:00
65fbf2247e Update yarn.lock files 2020-09-11 22:51:28 +03:00
df1cfafb45 web: components: bump version 2020-09-11 22:41:33 +03:00
8045eecf1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-09-11 22:30:09 +03:00
99a6fd523e Web: Client: Moved organizationName into authReducer 2020-09-11 18:03:40 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
Alexey
d457266fbc web: components: bump version 2020-09-11 12:55:47 +03:00
Alexey
564f1828ca Web: Components: Fixed icons in dropDownItem in mainButton 2020-09-11 12:55:30 +03:00
Alexey
2917b302c8 web: components: bump version 2020-09-11 10:27:58 +03:00
Alexey
b56605468c Web: Components: Fixed incorrect display when rendering long text 2020-09-11 10:27:41 +03:00
Alexey
ae4323ec64 web: components: bump version 2020-09-11 08:57:25 +03:00
Alexey
ae4bb0d01c Web: Components: Fix context menu (incorrect width when first opened) 2020-09-11 08:57:03 +03:00
ab75c4ba88 web: components: bump version 2020-09-10 16:34:43 +03:00
e4c359617f Web: Components: fixed link-with-dropdown maxHeight prop 2020-09-10 16:34:01 +03:00
Artem Tarasov
6a219488e9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 16:01:30 +03:00
Vladislav Makhov
0496705714 Login Page: fix styles 2020-09-10 14:49:57 +03:00
Vladislav Makhov
11a94363de Update README.md 2020-09-10 14:14:46 +03:00