|
e797d01bee
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-19 21:07:16 +03:00 |
|
|
efe94a4589
|
Web: People: Fixed Filter translations loading
|
2021-03-19 21:07:10 +03:00 |
|
TatianaLopaeva
|
c1e53e3c6e
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-19 19:21:20 +03:00 |
|
Artem Tarasov
|
aebb3c479f
|
Web: fix after merge
|
2021-03-19 19:24:16 +03:00 |
|
Artem Tarasov
|
6418c3af89
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2021-03-19 19:21:16 +03:00 |
|
TatianaLopaeva
|
7f193e003c
|
Web: People: Fix color of icon.
|
2021-03-19 19:11:16 +03:00 |
|
Artem Tarasov
|
4d9920a4d0
|
Web: People: fixed updating of user information after editing
|
2021-03-19 19:06:55 +03:00 |
|
|
741fca254f
|
Web: Fixed usage of auth.settingsStore
|
2021-03-19 19:02:43 +03:00 |
|
|
b42eb03270
|
Web: People: Hide reasign button
|
2021-03-19 18:41:22 +03:00 |
|
|
60b57e5535
|
Web: People: Fixed move to edit profile (double slash in URL)
|
2021-03-19 18:36:11 +03:00 |
|
|
2df2b6809e
|
Web: People: Fixed primary link redirect to default filter
|
2021-03-19 18:23:14 +03:00 |
|
|
6b8d644aab
|
Web: Replaced all homepages to config variant
|
2021-03-19 18:22:35 +03:00 |
|
|
06621ca2cb
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-19 16:31:48 +03:00 |
|
|
e63fc30a2e
|
Web: People: Fixed move to direct link
|
2021-03-19 16:31:41 +03:00 |
|
Artem Tarasov
|
51b978f6a3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-19 14:13:56 +03:00 |
|
Artem Tarasov
|
7c7e7e8c05
|
Web: People: fixed transition from profile editing
|
2021-03-19 14:13:22 +03:00 |
|
|
9fc950665b
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-19 11:22:36 +03:00 |
|
|
e87709dc70
|
Web: People: fixed InviteDialog styles
|
2021-03-19 11:22:25 +03:00 |
|
Artem Tarasov
|
a6c21657a1
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-19 11:18:21 +03:00 |
|
Artem Tarasov
|
9cfbc4f6a0
|
Web: People: fix position of email value in Profile
|
2021-03-19 11:17:36 +03:00 |
|
|
33281d9260
|
Web: Files: commented debug in i18n config
|
2021-03-19 10:53:13 +03:00 |
|
|
c862bbc7ef
|
Web: People: Fixed loading translations
|
2021-03-19 10:49:50 +03:00 |
|
|
78140c0739
|
Web: People: Fixed double init
|
2021-03-19 10:46:49 +03:00 |
|
|
3b340396a7
|
Web: Fixed jumping of NavMenu
|
2021-03-19 10:45:34 +03:00 |
|
TatianaLopaeva
|
7299252d8f
|
Web: People: PeopleSelector: Fixed load path of translations.
|
2021-03-19 10:01:42 +03:00 |
|
|
8e6b2c78d8
|
Web: Moved ipl-progress-indicator to NavMenu
|
2021-03-18 22:26:52 +03:00 |
|
Vladislav Makhov
|
12dc227d03
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-18 17:47:44 +03:00 |
|
TatianaLopaeva
|
c8d40e698e
|
Web: People/Files: Fixed color of icons.
|
2021-03-18 16:30:45 +03:00 |
|
Vladislav Makhov
|
a16a0a833d
|
web: people: fix cancel btn
|
2021-03-18 14:19:42 +03:00 |
|
TatianaLopaeva
|
0e0624c02d
|
Web: People: Added loader when change language & refactoring.
|
2021-03-18 12:02:37 +03:00 |
|
TatianaLopaeva
|
7950df5aaa
|
Web: People: Fix translation after reload page.
|
2021-03-17 16:37:24 +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 |
|
|
062cc4cc78
|
Web: Disabled initialization of service-workers on development
|
2021-03-17 12:59:11 +03:00 |
|
|
8e7cad9b3f
|
Web: Removed useless files
|
2021-03-17 12:36:14 +03:00 |
|
Vladislav Makhov
|
b0c00fe749
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.People/Client/src/Routes.jsx
|
2021-03-16 16:33:18 +03:00 |
|
|
24a6d61205
|
Web: Added creation and run of service-worker to all client apps
|
2021-03-16 14:10:20 +03:00 |
|
Vladislav Makhov
|
3caa960440
|
web: people: comment out
|
2021-03-16 13:40:18 +03:00 |
|
Artem Tarasov
|
1ee2e02963
|
Web: People: TargetUserStore: fixed inability to change the language in the profile (an error appeared)
|
2021-03-15 10:03:30 +03:00 |
|
|
e47417cda9
|
Web: People: Moved pages folder from components
|
2021-03-13 20:07:32 +03:00 |
|
|
491e9c5a39
|
Web: Refactoring
|
2021-03-13 19:01:22 +03:00 |
|
|
b7a7be3d1f
|
Web: Refactoring
|
2021-03-13 18:33:43 +03:00 |
|
|
145d720299
|
Web: Webpack: Added base url and commented proxy
|
2021-03-13 18:31:09 +03:00 |
|
Alexey Kostenko
|
9f458a8bb5
|
Web: People: Fixed icons path in profile
|
2021-03-12 15:43:53 +03:00 |
|
Vladislav Makhov
|
6a17922554
|
web: people: fix routing
|
2021-03-12 11:06:13 +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 |
|
Vladislav Makhov
|
f349eb4a96
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 16:10:35 +03:00 |
|
Vladislav Makhov
|
1ae9b03a9f
|
web: people: fix empty screen after delete group
|
2021-03-11 11:18:14 +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 |
|
|
e8992345ba
|
Web: People: Modified production build
|
2021-03-10 18:38:53 +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 |
|
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 |
|
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 |
|
|
877016d8e3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 12:41:08 +03:00 |
|
TatianaLopaeva
|
58bebe1b83
|
Web: People: Fix icon path at profile menu.
|
2021-03-05 11:53:52 +03:00 |
|
TatianaLopaeva
|
5412f7b860
|
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
|
2021-03-05 11:09:23 +03:00 |
|
TatianaLopaeva
|
e81d2c8bb7
|
Web: Common: Fixed logoUrl.
|
2021-03-05 11:01:49 +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 |
|
TatianaLopaeva
|
5c826bcf29
|
Web: Added top loading indicator for desktop.
|
2021-03-04 14:36:31 +03:00 |
|
Vladislav Makhov
|
22c7dcb414
|
web: people: refactoring
|
2021-03-03 19:11:12 +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
|
57609a6e7e
|
web: people: ProfileAction refactoring
|
2021-03-03 14:54:26 +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 |
|
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 |
|
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 |
|
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
|
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
|
904813031b
|
Web; People/Files/Login: fix imports
|
2021-02-26 00:19:04 +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 |
|
|
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 |
|
|
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 |
|
|
846af80668
|
Update react-script and yarn.lock files
|
2021-02-23 15:56:29 +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
|
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 |
|
|
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 |
|
|
e97ba3a8b3
|
Web: People: Simplified translation
|
2021-02-19 19:27:13 +03:00 |
|
Vladislav Makhov
|
0b1f8cb22d
|
web: people: change prop to primitive value
|
2021-02-19 16:05:20 +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 |
|
|
a59ffc0a81
|
Web: Enabled wdy in People and Files
|
2021-02-18 12:55:37 +03:00 |
|
Vladislav Makhov
|
855fd46560
|
web: people: return to set selected mechanism in group button menu
|
2021-02-18 11:52:03 +03:00 |
|
Vladislav Makhov
|
da0d039be7
|
web: people: remove console.log
|
2021-02-17 19:22:04 +03:00 |
|
|
ca166e3c66
|
Web: People: Move from redux to mobx completely
|
2021-02-17 17:53:18 +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 |
|
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 |
|
Ilya Oleshko
|
d204c9b6de
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-16 13:22:34 +03:00 |
|
Vladislav Makhov
|
1d7f8c2e97
|
web: people: fix editing form data injection
|
2021-02-16 12:13:19 +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 |
|