Commit Graph

297 Commits

Author SHA1 Message Date
TatianaLopaeva
a6e3349d9e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 16:46:25 +03:00
TatianaLopaeva
5fc9376021 Web: Deleted useless exports. 2021-03-17 16:45:36 +03:00
86a63e6330 Web: Client: fixed createUser form 2021-03-17 16:35:45 +03:00
Artem Tarasov
1841730e20 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b Web: moved PeopleSelector to People 2021-03-17 13:37:22 +03:00
Vladislav Makhov
7f89864990 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 13:05:51 +03:00
Vladislav Makhov
38f57bcf6c web: people: group button menu fix 2021-03-17 13:05:40 +03:00
8e7cad9b3f Web: Removed useless files 2021-03-17 12:36:14 +03:00
c08aad3ab1 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 22:47:49 +03:00
a25261f242 Web: Files: Fixed move from Folder to Settings and back 2021-03-16 22:47:41 +03:00
Ilya Oleshko
dcba414521 Web: Components: RowContainer: Fixed context-menu call on window, removed unused test 2021-03-16 16:47:16 +03:00
Alexey Kostenko
72aca76c12 Web: Files/Components: Fixed row styles 2021-03-16 16:17:50 +03:00
7b5a9ab80d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 14:10:29 +03:00
24a6d61205 Web: Added creation and run of service-worker to all client apps 2021-03-16 14:10:20 +03:00
Alexey Kostenko
25b136eada Web: Components: Files: Fixed row styles 2021-03-16 11:26:49 +03:00
6ca82e9450 Web: Components: Drop-down: fixed mobile eventTypes 2021-03-15 16:21:28 +03:00
2074cbb0d0 Web: Common: fixed StyledSectionFilter 2021-03-15 16:02:26 +03:00
8279174355 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
2021-03-15 14:57:44 +03:00
9ba58855d4 Web: Files: fixed EmptyContainer 2021-03-15 14:51:23 +03:00
Vladislav Makhov
daa0d070d5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 10:34:30 +03:00
Vladislav Makhov
ccb38f6725 web: people: fix group button menu re-render 2021-03-15 10:34:03 +03:00
Artem Tarasov
454b1a4077 Web: Components: refactoring .storybook/main.js 2021-03-14 21:42:23 +03:00
Artem Tarasov
460b34a1a8 Web: Components: added themes for storybook 2021-03-14 21:10:16 +03:00
Artem Tarasov
0748514a43 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-14 03:42:24 +03:00
Artem Tarasov
122a0501d1 Web: Components: added all story 2021-03-14 03:32:12 +03:00
Artem Tarasov
585ccaf09c Web: Components: added examples story 2021-03-14 03:17:30 +03:00
Artem Tarasov
bda09de462 Web: Components: added story for TreeMenu 2021-03-14 01:00:46 +03:00
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
1cf7415db7 Web: Added changing of base href on page load 2021-03-13 18:29:26 +03:00
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +03:00
372c06f911 Web: Fix Module not found: Error: Can't resolve 'people/GroupSelector' 2021-03-13 16:02:22 +03:00
8e1f5b30b5 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-03-13 16:01:41 +03:00
TatianaLopaeva
1675e77330 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 17:05:51 +03:00
TatianaLopaeva
71d1e79ea6 Web: Components:drop-down-item: Fix position of icons. (Ipad) 2021-03-12 17:05:18 +03:00
ca94ae28cd Web: Files: fixed empty filter container 2021-03-12 16:30:36 +03:00
Ilya Oleshko
60d1408d0d Web: Components: RowContainer: Fixed and added tests 2021-03-12 15:41:17 +03:00
Ilya Oleshko
fc2b9cff34 Web: Components: Row: Added tests 2021-03-12 15:40:49 +03:00
Ilya Oleshko
0a096a1304 Web: Components: Row: Removed unused property from PropTypes 2021-03-12 15:40:21 +03:00
e514fe1a57 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
TatianaLopaeva
06e2d54b86 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:52:42 +03:00
e8e78604f1 Web: Added products/apps dynamic loading 2021-03-12 13:52:30 +03:00
TatianaLopaeva
2d3b587286 Web: Components: main-button: Refactoring & Deleted useless import. 2021-03-12 13:52:14 +03:00
Ilya Oleshko
734675f559 Web: Components: ContextMenuButton: Returned click outside check 2021-03-12 13:42:16 +03:00
Ilya Oleshko
e673f48751 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:00:24 +03:00
Ilya Oleshko
4f7db87bb6 Web: Components: RowContainer: Fixed children mapping and removed context menu parent call 2021-03-12 12:59:32 +03:00
Ilya Oleshko
ba92cfa107 Web: Components: PageLayout: Fixed SelectedFrame value level 2021-03-12 12:58:28 +03:00
7de4fcc755 Web: Files: fixed main-button opening 2021-03-12 12:33:48 +03:00
Ilya Oleshko
466613b0c5 Web: Components: Row: Removed unused code 2021-03-12 11:48:57 +03:00
Ilya Oleshko
8364744cea Web: Components: Row: Fixed action zone for contextMenu event 2021-03-12 11:36:31 +03:00
Ilya Oleshko
2795a89970 Web: Components: ContextMenuButton: Fixed render call on context call, added padding for inserted DropDown 2021-03-12 11:35:22 +03:00