TatianaLopaeva
|
8ecc93a30c
|
Changed logic of upload license
|
2020-09-16 10:33:06 +03:00 |
|
TatianaLopaeva
|
3eeb24a5b5
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-15 17:52:45 +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
|
b936ae2b91
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 17:36:40 +03:00 |
|
Vladislav Makhov
|
8da994f92c
|
Web: Common: fix login error handling
|
2020-09-15 17:35:57 +03:00 |
|
TatianaLopaeva
|
d8abe20133
|
Refactoring
|
2020-09-15 17:23:57 +03:00 |
|
Artem Tarasov
|
58a43ed52d
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 16:24:57 +03:00 |
|
Vladislav Makhov
|
d4f4691fef
|
Web: People: Change width values for rows
|
2020-09-15 16:22:58 +03:00 |
|
Vladislav Makhov
|
a0024722d0
|
Web: Files: Change width values for rows
|
2020-09-15 16:22:41 +03:00 |
|
Artem Tarasov
|
6a76e12027
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 16:22:38 +03:00 |
|
Artem Tarasov
|
6153e02c54
|
Web: People: added translation for Head field in GroupAction if there is no owner
|
2020-09-15 16:22:07 +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 |
|
|
|
6231d0654f
|
Web: Files: fixed isCanCreate selector to Header
|
2020-09-15 15:47:39 +03:00 |
|
Artem Tarasov
|
89baffc5d6
|
Web: People: fixed display of profile removed if the group was created without an owner
|
2020-09-15 15:36:43 +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
|
9c0bac60f5
|
Web:People: fixed styles for TreeMenu
|
2020-09-15 15:05:40 +03:00 |
|
Artem Tarasov
|
2c831475f1
|
web: components: bump version
|
2020-09-15 14:51:44 +03:00 |
|
Artem Tarasov
|
861ab54818
|
Web:Files; refactoring styled SettingsTree
|
2020-09-15 14:51:28 +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 |
|
TatianaLopaeva
|
ce32451441
|
Changed reducer and actions: added setLicenseUpload and resetUploadedLicense
|
2020-09-15 14:16:12 +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 |
|
TatianaLopaeva
|
ed85445dcc
|
Changed format
|
2020-09-15 11:10:19 +03:00 |
|
TatianaLopaeva
|
7da745b96c
|
Refactoring actions and reducer
|
2020-09-15 11:01:54 +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 |
|
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
|
b4d0776ca4
|
Web:People: changed check for rendering PageLayout.ArticleMainButton
|
2020-09-14 14:34:42 +03:00 |
|
Artem Tarasov
|
2bcf9ca3bb
|
web: components: bump version
|
2020-09-14 14:32:56 +03:00 |
|
Artem Tarasov
|
3e42b49c3e
|
Web:People: added icons for tree nodes, changed icon for root folder
|
2020-09-14 14:31:44 +03:00 |
|
Vladislav Makhov
|
7cc130bdc9
|
Web: Common: sorting dropdown is now hiding, when option clicked
|
2020-09-14 14:02:11 +03:00 |
|
Artem Tarasov
|
fc8325f65f
|
Web:Files: refactoring SettingsTree
|
2020-09-14 13:53:37 +03:00 |
|
TatianaLopaeva
|
1f887f4b5b
|
Refactoring
|
2020-09-14 12:31:56 +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 |
|
|
|
09c8febfd3
|
Web: Files: Removed setup wrong title
|
2020-09-11 22:40:52 +03:00 |
|
|
|
de290abd57
|
Web: Files: Replaced invalid characters
|
2020-09-11 22:40:09 +03:00 |
|
|
|
51709f3c6d
|
Web: Files: Changed default cursor in TreeSettings on loading
|
2020-09-11 22:39:22 +03:00 |
|
|
|
a44b4bc60a
|
Web: Files: Fixed setIsLoading is undefined on triangle icon click
|
2020-09-11 22:38:50 +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 |
|
|
|
c989eaf8a5
|
Web: Files: Changed default cursor in FolderTree on loading
|
2020-09-11 22:04:00 +03:00 |
|
