|
4d5ca86a74
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/.env
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/modules/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/yarn.lock
|
2021-03-12 19:52:01 +03:00 |
|
|
e8e1a176ea
|
Update yarn.lock files
|
2021-03-12 18:38:55 +03:00 |
|
|
b90876c97d
|
Bump version to v0.0.11
|
2021-03-12 17:20:24 +03:00 |
|
Alexey Kostenko
|
60fca302e0
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 16:59:05 +03:00 |
|
Alexey Kostenko
|
2489c25224
|
Web: Files: Fixed icons path in Sharing panel
|
2021-03-12 16:53:47 +03:00 |
|
|
ca94ae28cd
|
Web: Files: fixed empty filter container
|
2021-03-12 16:30:36 +03:00 |
|
Alexey Kostenko
|
9f458a8bb5
|
Web: People: Fixed icons path in profile
|
2021-03-12 15:43:53 +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
|
4e5c42ff91
|
Web: Files: Row: Removed unused props
|
2021-03-12 13:00:15 +03:00 |
|
Vladislav Makhov
|
494bc7a828
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 11:40:44 +03:00 |
|
Vladislav Makhov
|
6a17922554
|
web: people: fix routing
|
2021-03-12 11:06:13 +03:00 |
|
|
4ec8f4958b
|
Web: Files: fixed file action
|
2021-03-12 11:05:23 +03:00 |
|
|
131672666d
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 10:51:06 +03:00 |
|
|
76ea36e661
|
Web: Files: added Router to files, fixed VersionHistoryPanel
|
2021-03-12 10:50:54 +03:00 |
|
Vladislav Makhov
|
fad5f13110
|
web: people: remove unused code
|
2021-03-12 10:23:57 +03:00 |
|
Vladislav Makhov
|
e018a15087
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 10:18:18 +03:00 |
|
Vladislav Makhov
|
aeecf33f95
|
web: people: fix invite dialog
|
2021-03-12 10:18:05 +03:00 |
|
TatianaLopaeva
|
eaa46e6c0f
|
Web: People: Added reload page when change language.
|
2021-03-12 09:37:55 +03:00 |
|
Alexey Kostenko
|
d5a6b5d81b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 17:36:01 +03:00 |
|
Alexey Kostenko
|
85fc7535bf
|
Web: Components/Files: Fixed rendering svg when change folder
|
2021-03-11 17:35:52 +03:00 |
|
Vladislav Makhov
|
f349eb4a96
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 16:10:35 +03:00 |
|
TatianaLopaeva
|
b57a5d0627
|
Web: Files: Fixed displaying icons.
|
2021-03-11 14:18:23 +03:00 |
|
|
30e4390a39
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 13:57:24 +03:00 |
|
|
e17f7d7799
|
Web: Files: fixed sharing panel
|
2021-03-11 13:57:14 +03:00 |
|
Vladislav Makhov
|
1ae9b03a9f
|
web: people: fix empty screen after delete group
|
2021-03-11 11:18:14 +03:00 |
|
Viktor Fomin
|
24b212246c
|
Web: Files: fixed favorite icon click
|
2021-03-11 11:00:53 +03:00 |
|
Viktor Fomin
|
56a5c1bf20
|
Web: Files: fixed lock file
|
2021-03-11 10:46:55 +03:00 |
|
Viktor Fomin
|
2872b75768
|
Web: Files: deleted extra icon
|
2021-03-10 22:29:23 +03:00 |
|
|
392984ded3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-10 19:33:18 +03:00 |
|
|
f0829f059d
|
Webpack: Fix loading react.svg
|
2021-03-10 19:33:10 +03:00 |
|
|
62488521e3
|
Web: Files: Modified production build
|
2021-03-10 19:07:54 +03:00 |
|
|
e8992345ba
|
Web: People: Modified production build
|
2021-03-10 18:38:53 +03:00 |
|
|
4eeb6322bd
|
Web: Files: added file actions notification
|
2021-03-10 18:04:21 +03:00 |
|
|
4ed3a1a777
|
Web: Files: fixed files selection
|
2021-03-10 16:44:24 +03:00 |
|
|
557527a977
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-10 12:14:34 +03:00 |
|
|
fde03a699a
|
Web: Files: moved downloadFiles action from Header
|
2021-03-10 12:14:23 +03:00 |
|
Vladislav Makhov
|
531a6e87d7
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-10 12:05:49 +03:00 |
|
Vladislav Makhov
|
a7e7cf5f1a
|
Web: people: router fix
|
2021-03-10 12:05:07 +03:00 |
|
Vladislav Makhov
|
41388d6f2a
|
web: people: remove unused code
|
2021-03-10 11:17:49 +03:00 |
|
TatianaLopaeva
|
79465f6889
|
Web: People: Added loading when selected group.
|
2021-03-10 10:51:59 +03:00 |
|
Diana
|
3efc35a9fa
|
fix
|
2021-03-09 20:58:40 +03:00 |
|
Diana
|
4e62f6a204
|
update migrations ef tools v.5.0.3
|
2021-03-09 20:56:57 +03:00 |
|
|
7c04c68274
|
Web: Files: moved EmptyFilesContainer from Body
|
2021-03-09 19:23:17 +03:00 |
|
|
c504fe44a6
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-09 15:26:05 +03:00 |
|
|
26cf03878a
|
Web: Files: moved MediaViewer from Body
|
2021-03-09 15:25:46 +03:00 |
|
Vladislav Makhov
|
4c37804df4
|
web: people: fix routing
|
2021-03-09 15:19:58 +03:00 |
|
Vladislav Makhov
|
f0b82c8cea
|
web: people: fix routing in edit page
|
2021-03-09 15:05:52 +03:00 |
|
Vladislav Makhov
|
751eb1d4b6
|
web: people: refactoring
|
2021-03-09 14:53:33 +03:00 |
|
Vladislav Makhov
|
111c45f40a
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# yarn.lock
|
2021-03-09 09:46:45 +03:00 |
|
Vladislav Makhov
|
54ff155c85
|
web: people: add experimental separate context menu file
|
2021-03-09 09:44:08 +03:00 |
|
Vladislav Makhov
|
a7f5f57e55
|
web: people: fix routing
|
2021-03-09 09:37:51 +03:00 |
|
|
2a5a78bc74
|
Web: Packages: stable versions
|
2021-03-06 21:46:04 +03:00 |
|
|
a8a55167eb
|
Web: Editor: Optimization
|
2021-03-06 18:50:06 +03:00 |
|
|
d4abc1dcdc
|
Web: Files: fix
|
2021-03-05 17:51:39 +03:00 |
|
|
653440772d
|
Web: Files: added translations to SimpleFilesRow
|
2021-03-05 17:27:44 +03:00 |
|
|
cee06497f8
|
Web: Files: fixed context menu actions
|
2021-03-05 17:06:23 +03:00 |
|
|
ce9cba95bd
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 17:04:27 +03:00 |
|
|
2e96e29f58
|
Web: Files: fixed context menu actions
|
2021-03-05 17:03:44 +03:00 |
|
Vladislav Makhov
|
012a3d0129
|
web: people: fix routing in user row
|
2021-03-05 16:46:08 +03:00 |
|
Alexey Kostenko
|
9a791c61ad
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 14:47:33 +03:00 |
|
Alexey Kostenko
|
80de5fcab9
|
Web: People: Fixed navigating from profile page to list
|
2021-03-05 14:47:12 +03:00 |
|
|
46f1495de5
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 14:38:50 +03:00 |
|
|
c52052a152
|
Web: Files: fixed context menu delete action, removed useless code
|
2021-03-05 14:38:41 +03:00 |
|
|
877016d8e3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 12:41:08 +03:00 |
|
TatianaLopaeva
|
6dcc819386
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 11:54:21 +03:00 |
|
TatianaLopaeva
|
58bebe1b83
|
Web: People: Fix icon path at profile menu.
|
2021-03-05 11:53:52 +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
|
5412f7b860
|
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
|
2021-03-05 11:09:23 +03:00 |
|
TatianaLopaeva
|
993ddf9ac8
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 11:02:18 +03:00 |
|
TatianaLopaeva
|
e81d2c8bb7
|
Web: Common: Fixed logoUrl.
|
2021-03-05 11:01:49 +03:00 |
|
Ilya Oleshko
|
6442dfddca
|
Web: Files: Fixed share icon path
|
2021-03-05 10:46:02 +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 |
|
|
4c1913c28a
|
Web: Files: fixed files creation
|
2021-03-04 18:44:30 +03:00 |
|
|
63fec5b296
|
Web: Files: fixed download action
|
2021-03-04 16:53:16 +03:00 |
|
|
c655622794
|
Web: Files: added files actions store
|
2021-03-04 15:43:53 +03:00 |
|
|
3b93ba28de
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 15:42:52 +03:00 |
|
|
b93928948d
|
Web: Files: fixed header delete action
|
2021-03-04 15:42:41 +03:00 |
|
TatianaLopaeva
|
249ea4ed7b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 14:37:01 +03:00 |
|
TatianaLopaeva
|
5c826bcf29
|
Web: Added top loading indicator for desktop.
|
2021-03-04 14:36:31 +03:00 |
|
|
cc9a904dc2
|
Web: Files: fix
|
2021-03-04 13:23:48 +03:00 |
|
|
7cec3df259
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 12:33:06 +03:00 |
|
|
c35ed454af
|
Web: Files: fixed files context menu actions
|
2021-03-04 12:32:53 +03:00 |
|
Vladislav Makhov
|
22c7dcb414
|
web: people: refactoring
|
2021-03-03 19:11:12 +03:00 |
|
|
8c936e3ce0
|
Web: Styling
|
2021-03-03 18:21:06 +03:00 |
|
|
47a030f5a1
|
Web: Restored process indication in Files
|
2021-03-03 17:58:56 +03:00 |
|
|
8e1d5fb0b4
|
Web: webpack: changed devtool
|
2021-03-03 17:58:16 +03:00 |
|
|
68930abdcb
|
Web: Move toastr function to Web Client (mf: "studio/toastr")
|
2021-03-03 16:46:04 +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 |
|
Vladislav Makhov
|
34c1816aa5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 14:54:37 +03:00 |
|
Vladislav Makhov
|
57609a6e7e
|
web: people: ProfileAction refactoring
|
2021-03-03 14:54:26 +03:00 |
|
|
238914e25e
|
Web: Files: refactoring
|
2021-03-03 13:22:50 +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 |
|
Vladislav Makhov
|
d2dd11ef91
|
web: people: isMe refactoring
|
2021-03-03 12:33:17 +03:00 |
|
TatianaLopaeva
|
90831adc31
|
Web: Moved GroupSelector to the People module.
|
2021-03-03 12:09:12 +03:00 |
|
Vladislav Makhov
|
b8702eb270
|
web: people: add isMe
|
2021-03-03 12:05:34 +03:00 |
|
Vladislav Makhov
|
c2a5eea4be
|
web: people: refactoring
|
2021-03-03 12:05:08 +03:00 |
|
TatianaLopaeva
|
5212633a8d
|
Web: Moved errors from Common to the Web Client.
|
2021-03-03 11:15:11 +03:00 |
|
Vladislav Makhov
|
756039eccd
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 09:33:53 +03:00 |
|
|
bf7f680d08
|
Web: Moved NavMenu to Web Client
|
2021-03-02 18:25:20 +03:00 |
|
Vladislav Makhov
|
bb81b97df2
|
web: people: add missing prop
|
2021-03-02 16:36:45 +03:00 |
|
|
df8d922b9a
|
Web: People: refactoring
|
2021-03-02 15:44:14 +03:00 |
|
|
3ce638b69a
|
Web: People: Simplified People Home page (fixed render issues)
|
2021-03-02 15:11:17 +03:00 |
|
|
c304bbe8b7
|
Web: People: Fixed displaying user list
|
2021-03-02 11:06:34 +03:00 |
|
|
94708ed455
|
Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy
|
2021-03-01 22:48:48 +03:00 |
|
|
8a6afa8111
|
Web: Fixed load source maps
|
2021-03-01 18:21:40 +03:00 |
|
|
27ba8efeb3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 17:01:02 +03:00 |
|
|
79cb70bc1f
|
Web: Added opportunity to load people page by primary link
|
2021-03-01 17:00:54 +03:00 |
|
|
0cf1150288
|
Web: Added opportunity to load files page by primary link
|
2021-03-01 16:29:37 +03:00 |
|
Ilya Oleshko
|
0c1689bec5
|
Bump version to v0.0.10
|
2021-03-01 16:27:21 +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 |
|
|
09d330104b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 15:03:21 +03:00 |
|
|
1cfb03810e
|
Web: Added imports
|
2021-03-01 15:03:13 +03:00 |
|
|
d66f299f87
|
Web: Files: fixed mobx warnings
|
2021-03-01 14:43:19 +03:00 |
|
|
f734a91d82
|
Files: fix SaveEditing
|
2021-03-01 14:38:55 +03:00 |
|
|
7339fec101
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-01 14:16:47 +03:00 |
|
|
e6aeaac4a5
|
Web: Files: decomposed the settings store object
|
2021-03-01 14:16:37 +03:00 |
|
Vladislav Makhov
|
603db877b5
|
web: people: fix import
|
2021-03-01 12:30:33 +03:00 |
|
Vladislav Makhov
|
628916a1c1
|
web: people: fix svg import
|
2021-03-01 11:56:11 +03:00 |
|
TatianaLopaeva
|
b8fabd5de0
|
Update webpack.config for fix displaying of icons.
|
2021-02-28 21:59:50 +03:00 |
|
TatianaLopaeva
|
5ac0124640
|
Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons.
|
2021-02-28 21:39:50 +03:00 |
|
TatianaLopaeva
|
1e266d6fc8
|
Web: Files: Fix not displaying icon at actions.
|
2021-02-28 21:24:13 +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 |
|
|
7852dac3ca
|
Files: fix saveediting
|
2021-02-26 17:07:08 +03:00 |
|
|
f357c8b78c
|
Web: fixed icons for files module
|
2021-02-26 16:29:50 +03:00 |
|
Vladislav Makhov
|
ae45d875f6
|
web: people: fix group fetching
|
2021-02-26 15:53:06 +03:00 |
|
|
a2ace1a012
|
Web: People: Fix opening
|
2021-02-26 13:06:59 +03:00 |
|
|
96c4d63abe
|
Web: Fixed Files opening + added devtool: "inline-source-map"
|
2021-02-26 12:02:54 +03:00 |
|
Artem Tarasov
|
f10d8ae11d
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-26 00:20:24 +03:00 |
|
Artem Tarasov
|
904813031b
|
Web; People/Files/Login: fix imports
|
2021-02-26 00:19:04 +03:00 |
|
|
dccbe81002
|
DataAnnotations: fix
|
2021-02-25 21:18:27 +03:00 |
|
TatianaLopaeva
|
99ef717815
|
Web: Files: Fix url for common icons.
|
2021-02-25 19:12:39 +03:00 |
|
TatianaLopaeva
|
b7fc7dd523
|
Web: Files: Fix tree-folder icons.
|
2021-02-25 19:03:36 +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
|
ab93fac698
|
Web: Files: Fix icons size.
|
2021-02-25 18:30:31 +03:00 |
|
|
933a1aec48
|
Web: Files: fixed tree menu
|
2021-02-25 18:03:54 +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
|
e91bb64d03
|
web: people: fix imports
|
2021-02-25 15:16:52 +03:00 |
|
|
b25dd2d6e2
|
.net 5
|
2021-02-25 12:02:28 +03:00 |
|
Diana
|
f1091f409a
|
fix dataannotations
|
2021-02-25 12:00:53 +03:00 |
|
|
4a40c8f894
|
Fix dependencies
|
2021-02-25 10:29:57 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
|
38a00bdd7d
|
Merge branch 'develop' into feature/dataannotations
|
2021-02-24 15:38:34 +03:00 |
|
|
2007d9b3da
|
Web: People: Changed imports
|
2021-02-24 12:25:18 +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
|
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 |
|
|
846af80668
|
Update react-script and yarn.lock files
|
2021-02-23 15:56:29 +03:00 |
|
|
d270048827
|
Web: Removed commented code
|
2021-02-23 12:46:33 +03:00 |
|
Diana
|
4ddd2cebec
|
delete dataannotations
|
2021-02-20 22:02:12 +03:00 |
|
TatianaLopaeva
|
5fdb5c8508
|
Web: Fix not displaing of icons.
|
2021-02-20 18:25:46 +03:00 |
|
TatianaLopaeva
|
1d1cbe01af
|
Web: People: Downgrade rc-tree package.
|
2021-02-20 17:54:41 +03:00 |
|
TatianaLopaeva
|
1f8fd0a9db
|
Web: Added styles for icons. Added common icons styles.
|
2021-02-20 17:54:12 +03:00 |
|
|
6c80ebdff0
|
Merge branch 'develop' into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.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/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
|
2021-02-20 17:31:58 +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 |
|
Vladislav Makhov
|
697c6fc8b8
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-20 10:46:33 +03:00 |
|
|
87b1108147
|
Web: Turned debug in i18n
|
2021-02-19 21:59:33 +03:00 |
|
|
d8bd3f6e7c
|
Web: Files: Simplified translation
|
2021-02-19 21:57:01 +03:00 |
|
|
19c7104d3d
|
Web: Removed useless dev packages + fixed warnings of building
|
2021-02-19 20:51:44 +03:00 |
|
|
85a500eac6
|
Web: Client: Simplified translation
|
2021-02-19 20:26:41 +03:00 |
|
|
d2e46c396f
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 19:27:23 +03:00 |
|
|
e97ba3a8b3
|
Web: People: Simplified translation
|
2021-02-19 19:27:13 +03:00 |
|
Vladislav Makhov
|
a7208bf244
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 16:08:39 +03:00 |
|
Vladislav Makhov
|
0b1f8cb22d
|
web: people: change prop to primitive value
|
2021-02-19 16:05:20 +03:00 |
|
|
7e32c26241
|
Files: fixed tests
|
2021-02-19 14:52:29 +03:00 |
|
|
3f35977864
|
Web: Files: fixed Header rerender
|
2021-02-19 13:22:38 +03:00 |
|
|
faae49a0e1
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 12:21:19 +03:00 |
|
|
e2cc45d1d1
|
Web: Files: fixed Home component rerender
|
2021-02-19 12:21:09 +03:00 |
|
Ilya Oleshko
|
cb72f2241b
|
Web: Added product version badge
|
2021-02-18 15:55:26 +03:00 |
|
Vladislav Makhov
|
753d1472b7
|
web: people: hide unused props
|
2021-02-18 15:15:14 +03:00 |
|
Vladislav Makhov
|
474fe57466
|
web: people: remove console.log
|
2021-02-18 13:24:34 +03:00 |
|
|
47d8405a01
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 12:55:46 +03:00 |
|
|
a59ffc0a81
|
Web: Enabled wdy in People and Files
|
2021-02-18 12:55:37 +03:00 |
|
|
64c65a4a41
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 12:24:28 +03:00 |
|
|
561c82bccf
|
Web: Files: fixed files empty screen
|
2021-02-18 12:24:06 +03:00 |
|
Vladislav Makhov
|
f452ae2eae
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 11:52:13 +03:00 |
|
Vladislav Makhov
|
855fd46560
|
web: people: return to set selected mechanism in group button menu
|
2021-02-18 11:52:03 +03:00 |
|
|
6e29fce81b
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 11:23:21 +03:00 |
|
|
d81b0fd770
|
Web: Files: fixed treeFolders
|
2021-02-18 11:23:03 +03:00 |
|
Vladislav Makhov
|
f5cf3683f4
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 19:22:12 +03:00 |
|
Vladislav Makhov
|
da0d039be7
|
web: people: remove console.log
|
2021-02-17 19:22:04 +03:00 |
|
|
fbde2ee6f8
|
Web: Files: move from redux to mobx
|
2021-02-17 18:35:04 +03:00 |
|
|
3b659a31f5
|
Web: Files: fixed files creation
|
2021-02-17 18:07:09 +03:00 |
|
|
ca166e3c66
|
Web: People: Move from redux to mobx completely
|
2021-02-17 17:53:18 +03:00 |
|
Vladislav Makhov
|
4029233d32
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 12:46:32 +03:00 |
|
Vladislav Makhov
|
98ab4973ae
|
web: people: hide unused code
|
2021-02-17 12:46:21 +03:00 |
|
Vladislav Makhov
|
1042506645
|
web: people: hide unused code
|
2021-02-17 12:30:55 +03:00 |
|
Vladislav Makhov
|
8d4994cb40
|
web: people: add getters
|
2021-02-17 12:30:36 +03:00 |
|
|
1ddcca5ed3
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 11:20:18 +03:00 |
|
|
de57a61c59
|
Web: Files: refactoring
|
2021-02-17 11:20:08 +03:00 |
|
Vladislav Makhov
|
4d0fbe8903
|
web: people: add missing observable dependencies in storages
|
2021-02-16 18:11:18 +03:00 |
|
Vladislav Makhov
|
15c80ae139
|
web: people: init refactoring
|
2021-02-16 17:42:33 +03:00 |
|
Vladislav Makhov
|
cb9dbff58f
|
web: people: fix callback param
|
2021-02-16 17:13:26 +03:00 |
|
Vladislav Makhov
|
a683c53735
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-16 16:52:02 +03:00 |
|
|
7e86c680e3
|
Web: Files: added files uploader
|
2021-02-16 16:48:04 +03:00 |
|
Ilya Oleshko
|
d204c9b6de
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-16 13:22:34 +03:00 |
|
|
52c9e4daac
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Header/index.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/panels/NewFilesPanel/index.js
|
2021-02-16 12:16:13 +03:00 |
|
Vladislav Makhov
|
1d7f8c2e97
|
web: people: fix editing form data injection
|
2021-02-16 12:13:19 +03:00 |
|
|
a1fc390bc2
|
Web: Files: created formatsStore
|
2021-02-16 12:01:51 +03:00 |
|
Vladislav Makhov
|
c5ad94e358
|
resolve merge conflicts
|
2021-02-16 10:27:53 +03:00 |
|
Vladislav Makhov
|
09c580e268
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# 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/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/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
|
2021-02-16 10:20:43 +03:00 |
|
Vladislav Makhov
|
e513ad35c9
|
web: people: hide unused code
|
2021-02-16 10:01:01 +03:00 |
|
Vladislav Makhov
|
86faaad05f
|
web: people: add is People admin getter
|
2021-02-16 10:00:35 +03:00 |
|
Vladislav Makhov
|
702351dbdd
|
web: people: add several func's
|
2021-02-16 09:59:56 +03:00 |
|
Vladislav Makhov
|
9db00e24ae
|
web: people: group button menu fix
|
2021-02-16 09:53:52 +03:00 |
|
|
722e04b458
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# 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/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/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/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/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/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
|
2021-02-15 23:03:15 +03:00 |
|
|
0b9a258f91
|
Web: Client: Moved to MobX
|
2021-02-15 22:43:07 +03:00 |
|
Vladislav Makhov
|
38dffc62ad
|
web: people: migrate data to mobx
|
2021-02-15 19:56:35 +03:00 |
|
Vladislav Makhov
|
5946e5b157
|
web: people: remove unused code
|
2021-02-15 18:47:17 +03:00 |
|
|
b37ee479e1
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-15 18:36:16 +03:00 |
|
|
d7647f6271
|
Web: Files: removed settings from FilesStore
|
2021-02-15 18:36:07 +03:00 |
|
Vladislav Makhov
|
ead67641a1
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-15 18:26:31 +03:00 |
|
Vladislav Makhov
|
9f20de7496
|
web: people: migrate data to mobx
|
2021-02-15 18:26:17 +03:00 |
|
Artem Tarasov
|
3414ebc986
|
Web: People: dialogs/DeleteProfileEverDialog: removed anonymous function creation
|
2021-02-15 15:26:56 +03:00 |
|
|
42f5401a29
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-15 15:11:45 +03:00 |
|
|
68910bfa04
|
Web: Files: removed redux provider from files
|
2021-02-15 15:11:26 +03:00 |
|
Vladislav Makhov
|
aeeac1cc47
|
web: people: migrate data to mobx
|
2021-02-15 12:55:51 +03:00 |
|
Vladislav Makhov
|
be2813304e
|
web: people: hide unused code
|
2021-02-15 12:55:35 +03:00 |
|
Vladislav Makhov
|
0712360025
|
web: people: hide unused code
|
2021-02-15 12:55:17 +03:00 |
|
Vladislav Makhov
|
8827e6b8e2
|
web: people: migrate dialogues data to mobx
|
2021-02-15 12:53:50 +03:00 |
|
Vladislav Makhov
|
93b34f1150
|
web: people: migrate profile data to mobx
|
2021-02-15 12:52:29 +03:00 |
|
Vladislav Makhov
|
048da06f6e
|
web: people: add func's to AvatarEditorStore
|
2021-02-15 12:51:37 +03:00 |
|
Vladislav Makhov
|
94ff0f7dd8
|
web: people: InviteLinksStore init, add SetisLoading action
|
2021-02-15 12:51:10 +03:00 |
|
Vladislav Makhov
|
1c4df51ed3
|
web: people: update getTargetUser func
|
2021-02-15 12:50:29 +03:00 |
|
Vladislav Makhov
|
caa2388c34
|
web: people: add setUsers, update updateProfileInUsers func's
|
2021-02-15 12:49:49 +03:00 |
|
Vladislav Makhov
|
926ead6d6b
|
web: people: hide unused code
|
2021-02-15 12:48:46 +03:00 |
|
Vladislav Makhov
|
eb0f8bd208
|
web: people: add Invite Links Store
|
2021-02-15 12:48:08 +03:00 |
|
Ilya Oleshko
|
f2f2fbc07c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-15 10:58:34 +03:00 |
|
Artem Tarasov
|
134cb7f0ed
|
Web: People: GroupAction/helpers: added to helpers/constants.js user id if there is no manager in the group
|
2021-02-12 18:12:44 +03:00 |
|
Artem Tarasov
|
0533163c78
|
Web: People: Home: deleted unnecessary code
|
2021-02-12 16:04:51 +03:00 |
|
Artem Tarasov
|
1ddc2c951a
|
Merge branch 'develop' into feature/empty-group
# Conflicts:
# web/ASC.Web.Common/package.json
|
2021-02-12 13:10:41 +03:00 |
|
Vladislav Makhov
|
0782f72943
|
web: people: remove unused code
|
2021-02-12 10:30:03 +03:00 |
|
Vladislav Makhov
|
fa4c0bafa3
|
web: people: migrate update user type action to mobx
|
2021-02-12 10:29:46 +03:00 |
|
Vladislav Makhov
|
4e3a2e024c
|
web: people: add group actions
|
2021-02-12 10:29:17 +03:00 |
|
Vladislav Makhov
|
ce65fd1059
|
web: people: fix setIsVisibleDataLossDialog
|
2021-02-12 10:28:46 +03:00 |
|
Vladislav Makhov
|
483a671dec
|
web: people: add stores, fix actions observes
|
2021-02-12 10:28:12 +03:00 |
|
Vladislav Makhov
|
27bec2e4b0
|
web: people: migrate group actions to mobx
|
2021-02-12 10:27:10 +03:00 |
|
Vladislav Makhov
|
d36ca5706d
|
web: people: hide unused code
|
2021-02-12 10:26:06 +03:00 |
|
Vladislav Makhov
|
654dee30c5
|
web: people: refactoring, fix actions
|
2021-02-12 10:25:24 +03:00 |
|
Vladislav Makhov
|
b9111b2689
|
web: people: add Avatar Editor Store
|
2021-02-12 10:23:27 +03:00 |
|
Artem Tarasov
|
480ddc15cd
|
Web: People: GroupAction: fixed signature if no manager assigned to the group
|
2021-02-11 17:28:39 +03:00 |
|
Vladislav Makhov
|
bf2da1322e
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-10 20:24:43 +03:00 |
|
Vladislav Makhov
|
4c797137f8
|
web: people: comment out setSelected
|
2021-02-10 20:24:31 +03:00 |
|
Vladislav Makhov
|
ea61a9a056
|
web: people: migrate removeUser to mobx, comment out setSelected
|
2021-02-10 20:24:11 +03:00 |
|
Vladislav Makhov
|
56b00ffc9d
|
web: people: migrate updateUserStatus to mobx, comment out setSelected
|
2021-02-10 20:23:28 +03:00 |
|
Vladislav Makhov
|
a22d9f333d
|
web: people: migrate actions to mobx
|
2021-02-10 20:22:12 +03:00 |
|
Vladislav Makhov
|
60407b74d4
|
web: people: migrate setFilter to mobx
|
2021-02-10 20:20:23 +03:00 |
|
Vladislav Makhov
|
85568fed74
|
web: people: comment out unused code
|
2021-02-10 20:18:38 +03:00 |
|
Vladislav Makhov
|
ea49d6e9e0
|
web: people: add clear selection on selectGroup fn
|
2021-02-10 20:17:37 +03:00 |
|
Vladislav Makhov
|
de8737afcd
|
web: people: add deleteGroup fn
|
2021-02-10 20:15:40 +03:00 |
|
|
b8db0ea2a5
|
Web: Files: added new mobx storages
|
2021-02-10 17:46:48 +03:00 |
|
|
d804e3fbad
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-10 17:34:49 +03:00 |
|
|
c6b9ef48af
|
Files: fix GetRecalculateFilesCountUpdate
|
2021-02-10 15:44:07 +03:00 |
|
Vladislav Makhov
|
7885c26153
|
web: people: refactor onClose
|
2021-02-10 14:14:51 +03:00 |
|
Vladislav Makhov
|
5070dacaa9
|
web: people: migrate selection mechanism to mobx
|
2021-02-10 13:34:35 +03:00 |
|
Vladislav Makhov
|
c2dd454e45
|
web: people: migrate visibility of header group button menu mechanism to mobx
|
2021-02-10 13:34:18 +03:00 |
|
Vladislav Makhov
|
fa3ccbe1de
|
web: people: remove console log
|
2021-02-10 13:33:16 +03:00 |
|
Vladislav Makhov
|
b7635584cc
|
web: people: remove console log
|
2021-02-10 13:32:46 +03:00 |
|
Vladislav Makhov
|
ebe54cc705
|
web: people: add selectionStore and headerMenuStore init
|
2021-02-10 13:32:23 +03:00 |
|
Vladislav Makhov
|
c4346161c2
|
web: people: add isUserSelected fn
|
2021-02-10 13:31:40 +03:00 |
|
Vladislav Makhov
|
e222a96681
|
web: people: add Selection Store
|
2021-02-10 13:30:57 +03:00 |
|
Vladislav Makhov
|
673762894e
|
web: people: add Header Menu Store
|
2021-02-10 13:30:39 +03:00 |
|
|
7f8a95058f
|
Web: Files: added context options to files row, added tree menu
|
2021-02-09 17:22:51 +03:00 |
|
Vladislav Makhov
|
09665b1a9d
|
web: people: remove debugger
|
2021-02-09 12:53:42 +03:00 |
|
Vladislav Makhov
|
923b00c8db
|
web: people: switch to getter
|
2021-02-09 12:52:32 +03:00 |
|
Vladislav Makhov
|
2755c6ace0
|
web: people: migrate filter, people fetching mechanism to mobx
|
2021-02-09 12:47:21 +03:00 |
|
Artem Tarasov
|
cfa9b48011
|
Web: People: GroupAction: fixed app crash when creating a group
|
2021-02-08 17:15:54 +03:00 |
|
Viktor Fomin
|
accdc264b8
|
Web: Files: fixed property
|
2021-02-08 14:49:53 +03:00 |
|
Vladislav Makhov
|
e1f7c37a6b
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-08 10:43:36 +03:00 |
|
Vladislav Makhov
|
cf6511cad2
|
web: people: migrate groups data
|
2021-02-08 10:43:20 +03:00 |
|
|
04dd3f792c
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-08 10:43:20 +03:00 |
|
|
4d4e464275
|
Web: Files: moved isLoading to mobx store, added checkbox to files row
|
2021-02-08 10:43:10 +03:00 |
|
Vladislav Makhov
|
b6a0ba38ca
|
web: people: migrate groups data
|
2021-02-08 10:42:37 +03:00 |
|
Vladislav Makhov
|
9fcd48c110
|
web: people: migrate editing form store to mobx
|
2021-02-08 10:21:40 +03:00 |
|
Vladislav Makhov
|
30c6028350
|
web: people: migrate selected group prop
|
2021-02-08 10:03:05 +03:00 |
|
Vladislav Makhov
|
cd77bfa802
|
web: people: add stores to root
|
2021-02-08 10:02:41 +03:00 |
|
Vladislav Makhov
|
e58a489204
|
web: people: add Selected Group store
|
2021-02-08 10:02:07 +03:00 |
|
Vladislav Makhov
|
d285fa6ae4
|
web: people: add Editing Form store
|
2021-02-08 10:01:49 +03:00 |
|
Vladislav Makhov
|
997f7b6d65
|
web: people: migrate props to mobx
|
2021-02-08 10:01:01 +03:00 |
|
Artem Tarasov
|
3b6ffef2a8
|
Merge branch 'develop' into feature/empty-group
|
2021-02-05 17:26:38 +03:00 |
|
Artem Tarasov
|
cd18cf55cf
|
Web: People: dialogs/Home: fixed crash when deleting user and reopening modal dialog after deleting user
|
2021-02-05 17:26:25 +03:00 |
|
|
c10c1f17cd
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-05 16:25:02 +03:00 |
|
|
2d9ee116de
|
Web: Files: added new mobx stores, replaced fetchFiles from redux to mobx action
|
2021-02-05 16:24:54 +03:00 |
|
Viktor Fomin
|
da33e26515
|
Web: Files: deleted console.log
|
2021-02-05 16:19:48 +03:00 |
|
Vladislav Makhov
|
e747eeab92
|
web: people: remove dep from use effect
|
2021-02-05 16:19:46 +03:00 |
|
Vladislav Makhov
|
7deee30d24
|
web: people: migrate props to mobx
|
2021-02-05 16:19:18 +03:00 |
|
Vladislav Makhov
|
6ca4a97547
|
web: people: add target user store
|
2021-02-05 16:15:44 +03:00 |
|
Viktor Fomin
|
7188cda442
|
Web: Files: fixed favorite
|
2021-02-05 15:43:55 +03:00 |
|
Viktor Fomin
|
f921bdc9d0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/layout-fix
|
2021-02-05 15:35:42 +03:00 |
|