Alexey Kostenko
|
85fc7535bf
|
Web: Components/Files: Fixed rendering svg when change folder
|
2021-03-11 17:35:52 +03:00 |
|
Artem Tarasov
|
277f803f12
|
Web: Components: added story for ThemeProvider
|
2021-03-11 15:37:33 +03:00 |
|
Artem Tarasov
|
d3aa06dc99
|
Web: Component: added package react-json-pretty
|
2021-03-11 15:37:03 +03:00 |
|
Artem Tarasov
|
0eee8f6e45
|
Web: Components: added story for TextArea
|
2021-03-11 14:50:58 +03:00 |
|
Artem Tarasov
|
cd5fea0096
|
Web: Components: added story for TextInput
|
2021-03-11 14:33:32 +03:00 |
|
Artem Tarasov
|
96271b4dfb
|
Web: Components/Client: changed the way of passing elements to TabContainer component
|
2021-03-11 13:43:54 +03:00 |
|
Artem Tarasov
|
16fcfd6d36
|
Web: Components: added story for TabContainer
|
2021-03-11 12:48:03 +03:00 |
|
Viktor Fomin
|
4c28a12398
|
Web: Common: fixed icon position
|
2021-03-10 20:10:09 +03:00 |
|
|
|
7d62b4432c
|
Components: Fix test run
|
2021-03-10 19:51:44 +03:00 |
|
Artem Tarasov
|
85859b0974
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-10 17:22:02 +03:00 |
|
Artem Tarasov
|
8e948054db
|
Web: Components: added stories for SelectorAddButton,SocialButton
|
2021-03-10 17:21:32 +03:00 |
|
Artem Tarasov
|
4f94d5beae
|
Web: Components: added story for SelectedItem
|
2021-03-10 16:47:42 +03:00 |
|
Artem Tarasov
|
2132c9ce41
|
Web: Components: added story for SearchInput
|
2021-03-10 16:17:26 +03:00 |
|
Artem Tarasov
|
0c9db1621d
|
Web: Components: added story for Scrollbar
|
2021-03-10 14:43:48 +03:00 |
|
Artem Tarasov
|
961067581c
|
Web: Components: added story for SaveCancelButtons
|
2021-03-10 14:31:39 +03:00 |
|
Artem Tarasov
|
273d279202
|
Web: COmponents: added story for RowContent
|
2021-03-10 14:15:22 +03:00 |
|
Artem Tarasov
|
b6f0888987
|
Web: COmponents: added story for RowContainer
|
2021-03-10 13:44:54 +03:00 |
|
Artem Tarasov
|
4697f4ba87
|
Web: Components: added story for Row
|
2021-03-10 13:02:57 +03:00 |
|
Artem Tarasov
|
7bd692d239
|
Web: Components: added story for RequestLoader
|
2021-03-10 11:19:30 +03:00 |
|
Alexey Kostenko
|
e896a711c8
|
Web: Components: Fixed tests
|
2021-03-10 11:11:32 +03:00 |
|
Artem Tarasov
|
43dc4ec3a4
|
Web: Components: added story for RadioButtonGroup
|
2021-03-10 10:59:03 +03:00 |
|
Artem Tarasov
|
3f416709e7
|
Web: Components: Added story for ProgressBar
|
2021-03-10 10:58:21 +03:00 |
|
Artem Tarasov
|
dda9451a6c
|
Web: Components: added story for PasswordInput
|
2021-03-10 10:57:42 +03:00 |
|
Artem Tarasov
|
bfd690c6db
|
Web: Components: added story for Paging
|
2021-03-10 10:57:15 +03:00 |
|
Artem Tarasov
|
958db51408
|
Web: Components: added story for RadioButton
|
2021-03-10 10:55:16 +03:00 |
|
Alexey Kostenko
|
49bf5c339e
|
Web: Components: Fixed filter combo-button style
|
2021-03-09 10:54:03 +03:00 |
|
Artem Tarasov
|
782168d3d6
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# packages/asc-web-components/package.json
|
2021-03-08 23:21:56 +03:00 |
|
Artem Tarasov
|
f2045ab5f0
|
Web: Components: added stories (ModalDialog, MainButton, Loader, Link, LinkWithDropDown, Label, IconButton),fix HelpButton, Heading stories
|
2021-03-08 23:18:45 +03:00 |
|
Artem Tarasov
|
c8d614a3ba
|
Web: Components: refactoring stories, add public/images to components for storybook
|
2021-03-07 14:57:26 +03:00 |
|
|
|
2a5a78bc74
|
Web: Packages: stable versions
|
2021-03-06 21:46:04 +03:00 |
|
|
|
32b8c7f6fe
|
Web: Fixed login work
|
2021-03-05 17:41:55 +03:00 |
|
|
|
877016d8e3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 12:41:08 +03:00 |
|
|
|
7db261fea4
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 11:46:27 +03:00 |
|
|
|
25a2daeab5
|
Web: Files: moved editCompleteAction to store
|
2021-03-05 11:46:16 +03:00 |
|
TatianaLopaeva
|
e81d2c8bb7
|
Web: Common: Fixed logoUrl.
|
2021-03-05 11:01:49 +03:00 |
|
Artem Tarasov
|
2ba54c3bdb
|
Web: Components: added story of Avatar, Box, component refactoring to ensure storybook captures props
|
2021-03-05 02:52:14 +03:00 |
|
Artem Tarasov
|
93b5a55506
|
Web: Components: rewrited story of email-input to csf with mdx docs
|
2021-03-05 01:58:36 +03:00 |
|
|
|
82a6dafb0f
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 19:09:58 +03:00 |
|
|
|
28a798c542
|
Web: Fixed work with translations + refactoring:
+ Login re-written to functional component
+ Replaced css to scss
|
2021-03-04 19:09:46 +03:00 |
|
Alexey Kostenko
|
b0f3a4e426
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 17:32:09 +03:00 |
|
Alexey Kostenko
|
7cb59e3189
|
Web: Files/People: fixed direct link transition
|
2021-03-04 17:31:37 +03:00 |
|
TatianaLopaeva
|
5c826bcf29
|
Web: Added top loading indicator for desktop.
|
2021-03-04 14:36:31 +03:00 |
|
Alexey Kostenko
|
9e80a2010c
|
Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module)
|
2021-03-04 13:13:26 +03:00 |
|
Artem Tarasov
|
2aabae6644
|
Web: Components: added stories for EmptyScreenContainer, FieldContainer, FileInput, Grid
|
2021-03-04 02:59:49 +03:00 |
|
Artem Tarasov
|
84062c6d28
|
Web: Components: added story for EmailInput, added PropTypes, refactoring DropDown stories;
|
2021-03-04 00:30:41 +03:00 |
|
Artem Tarasov
|
569f7201cc
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# yarn.lock
|
2021-03-03 18:28:52 +03:00 |
|
Artem Tarasov
|
f6c9ff781b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 18:11:22 +03:00 |
|
Artem Tarasov
|
f2870eca8e
|
Web: Components: Added stories for DatePicker, DragAndDrop, DropDown, DropDownItem, refactoring story of Backdrop, fixe passed props DropDown
|
2021-03-03 18:09:00 +03:00 |
|
|
|
47a030f5a1
|
Web: Restored process indication in Files
|
2021-03-03 17:58:56 +03:00 |
|
|
|
68930abdcb
|
Web: Move toastr function to Web Client (mf: "studio/toastr")
|
2021-03-03 16:46:04 +03:00 |
|
|
|
fe39c60633
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 16:19:09 +03:00 |
|
TatianaLopaeva
|
17ac53d015
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 15:42:58 +03:00 |
|
TatianaLopaeva
|
ada47512f1
|
Web: Moved PeopleSelector to the Web Client.
|
2021-03-03 15:41:28 +03:00 |
|
Artem Tarasov
|
7fb751c2cd
|
Web: Components: added story of DatePicker, refactoring stiries, fixes bug of input.js in styled-text-input.js
|
2021-03-03 14:57:14 +03:00 |
|
Vladislav Makhov
|
34c1816aa5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 14:54:37 +03:00 |
|
|
|
efaeaff894
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 14:46:45 +03:00 |
|
|
|
684c0e777f
|
Web: Refactoring
|
2021-03-03 14:46:37 +03:00 |
|
|
|
4db48870cf
|
Web: SettingsStore: Fixed warnings of mobx
|
2021-03-03 14:46:05 +03:00 |
|
|
|
3fecff3307
|
Web: Restored commented code
|
2021-03-03 14:09:52 +03:00 |
|
|
|
8da0cbcb63
|
Web: Fixed displaying login errors
|
2021-03-03 14:09:00 +03:00 |
|
Vladislav Makhov
|
1190d4c1ba
|
web: components: fix path
|
2021-03-03 13:54:41 +03:00 |
|
Artem Tarasov
|
5142456afa
|
Web: Components: added story of ContextMenuButton
|
2021-03-03 13:25:56 +03:00 |
|
|
|
238914e25e
|
Web: Files: refactoring
|
2021-03-03 13:22:50 +03:00 |
|
TatianaLopaeva
|
7b0faa4747
|
Web: Moved Main into the Web Client.
|
2021-03-03 13:02:56 +03:00 |
|
Artem Tarasov
|
b97118d72c
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 13:01:15 +03:00 |
|
TatianaLopaeva
|
1e643edd16
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 12:48:07 +03:00 |
|
TatianaLopaeva
|
d6cf286cd0
|
Web: Moved Layout to the Web Client.
|
2021-03-03 12:47:28 +03:00 |
|
Vladislav Makhov
|
1dbfd7f105
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 12:33:25 +03:00 |
|
TatianaLopaeva
|
90831adc31
|
Web: Moved GroupSelector to the People module.
|
2021-03-03 12:09:12 +03:00 |
|
Vladislav Makhov
|
d08b927084
|
web: fix warning
|
2021-03-03 12:05:23 +03:00 |
|
Vladislav Makhov
|
c2a5eea4be
|
web: people: refactoring
|
2021-03-03 12:05:08 +03:00 |
|
Artem Tarasov
|
96da41faa1
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# package.json
# packages/asc-web-components/package.json
# yarn.lock
|
2021-03-03 12:00:23 +03:00 |
|
Artem Tarasov
|
ef619676ad
|
Web: Components: added stories ContextMenu, ContextMenuButton, refactoring
|
2021-03-03 11:53:37 +03:00 |
|
TatianaLopaeva
|
988afe48fd
|
Web: Moved profile menu to the NavMenu.
|
2021-03-03 11:25:28 +03:00 |
|
TatianaLopaeva
|
5212633a8d
|
Web: Moved errors from Common to the Web Client.
|
2021-03-03 11:15:11 +03:00 |
|
Artem Tarasov
|
2f09bab8e5
|
Web: Components: added story of Combobox
|
2021-03-03 10:56:54 +03:00 |
|
TatianaLopaeva
|
0a97830634
|
Web: Common: Fix icon for menu.
|
2021-03-02 21:16:50 +03:00 |
|
TatianaLopaeva
|
ccc45a8d74
|
Web: Components: checkbox: Fix displaying indeterminate color.
|
2021-03-02 20:15:27 +03:00 |
|
|
|
bf7f680d08
|
Web: Moved NavMenu to Web Client
|
2021-03-02 18:25:20 +03:00 |
|
Artem Tarasov
|
9ae9d7132e
|
Web: Components: added story of Checkbox, fix passing props
|
2021-03-02 17:20:16 +03:00 |
|
Artem Tarasov
|
4b3e491e95
|
Web: Ccomponents: fixed source section in Stories, modified webpack.config.js
|
2021-03-02 16:27:45 +03:00 |
|
Artem Tarasov
|
843f3df500
|
Web: Components: added story of Calendar
|
2021-03-02 16:01:12 +03:00 |
|
Artem Tarasov
|
7edec73e54
|
Web: Components: Avatar: delete old story
|
2021-03-02 13:09:31 +03:00 |
|
Artem Tarasov
|
a25cd562cb
|
Web: Components: added story of AvatarEditor, fixed theme props
|
2021-03-02 13:08:26 +03:00 |
|
Alexey Kostenko
|
884e982896
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-02 11:26:47 +03:00 |
|
Alexey Kostenko
|
f0eef94f2a
|
Web: Components: Fixed jest config, fixed components, fixed tests, added package for test
|
2021-03-02 11:25:11 +03:00 |
|
Artem Tarasov
|
87f90ed4ac
|
Web: Components: added story of Avatar
|
2021-03-02 00:33:44 +03:00 |
|
Artem Tarasov
|
236e0892c8
|
Web: Components: added story of Badge
|
2021-03-02 00:32:59 +03:00 |
|
|
|
ab139d373a
|
Web: Changed opening @self profile without page refresh
|
2021-03-01 22:53:42 +03:00 |
|
Artem Tarasov
|
ebaa4e66e8
|
Web: Components: updated rules for upload svg
|
2021-03-01 22:09:08 +03:00 |
|
Artem Tarasov
|
54b672b0d0
|
Web: Components: added story of Button
|
2021-03-01 21:37:56 +03:00 |
|
Alexey Kostenko
|
73b65d6f6c
|
Web: Components: Reverted versions packages for tests, added configs
|
2021-03-01 19:07:06 +03:00 |
|
Alexey Kostenko
|
afda34a20a
|
Web: Components: Added packages for tests
|
2021-03-01 18:30:53 +03:00 |
|
|
|
8ee7563caf
|
Web: Client: fixed mobx warnings
|
2021-03-01 18:15:11 +03:00 |
|
Artem Tarasov
|
7f5c4e779b
|
Web: Components: added story of Backgrop
|
2021-03-01 17:58:42 +03:00 |
|
Artem Tarasov
|
909d3f70cc
|
Web: Components: init storybook 6
|
2021-03-01 17:35:38 +03:00 |
|
Alexey Kostenko
|
e0a51a7060
|
Web: Components: Added packages for tests
|
2021-03-01 17:28:37 +03:00 |
|
Alexey Kostenko
|
8179cbd0a4
|
Web: Components: Added part packages for tests
|
2021-03-01 17:08:35 +03:00 |
|
Vladislav Makhov
|
47004a1e1d
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# packages/asc-web-components/input-block/index.js
|
2021-03-01 16:12:34 +03:00 |
|
Vladislav Makhov
|
f452b09ecd
|
web: fix icons
|
2021-03-01 16:11:45 +03:00 |
|
TatianaLopaeva
|
200049ccee
|
Web: Components: input-block: Fix icons displaying & added search.react icon.
|
2021-03-01 15:50:16 +03:00 |
|
Alexey Kostenko
|
29730b46e5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 15:12:40 +03:00 |
|
Vladislav Makhov
|
ea7697d461
|
web: common: fix import
|
2021-03-01 12:30:21 +03:00 |
|
Vladislav Makhov
|
23e77d4822
|
web: components: fix import
|
2021-03-01 12:29:59 +03:00 |
|
Vladislav Makhov
|
1695b9649d
|
web: common: fix title
|
2021-03-01 12:03:12 +03:00 |
|
Vladislav Makhov
|
7709a2c59f
|
web: components: return color declaration
|
2021-03-01 12:00:53 +03:00 |
|
Vladislav Makhov
|
c38fd63c75
|
web: components: fix import
|
2021-03-01 12:00:34 +03:00 |
|
Vladislav Makhov
|
db85598b4f
|
web: components: fix svg import
|
2021-03-01 11:59:45 +03:00 |
|
Vladislav Makhov
|
4f8ad66cc3
|
web: common: fix svg import
|
2021-03-01 11:56:44 +03:00 |
|
Alexey Kostenko
|
1a1459d469
|
Web: Components: Added configs for testing, added command to package.json
|
2021-03-01 10:19:53 +03:00 |
|
TatianaLopaeva
|
ee23adac7c
|
Web: Components: Deleted useless code.
|
2021-02-28 21:36:51 +03:00 |
|
Vladislav Makhov
|
7bf2a8e9b5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-26 18:33:28 +03:00 |
|
|
|
f357c8b78c
|
Web: fixed icons for files module
|
2021-02-26 16:29:50 +03:00 |
|
Vladislav Makhov
|
fc67abd6b5
|
web: components : return colors declaration
|
2021-02-26 15:53:59 +03:00 |
|
TatianaLopaeva
|
6d70daa26a
|
Web: Headline: Fix headline color.
|
2021-02-26 15:46:02 +03:00 |
|
TatianaLopaeva
|
ca0c86f2d4
|
Web/Common: Fix active title of menu, fix transition without redirect.
|
2021-02-26 13:50:20 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Artem Tarasov
|
c35d0612f0
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
|
2021-02-25 18:42:10 +03:00 |
|
Artem Tarasov
|
15602c3a8f
|
Web: Files: fix after merge
|
2021-02-25 18:41:06 +03:00 |
|
TatianaLopaeva
|
60ea0b189a
|
Web: Components: icon-button: Deleted default color.
|
2021-02-25 17:58:23 +03:00 |
|
TatianaLopaeva
|
dde6e2a78a
|
Web: Common: FilterInput: Deleted useless color.
|
2021-02-25 17:58:01 +03:00 |
|
Artem Tarasov
|
9b27d51ac5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
|
2021-02-25 17:57:32 +03:00 |
|
|
|
8b962cd88d
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 17:20:19 +03:00 |
|
Artem Tarasov
|
48b3c6b445
|
Web: Common: fix after merge, fix imports and hierarchy
|
2021-02-25 17:20:11 +03:00 |
|
|
|
b4fa1b2bb1
|
Web: Files: fixed icons imports, fixed components imports, fixed files module
|
2021-02-25 17:20:06 +03:00 |
|
Artem Tarasov
|
69ed46e8ae
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
|
2021-02-25 15:27:36 +03:00 |
|
Artem Tarasov
|
989fba5ecc
|
Web: applied new import from appserver/common
|
2021-02-25 15:22:53 +03:00 |
|
Vladislav Makhov
|
ea3c558a33
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 15:17:15 +03:00 |
|
Vladislav Makhov
|
e91bb64d03
|
web: people: fix imports
|
2021-02-25 15:16:52 +03:00 |
|
TatianaLopaeva
|
89cefb6bd1
|
Web: Components: Fix styles for role icons.
|
2021-02-25 13:52:31 +03:00 |
|
TatianaLopaeva
|
4ed139caef
|
Web: Common: NavMenu: Fix styles of link and added history for transition without redirect.
|
2021-02-25 13:38:23 +03:00 |
|
TatianaLopaeva
|
65949fa1a9
|
Web: Common: Fix not displaying icons at nav and header.
|
2021-02-25 13:08:20 +03:00 |
|
|
|
89bc3bdd08
|
Web: Common: Fixed logout
|
2021-02-25 11:35:31 +03:00 |
|
Artem Tarasov
|
fe7cb5364d
|
Web: Common: chsnged component hierarchy
|
2021-02-25 11:04:22 +03:00 |
|
|
|
368b44071f
|
Web: Common: Added other props to routes
|
2021-02-25 10:10:39 +03:00 |
|
|
|
a84a0ae691
|
Web: Common: AuthStore: simplified init sub-stores
|
2021-02-25 10:09:50 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|
|
|
507fadff55
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# 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/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
|
2021-02-24 10:57:03 +03:00 |
|
|
|
34d9eed580
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# 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/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
|
2021-02-24 10:30:42 +03:00 |
|
TatianaLopaeva
|
782e069ffb
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-23 22:44:44 +03:00 |
|
TatianaLopaeva
|
2b6a0eb9a5
|
Web: Components: Deleted useless imports.
|
2021-02-23 22:43:25 +03:00 |
|
TatianaLopaeva
|
2ee7f60d4c
|
Web/Files: Refactoring.
|
2021-02-23 22:19:51 +03:00 |
|
TatianaLopaeva
|
3e3b079b5a
|
Web: Components: Deleted useless Icons component.
|
2021-02-23 22:14:42 +03:00 |
|
TatianaLopaeva
|
0a75c9240f
|
Web: Components: Refactoring.
|
2021-02-20 18:38:18 +03:00 |
|
TatianaLopaeva
|
5949865a45
|
Web: Components: Fix problem with click om icon, added size style.
|
2021-02-20 18:37:32 +03:00 |
|
TatianaLopaeva
|
1f8fd0a9db
|
Web: Added styles for icons. Added common icons styles.
|
2021-02-20 17:54:12 +03:00 |
|
TatianaLopaeva
|
5d26bd5670
|
Web: Downgrade rc-tree package.
|
2021-02-20 13:19:01 +03:00 |
|
TatianaLopaeva
|
7023cf5f3a
|
Web: Transferring icons from a shared folder to modules. Icons are displayed by url.
|
2021-02-20 11:46:32 +03:00 |
|
TatianaLopaeva
|
b9d0183bfc
|
Web: Components: Checkbox: Modified icons for support color.
|
2021-02-20 10:58:09 +03:00 |
|
