Commit Graph

2360 Commits

Author SHA1 Message Date
f294b60940 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-14 10:26:00 +03:00
Alexey Kostenko
9bdf52ce07 Web: Components: Fix warning 2020-10-13 17:44:42 +03:00
Alexey Kostenko
87d2c42a6b Web: Component: Style fix 2020-10-13 17:31:36 +03:00
Alexey Kostenko
e95be64ea6 Web: Components/People: Small refactoring 2020-10-13 16:57:44 +03:00
Alexey Kostenko
9a144cb8c4 Web: Components: Style fix 2020-10-13 14:52:45 +03:00
TatianaLopaeva
df8fbcc050 Web: Components: Update icon by layout 2020-10-12 16:58:06 +03:00
TatianaLopaeva
1010886262 Web: Refactoring 2020-10-12 16:56:34 +03:00
824961ddec Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring 2020-10-12 15:28:36 +03:00
Vladislav Makhov
a179ae0e6c Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-12 14:45:53 +03:00
Vladislav Makhov
2476b306f9 Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	web/ASC.Web.Common/src/api/files/index.js
#	web/ASC.Web.Components/package.json
2020-10-12 10:04:24 +03:00
Alexey Kostenko
237f737ba7 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-11 20:04:18 +03:00
615f514bfd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-10-09 17:24:50 +03:00
Ilya Oleshko
5e8a4727ac Web: Components : Row : Added contentElement 2020-10-09 17:07:35 +03:00
718dc8cc5a Web: Files: fixed dragging 2020-10-08 17:54:04 +03:00
Alexey Kostenko
95c3a379f7 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-08 11:03:59 +03:00
Alexey Kostenko
a1e1915085 Web: Components: Hidden buttons for symmetrical reflection of the avatar 2020-10-08 10:47:49 +03:00
Vladislav Makhov
a72c087e2a Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-08 10:18:06 +03:00
Alexey Kostenko
f5592333c8 Web: People/Client: Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving, refactoring (remove callback using) 2020-10-08 09:55:20 +03:00
Vladislav Makhov
b24bc1f05a Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-07 17:11:40 +03:00
Alexey Kostenko
d5b62f7bb2 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-07 15:30:56 +03:00
TatianaLopaeva
de7e4fe062 Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-10-07 15:14:54 +03:00
Vladislav Makhov
df482665d7 Add "Recent" icon. 2020-10-07 13:59:03 +03:00
TatianaLopaeva
ee460787d5 Web: Components: Refactoring 2020-10-07 10:59:31 +03:00
Vladislav Makhov
1992be53b8 Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
2020-10-06 11:40:12 +03:00
Alexey Kostenko
5df3850527 Web: People/Components: Added handling of the cancel button 2020-10-06 07:00:37 +03:00
TatianaLopaeva
d5dbebfe1e Web: Components: Refactoring 2020-10-05 21:22:03 +03:00
TatianaLopaeva
2b848be23d Web: Components: Change styles by layout 2020-10-05 20:38:13 +03:00
b741d9c7d7 Web: Components: Remove debugger 2020-10-05 18:25:24 +03:00
Alexey Kostenko
b45965a15c Web: Components/People: Added cancel button on avatar editor page 2020-10-05 17:15:25 +03:00
TatianaLopaeva
b3d82c1e25 Changed font-style and font-weight for EmptyScreenContainer 2020-10-05 16:20:33 +03:00
0add76cd16 Web: Components: Added fix of error displaying 2020-10-05 16:09:35 +03:00
Alexey Kostenko
e6572e9574 Web: People/Components: Style fix, added translate keys 2020-10-05 15:39:55 +03:00
Alexey Kostenko
98d006d825 Web: Components: Fix mobile styles on AvatarEditor 2020-10-04 14:41:39 +03:00
Vladislav Makhov
3e4cdf4379 Add icon 2020-10-02 16:49:24 +03:00
Alexey Kostenko
19a7d88fe1 Web: People/Components: Fix save avatar, added AvatarEditor component on AvatarEditor page 2020-10-02 10:10:40 +03:00
Vladislav Makhov
c92a6d9c1c Add Favorite catalog icon 2020-09-29 13:33:52 +03:00
Vladislav Makhov
218722ad4b Add Favorites icon 2020-09-29 09:54:16 +03:00
TatianaLopaeva
ea2f5ec097 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-29 09:06:16 +03:00
Alexey Kostenko
d29e743a2b Web: Components: Changed animation of toast notifications, fixed styles for mobile devices 2020-09-29 08:14:29 +03:00
TatianaLopaeva
48854fcb5e Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 10:14:35 +03:00
TatianaLopaeva
eac4556983 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-25 10:44:31 +03:00
Alexey Kostenko
3a9d6f704d Web: Components: Fix toast styles 2020-09-25 09:42:56 +03:00
Alexey Kostenko
a8f987cca8 Web: Components: Restyle Toast 2020-09-25 09:01:05 +03:00
TatianaLopaeva
a99796c122 Changed padding by figma layout 2020-09-24 14:14:47 +03:00
TatianaLopaeva
89f11d6484 Refactoring button/index 2020-09-24 14:11:34 +03:00
TatianaLopaeva
1849e3712d Merge branch 'feature/files' into feature/payments-enterprise 2020-09-23 15:25:23 +03:00
Artem Tarasov
b09e770834 Web: Components: tree-menu: fixed margin-left of swithcer 2020-09-23 14:09:04 +03:00
4892f01960 Web: Components: fixed context menu clickability 2020-09-22 17:06:58 +03:00
Artem Tarasov
0dbbbc3ab6 Web: Components: fixed color props passing in row-content 2020-09-22 15:14:44 +03:00
7a665f229e Web: Components: fixed hiding items on iOS devices 2020-09-22 09:23:27 +03:00
TatianaLopaeva
ca420104fc Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
809d167e29 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-18 15:54:55 +03:00
44d63d3642 Web: Components: fixed Dnd styles 2020-09-18 15:43:08 +03:00
Alexey Kostenko
ab2a7b7fdb Web: Components: Fix DropDown in mainMutton 2020-09-18 10:44:30 +03:00
Alexey Kostenko
c88bca4a4b Web: Components: Fix ContextMenu background in Firefox 2020-09-18 10:13:06 +03:00
TatianaLopaeva
fbb0787eff Added AcceptLicense 2020-09-17 17:07:32 +03:00
Alexey Kostenko
dfd94a854f Web: Components/Common: Added new width constant for pin/unpin, style fix 2020-09-17 13:22:47 +03:00
TatianaLopaeva
a858a3a846 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-17 11:25:51 +03:00
e66ca03cbb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-16 18:08:41 +03:00
ecb2879a77 Web: Components: Styled AvatarEditor + applied changes 2020-09-16 18:08:32 +03:00
Vladislav Makhov
0a7bc4d75f Web: Components: fix z-index value 2020-09-16 12:34:22 +03:00
b9b94b1784 WebL Components: Fixed tests on AvatarEditor 2020-09-15 23:16:16 +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
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
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
Artem Tarasov
1c3d96ee95 Web:Components: TreeMenu: added props isEmptyRootNode 2020-09-15 14:50:14 +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
72ac3e9b15 Web: Client/Components: Fix dropDown styles on wizard 2020-09-15 09:02:24 +03:00
90b73fa631 Web: Componnets: Styling AvatarEditor on desktop 2020-09-14 22:04:40 +03:00
Alexey
69b8d0ec7d Web: Files/People/Components: Content rendered without columns on mobile devices 2020-09-14 08:51:54 +03:00
Alexey
564f1828ca Web: Components: Fixed icons in dropDownItem in mainButton 2020-09-11 12:55:30 +03:00
Alexey
b56605468c Web: Components: Fixed incorrect display when rendering long text 2020-09-11 10:27:41 +03:00
Alexey
ae4bb0d01c Web: Components: Fix context menu (incorrect width when first opened) 2020-09-11 08:57:03 +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
11a94363de Update README.md 2020-09-10 14:14:46 +03:00
Vladislav Makhov
7e6fc0b600 Added new prop: saveButtonLoading 2020-09-10 14:12:05 +03:00
Artem Tarasov
11844629d9 added Icons.DepartmensGroupIcon 2020-09-10 12:49:24 +03:00
b3b6fd0938 Web: Components: Re-written ModalDialog component with SLOT pattern 2020-09-09 21:49:25 +03:00
Vladislav Makhov
0b9ed12c85 Remove consumers icons 2020-09-08 14:37:17 +03:00
72f5e6161d Web: Components: fix empty screen container 2020-09-08 10:37:40 +03:00
64dd0e2bd6 Web: Components: fixed empty-screen-container 2020-09-08 09:57:04 +03:00
72ebd235ec Merge branch 'feature/files' into feature/payments-enterprise 2020-09-07 18:42:57 +03:00
58d2db1d97 Web: Components: fixed text-input disable color 2020-09-07 18:10:40 +03:00
TatianaLopaeva
71fee5aab4 Added id for FileInput 2020-09-06 13:04:33 +03:00
4686122183 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-04 10:15:48 +03:00
Vladislav Makhov
3000bf00bf Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings 2020-09-03 18:10:00 +03:00
94fe24b3bd Merge branch 'feature/files' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2020-09-03 17:43:44 +03:00
Vladislav Makhov
f7aeb419a1 Add Integration Icon 2020-09-03 12:28:32 +03:00
Vladislav Makhov
c95fab6eae Add icons for third party services settings 2020-09-03 11:24:49 +03:00
Artem Tarasov
70ea5261db Changed layout of ToggleButton (fixed indent for caption) 2020-09-02 18:02:36 +03:00
Ilya Oleshko
3feccaaca7 Web: Components: Fixed ESLint validation 2020-09-01 16:55:28 +03:00
Ilya Oleshko
a15e1756d3 Web: Components: EmailInput, GroupButtonsMenu : Fixed ESLint validation for props 2020-09-01 16:28:35 +03:00
Ilya Oleshko
1652513c73 Web: Components: RowContent : Added new property for more adaptive resize, fixed not work (ignore) styles 2020-09-01 15:20:55 +03:00
Ilya Oleshko
d8b0f60800 Web: Components: Row : Fixed refs, now it create inside constructor, add missing PropType 2020-09-01 15:17:59 +03:00
Ilya Oleshko
cdc370b04b Web: Components: Utils : Size constants now imported like object of numbers 2020-09-01 15:15:43 +03:00
TatianaLopaeva
6ee4cbc5b4 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-01 11:05:58 +03:00
946ed771ac Web: Components: fixed empty-screen-container to new article 2020-08-31 16:31:56 +03:00
TatianaLopaeva
2022bd4ac1 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
da91e178d4 Added a link to payments and icon to sidebar 2020-08-28 10:45:56 +03:00
Vladislav Makhov
a49a5e6b19 Merge branch 'feature/files' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-27 12:15:42 +03:00
0178acb2f0 Web: Components: fixed drag-and-drop styles 2020-08-26 13:14:36 +03:00
60bf8d02f1 Web: Components: added react-dropzone library to drag-and-drop component 2020-08-26 11:34:01 +03:00
232da628f8 Web: Components: fixed tree styles, fixed main button styles 2020-08-24 11:20:40 +03:00
Vladislav Makhov
1753237830 Add icons 2020-08-24 10:17:35 +03:00
7982449828 Web: Components: fixed the display of the context-menu-button 2020-08-21 16:19:09 +03:00
2c17848368 Web: Components: fixed context menu displayType state 2020-08-20 17:40:35 +03:00
0f1ecd1ae2 Web: Components: update ContextMenuButton styles 2020-08-19 17:45:06 +03:00
Ilya Oleshko
53da5042f8 Web: Components: GroupButtonsMenu : Added orientationchange event listener 2020-08-19 15:38:46 +03:00
8617da3c50 Web: Components: added aside panel to context-menu-button 2020-08-19 10:36:27 +03:00
Ilya Oleshko
fc0fbec33e Web: Components: GroupButtonsMenu : Fix tests 2020-08-18 14:46:00 +03:00
Ilya Oleshko
2a5db42e40 Web: Components: GroupButtonsMenu : Fix update menu with uncommon size 2020-08-18 13:20:06 +03:00
8dba11ac56 Web: Components: fixed scroll styles, fixed separator styles 2020-08-17 16:43:47 +03:00
487ea08bb5 Web: Components: fixed badge styles, added isFill prop to context-menu-button 2020-08-14 17:05:47 +03:00
Alexey
9084bbb692 Web: Components: Added keyboard handling to SaveCancelButtons component 2020-08-14 09:35:07 +03:00
Alexey
8987b29192 Web: Components: Style fix 2020-08-14 09:21:35 +03:00
Alexey
a9627fd9ef Web: Components: Added test and storybook to SaveCancelButtons component 2020-08-14 09:05:07 +03:00
Alexey
fada82ae41 Web: Components: Fix rotate in avatar editor 2020-08-14 08:29:15 +03:00
4891311488 Merge branch 'feature/files' into feature/customization
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-13 10:15:11 +03:00
5795c6f324 Merge branch 'feature/files' into feature/customization
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Components/src/index.js
2020-08-13 10:07:14 +03:00
b60dad90b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 09:59:13 +03:00
f0d2d42e97 Web: Components: added new icons 2020-08-13 09:57:21 +03:00
Ilya Oleshko
b005ae7c50 Web: Components: Fix missing import 2020-08-12 18:22:22 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
Alexey
a8c0973d42 Merge branch 'feature/files' into feature/customization 2020-08-12 11:57:32 +03:00
Alexey
f252c91966 Web: Components: Moved avatar rotation button 2020-08-12 09:03:56 +03:00
Ilya Oleshko
0a17c876a6 Web: Components: Fixed test warning for ProgressBar 2020-08-11 11:04:08 +03:00
Ilya Oleshko
38b781f5fc Web: Components: Moved fix for GroupButtonsMenu, now click action used data-api, fixed test 2020-08-11 11:03:29 +03:00
Ilya Oleshko
a5fdb4a5a9 Web: Components: Moved fix for GroupButton, now click action used data-api, fixed test 2020-08-11 11:03:09 +03:00
Alexey
4a7933cab6 Merge branch 'feature/files' into feature/customization 2020-08-10 12:59:53 +03:00
Artem Tarasov
e6dea2c648 input-file fixed upload same file 2020-08-07 16:57:16 +03:00
866df98ca9 Web: Components: fixed button warning 2020-08-06 14:47:16 +03:00
Vladislav Makhov
dd1db7fbc0 Add several icons 2020-08-06 13:15:37 +03:00
Alexey
d514d8399b Web: Client: Settings: Added translate keys, refactoring 2020-08-06 10:50:04 +03:00
Alexey
2a0641decb Web: Components: Added SaveCancelButtons component 2020-08-06 10:00:41 +03:00
2805c4e31c Web: Components: added tabIndex to scroll 2020-08-05 15:19:07 +03:00
72ae1f5e9b Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Common/src/api/settings/index.js
2020-07-31 16:49:54 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +03:00
8ce8aed45d Web: Files: fixed items select 2020-07-31 12:14:44 +03:00
08ba989ab5 Web: Components: fixed row warning 2020-07-31 11:30:55 +03:00
2c83d4a6f1 Web: Components: added support for right-clicking on a row and click a context-menu-button 2020-07-31 11:08:33 +03:00
Artem Tarasov
a1d2c2c4f0 Merge branch 'master' into feature/Wizard 2020-07-30 16:04:11 +03:00
Ilya Oleshko
d575bc610d Merge branch 'master' into feature/new-login-page 2020-07-30 16:03:02 +03:00