Commit Graph

1405 Commits

Author SHA1 Message Date
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +03:00
30b976f25f Web: Client: removed debugger, fixed onChangeOwner 2021-03-23 15:16:18 +03:00
40567ed10b Web: Restore: remove remoteEntry script 2021-03-23 10:33:36 +03:00
fd704ab12a Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:58:06 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
4ce205fe9a Web: Client: Commented not used code 2021-03-22 20:00:38 +03:00
f19ee78c0f Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:52:33 +03:00
dea3f3bb20 Web: Fixed login redirect 2021-03-22 18:52:25 +03:00
TatianaLopaeva
26ef7bdd65 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:31:41 +03:00
e279ece3c4 Removed commented code 2021-03-22 18:24:19 +03:00
ce86b6014b Web: Settings: Add URL proxy 2021-03-22 18:24:03 +03:00
TatianaLopaeva
9baae539d2 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904 Web: Fixed displaying of shared files at aside & Deleted useless code. 2021-03-22 18:11:39 +03:00
d7981f3f53 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 17:35:41 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
Viktor Fomin
0da17ef641 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:15:07 +03:00
Viktor Fomin
74e5686a0e Web: Client: fixed language-timezone settings 2021-03-22 16:14:41 +03:00
Alexey Kostenko
3524f3b6c6 Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage) 2021-03-22 15:27:36 +03:00
83e9a8b4a4 Web: Add URL proxy on tryRedirectTo usage 2021-03-22 12:16:41 +03:00
Viktor Fomin
d3fdc2d8a3 Web: Client: fixed greeting settings 2021-03-22 11:57:08 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
accd318dc0 Web: Fixed z-index of #ipl-progress-indicator 2021-03-20 11:24:33 +03:00
6b8d644aab Web: Replaced all homepages to config variant 2021-03-19 18:22:35 +03:00
1e02f165ca Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
Artem Tarasov
dabf704485 Web: Client/Components: Wizard: layout fix 2021-03-18 22:55:15 +03:00
8e6b2c78d8 Web: Moved ipl-progress-indicator to NavMenu 2021-03-18 22:26:52 +03:00
f3f4037282 Web: Fixed Wizard 2021-03-18 21:54:03 +03:00
330c156cb8 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 18:20:31 +03:00
544abc2321 Web: Client: fixed changePassword form, removed debugger 2021-03-18 16:00:58 +03:00
TatianaLopaeva
2898cabc3f Web: NavMenu: Fixed styles of title. 2021-03-18 13:53:21 +03:00
TatianaLopaeva
80247cbb1a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 13:30:53 +03:00
TatianaLopaeva
242d6870aa Web: PaymentsEnterprise: Fix styles & Added lost import. 2021-03-18 13:30:38 +03:00
23a23a0c68 Web: Client: fixed changeEmail confirm page 2021-03-18 12:29:16 +03:00
a861371826 Web: Client: fixed activateUser confirm page 2021-03-18 12:28:49 +03:00
6e2b2d5095 Web: Removed old svg 2021-03-17 21:26:28 +03:00
c3b49a713d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 18:34:09 +03:00
409073eff7 Web: Client: fixed change password 2021-03-17 18:33:05 +03:00
Alexey Kostenko
15a212a567 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 17:02:30 +03:00
Alexey Kostenko
15c1d087f7 Web: Client: Hidden AdminsSettings 2021-03-17 17:01:59 +03:00
TatianaLopaeva
a6e3349d9e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 16:46:25 +03:00
Alexey Kostenko
73727dc01f Web: Client: Fixed infinity loading in language-and-time-zone page 2021-03-17 16:41:53 +03:00
TatianaLopaeva
7beba532dd Web: Settings: Fixed displaying of icon. 2021-03-17 16:41:02 +03:00
86a63e6330 Web: Client: fixed createUser form 2021-03-17 16:35:45 +03:00
8036cb3401 Web: fixed confirm route 2021-03-17 15:56:09 +03:00
Alexey Kostenko
602ca59f2e Web: Client: Close menu after switch module 2021-03-17 15:38:21 +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
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
Vladislav Makhov
1c59410c38 web: client: remove history props drilling 2021-03-16 16:31:49 +03:00
7b5a9ab80d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 14:10:29 +03:00
24a6d61205 Web: Added creation and run of service-worker to all client apps 2021-03-16 14:10:20 +03:00
Ilya Oleshko
d99e7b731f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 17:58:45 +03:00
Ilya Oleshko
24d0af3851 Web: Client: Shell: Added route to ThirdPartyResponse page 2021-03-15 17:12:46 +03:00
Ilya Oleshko
c2902461cb Web: Client: ThirdParty: Fixed import 2021-03-15 17:12:09 +03:00
TatianaLopaeva
eac9bb9b3b Web: Settings: Fix icons displaying when moving from other modules. 2021-03-15 17:08:35 +03:00
a015b618a2 Web: Client: Added new service-worker on workbox v6 2021-03-14 23:36:20 +03:00
708a10a3f4 Web: Fixed logo displaying 2021-03-14 00:21: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
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +03:00
8e1f5b30b5 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-03-13 16:01:41 +03:00
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
bc8943083f Web: Clinet: Added default params to .env 2021-03-12 18:16:51 +03:00
b1dfa97386 Web: Client: Added support of homepage 2021-03-12 17:53:02 +03:00
b90876c97d Bump version to v0.0.11 2021-03-12 17:20:24 +03:00
e514fe1a57 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
e8e78604f1 Web: Added products/apps dynamic loading 2021-03-12 13:52:30 +03:00
7465b6cda4 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:12:03 +03:00
25cbaf3c0c Web: Files: fixed NavMenu clickOutsideAction 2021-03-12 13:11:53 +03:00
TatianaLopaeva
6c4329f9c7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:10:26 +03:00
TatianaLopaeva
b68487716b Web: Added translation for setting at Nav. 2021-03-12 13:09:58 +03:00
Alexey Kostenko
91b5fc5795 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:50:25 +03:00
TatianaLopaeva
dd92aa049f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:06:32 +03:00
TatianaLopaeva
43d7f6ba68 Web: Fix translation. 2021-03-12 12:05:12 +03:00
Alexey Kostenko
16eca008cd Web: Client: Added bodyLoader to accessRights page 2021-03-12 11:54:53 +03:00
Artem Tarasov
7846f41a06 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 10:12:12 +03:00
Viktor Fomin
ca4727978c Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 00:14:08 +03:00
Viktor Fomin
59aa9ccd8f Web: Client: hide header in editor 2021-03-12 00:14:00 +03:00
Artem Tarasov
63f1e788ad Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 21:14:21 +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
TatianaLopaeva
749e028beb Web: Layout: Fixed displaying of article. 2021-03-11 13:12:35 +03:00
TatianaLopaeva
9362f3cd2d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 10:20:25 +03:00
TatianaLopaeva
1afbcc0009 Web: Settings: Added top loading indicator. 2021-03-11 10:19:56 +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
bac65c6744 Web: Client: Modified production build 2021-03-10 18:31:21 +03:00
Alexey Kostenko
26a4d5e4cf Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 13:41:02 +03:00
Alexey Kostenko
960342236d Web: Client: Fixed transition from documents to settings 2021-03-10 13:40:39 +03:00
Viktor Fomin
585dbf3680 Web: fixed loader 2021-03-10 11:27:20 +03:00
40c7261fb1 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 10:36:14 +03:00
f962a2737b Web: Remove slash 2021-03-10 10:35:43 +03:00
Viktor Fomin
9d06a6618a Web: Client: change loader 2021-03-09 19:36:15 +03:00
2a5a78bc74 Web: Packages: stable versions 2021-03-06 21:46:04 +03:00
TatianaLopaeva
289f749288 Web: About: Fix translation. 2021-03-05 14:24:34 +03:00
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +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
Alexey Kostenko
b0f3a4e426 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 17:32:09 +03:00
TatianaLopaeva
b64736c363 Web: Added translation to PeopleSelector. 2021-03-04 14:57:48 +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
Alexey Kostenko
b3a3851d68 Web: Client: Fixed the transition from the people module to the documents module 2021-03-03 19:17:00 +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
fe39c60633 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 16:19:09 +03:00
TatianaLopaeva
ada47512f1 Web: Moved PeopleSelector to the Web Client. 2021-03-03 15:41:28 +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
TatianaLopaeva
7b0faa4747 Web: Moved Main into the Web Client. 2021-03-03 13:02:56 +03:00
TatianaLopaeva
d6cf286cd0 Web: Moved Layout to the Web Client. 2021-03-03 12:47:28 +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
d6f593e4d4 Web: Fixed loading NavMenu translations on different pages 2021-03-02 20:21:37 +03:00
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00
b9ad73b9ce Web: Added useful imports 2021-03-01 22:59:47 +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
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
d280a6dca7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:29:00 +03:00
b9b4c4b1e2 Web: Added opportunity to load login page by primary link 2021-03-01 15:28:51 +03:00
Viktor Fomin
6dd4847ea9 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:16:17 +03:00
Viktor Fomin
149e44b088 Web: Client: fixed loader width 2021-03-01 15:16:09 +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
c52680d4c8 Web: Settings: Fix displaying of icons. 2021-02-28 21:25:14 +03:00
Viktor Fomin
604ff5d925 Web: Client: added loading shell 2021-02-26 16:49:55 +03:00
TatianaLopaeva
ca0c86f2d4 Web/Common: Fix active title of menu, fix transition without redirect. 2021-02-26 13:50:20 +03:00
96c4d63abe Web: Fixed Files opening + added devtool: "inline-source-map" 2021-02-26 12:02:54 +03:00
Artem Tarasov
7af174ca65 Web: Client: fix imports 2021-02-26 00:17:25 +03:00
Artem Tarasov
48b3c6b445 Web: Common: fix after merge, fix imports and hierarchy 2021-02-25 17:20:11 +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
55a4a53bbc Web: Fixed 404 error on translation.json loading 2021-02-25 12:25:16 +03:00
4a40c8f894 Fix dependencies 2021-02-25 10:29:57 +03:00
36f6feec83 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-24 20:26:01 +03:00
471dcb1de7 Removed useless import 2021-02-24 20:25:54 +03:00
72675eb198 Web: Client: Simplified imports 2021-02-24 20:24:38 +03:00
Artem Tarasov
69dd27fac7 Web: applied new import from appserver/components 2021-02-24 20:11:23 +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
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
ef067c6040 Web: Client: Moved translations to public folder 2021-02-23 12:10:31 +03:00
c32a2b64dc Web: Client: Fixed open third-party dialog 2021-02-23 12:01:29 +03:00
09a600b042 Web: Client: Added config 2021-02-23 11:59:24 +03:00
TatianaLopaeva
f3efd89bfc Web: Added Setting Routing. 2021-02-20 18:41:26 +03:00
TatianaLopaeva
5fdb5c8508 Web: Fix not displaing of icons. 2021-02-20 18:25:46 +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
b625eb3647 Web: Home: Revert file changes. 2021-02-20 11:53:29 +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
30d4c580ac Web: Added ThemeProvider to the App. 2021-02-20 10:59:40 +03:00
87b1108147 Web: Turned debug in i18n 2021-02-19 21:59: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
Ilya Oleshko
1c01c3ce3a Web: Client: Fixed style for learn more links 2021-02-19 13:26:09 +03:00
Ilya Oleshko
d8d850b089 Web: Client: Open app link allowed only for IOS devices, added learn more links 2021-02-19 13:21:33 +03:00
Ilya Oleshko
ebc6d5942e Web: Client: Changed main container for ComingSoonPage at desktop version 2021-02-19 10:53:04 +03:00
Ilya Oleshko
cb72f2241b Web: Added product version badge 2021-02-18 15:55:26 +03:00
f36d05ccf4 Web: Fixed work process 2021-02-18 15:52:13 +03:00
Ilya Oleshko
d818d2272c Web: Client: Added new coming soon module page, fixed route, added translations 2021-02-16 16:11:49 +03:00
0b9a258f91 Web: Client: Moved to MobX 2021-02-15 22:43:07 +03:00
fb6b345734 Web: Client: Fixed setDocumentTitle 2021-02-05 14:22:26 +03:00
670ba9c4be Web: Rewritten asc-web-common to mobx 2021-02-03 15:42:47 +03:00
560133f82c Web: replaced components wrapper to mobx inject 2021-02-02 19:17:33 +03:00
2a79d8bb8d Web: Moved code to AuthStore usage 2021-02-02 17:26:58 +03:00
70c22c9d33 Web: Changes to AuthStore 2021-02-02 12:55:14 +03:00
f8e6a72460 Web: Changed work with settings data from redux to mobx 2021-02-02 09:48:57 +03:00
TatianaLopaeva
af96aaf2b3 Web: Changed imports. 2021-02-01 16:10:02 +03:00
Vladislav Makhov
0c72a6a140 web: add mobx provider 2021-02-01 14:01:09 +03:00
Vladislav Makhov
de88da2fa7 Web: Changed work with user data from redux to mobx 2021-02-01 11:45:26 +03:00
f91ce2390b Web: Changed work with modules from redux to mobx 2021-01-29 18:06:02 +03:00
TatianaLopaeva
ddab131a90 Web: Deleted useless import. 2021-01-29 17:41:35 +03:00
TatianaLopaeva
cf65b86b22 Web: Added Payments Routing. 2021-01-29 17:39:26 +03:00
9841b2ef1f Web: Added mobx and mobx-react packages 2021-01-29 17:17:58 +03:00
652c7bd906 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/MobileLayout.js
#	packages/asc-web-common/src/components/Layout/ScrollToTop.js
#	packages/asc-web-common/src/components/Layout/context.js
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/NavMenu/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
#	packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
#	packages/asc-web-components/src/components/icons/svg/load.error.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/App.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/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-29 16:39:00 +03:00
8a9bd141a5 Web: Added Error404 routing 2021-01-29 13:22:41 +03:00
Ilya Oleshko
8226d9185c Merge branch 'develop' into feature/not-implemented-page 2021-01-29 12:38:22 +03:00
b0e8b9c6af Bump version to v0.0.10 2021-01-29 11:13:27 +03:00
TatianaLopaeva
a22e262310 Update yarn lock files 2021-01-28 16:18:22 +03:00
Artem Tarasov
93e6777b27 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2021-01-27 18:03:12 +03:00
Viktor Fomin
32bfef070e Update yarn.lock files 2021-01-27 17:23:40 +03:00
436bf7a06e Web: People: Added routes 2021-01-27 10:31:29 +03:00
TatianaLopaeva
943015a8d6 Web: Fixed after merge. 2021-01-26 18:59:19 +03:00
3efedf74eb Web: Fixed routing on Module link 2021-01-26 16:28:51 +03:00
TatianaLopaeva
2b8dfc80e9 Web: Common/Files/People: Fixed "jumps" when go to the next page. 2021-01-26 13:50:29 +03:00
36c7a171df Web: Fixed load/unload People store 2021-01-26 13:36:05 +03:00
b9ed789746 Web: Applied WP:ModuleFederation best practices 2021-01-26 00:55:46 +03:00
Ilya Oleshko
9f3d803af5 Web: Client: Fixed modules list 2021-01-25 14:29:42 +03:00
Ilya Oleshko
e486a7919a Web: Fixed modules icons 2021-01-25 14:28:51 +03:00
Ilya Oleshko
f96a168b55 Web: Client: Added talk route, removed community 2021-01-25 14:27:49 +03:00
Ilya Oleshko
fe12c8f7d4 Web: Client: Home: Added selectors usage 2021-01-25 12:48:00 +03:00
Ilya Oleshko
bf0d15546e Web: Client: Added redirect to coming soon page for community route 2021-01-25 12:47:18 +03:00
Ilya Oleshko
253d48b53c Web: Restored default page, fixed infinite redirect loop on home page 2021-01-25 11:57:15 +03:00
Ilya Oleshko
554e16d47d Web: Client: Added redirect to coming soon page for new dummy modules 2021-01-25 11:43:26 +03:00
Artem Tarasov
0622f3003f Web: Client: App: fixed tag name 2021-01-25 10:36:50 +03:00
789b547ccf Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
#	packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-22 11:24:16 +03:00
Artem Tarasov
cdecfc3ed3 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Client/src/App.js
2021-01-21 16:45:35 +03:00
8d62eb5fbf Update yarn.lock files 2021-01-20 12:55:23 +03:00
3b959f81ed Bump version to v0.0.9 2021-01-18 19:06:31 +03:00
Artem Tarasov
2619753ade Web: Client: TgirdPartySettings: removed unused code 2021-01-18 17:57:51 +03:00
TatianaLopaeva
a4f416789a Merge branch 'develop' into feature/fix-hide/show-header 2021-01-18 12:02:40 +03:00
ef22eb04c5 Web: Client: Fix third-party response page displaying 2021-01-15 18:15:07 +03:00
Ilya Oleshko
8f3b4a60dd Web: Files: Added ThirdPartyResponse page error container, fixed router 2021-01-15 16:28:08 +03:00
90f81df4c7 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-15 13:39:31 +03:00
7650acfec3 Bump version to v0.0.8 2021-01-15 13:03:47 +03:00
Ilya Oleshko
24127929aa Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect 2021-01-15 11:52:29 +03:00
4ea47886f6 Bump version to v0.0.7 2021-01-14 17:56:05 +03:00
TatianaLopaeva
9bcb922c1a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.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/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.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
2021-01-13 13:27:55 +03:00
Artem Tarasov
9df05a53c9 Web: Components: ModalDialog: fixed cursor type in modal 2021-01-12 17:27:03 +03:00
Artem Tarasov
adc795feb4 Web: Client: thirdPartySettings: changed the cursor to default 2021-01-12 13:24:44 +03:00
889949eb95 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-common/src/desktop/index.js
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
#	products/ASC.Files/Client/src/components/pages/Home/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/Section/Header/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/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/helpers/confirmRoute.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/i18n.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	web/ASC.Web.Login/src/LoginContent.jsx
#	yarn.lock
2021-01-11 12:21:59 +03:00
60022bbc06 Update yarn.lock files 2020-12-30 21:33:07 +03:00
Vladislav Makhov
1f8769cd6b Update yarn.lock 2020-12-30 19:51:17 +03:00
Vladislav Makhov
44ba6f350f Merge branch 'develop' into feature/desktop-view 2020-12-30 16:20:47 +03:00
Artem Tarasov
3d7eada1a6 Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation 2020-12-30 12:15:50 +03:00
74aa0abca8 Bump version to v0.0.6 2020-12-29 19:43:37 +03:00
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +03:00
39a0cb99de Update yarn.lock files 2020-12-29 14:03:05 +03:00
a21fff2ab1 Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0". 2020-12-28 11:04:34 +03:00
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +03:00
9f8ff83084 Update yarn.lock files 2020-12-25 16:24:26 +03:00
2b08c711dc Update Create-react-app to v4.0.1 2020-12-25 16:01:04 +03:00
9350f1189e Bump version to v0.0.5 2020-12-24 12:22:48 +03:00
TatianaLopaeva
6a1e80f1fb Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
2020-12-24 11:03:52 +03:00
7803696e01 Update yarn.lock files 2020-12-23 12:43:27 +03:00
TatianaLopaeva
91f09ed700 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-12-23 11:01:34 +03:00
73f92d0897 Web: Client: fixed user activation 2020-12-22 18:48:05 +03:00
06de1efbae Update yarn.lock files 2020-12-22 11:59:57 +03:00
Artem Tarasov
6551e88c1e Web: Common/Client: fix redirect after logout in Confirm 2020-12-18 18:22:53 +03:00
344139a262 Web: Client: About: Fixed padding between "copyright" and lines 2020-12-18 17:31:29 +03:00
b8c2165b93 Web: Client: About: added link target 2020-12-18 17:27:26 +03:00
Artem Tarasov
4c6ff22e64 Web: Client: Confirm: fix activateUser 2020-12-18 17:03:34 +03:00
Artem Tarasov
eeaf50d312 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-18 16:22:55 +03:00
Artem Tarasov
a4aa7d7e9c Web: Client: Confirm: fix createUser 2020-12-18 16:22:41 +03:00
52798af66e Notification images 2020-12-18 16:12:48 +03:00
Artem Tarasov
a965583c94 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-18 14:04:22 +03:00
Artem Tarasov
ba075ecc47 Web: Client: About: fixed copyright style 2020-12-18 14:04:11 +03:00
a2d97d2612 Web: About: Fixed SourceCode url 2020-12-18 11:42:29 +03:00
53f510ae18 Bump version to v0.0.4 2020-12-17 21:00:36 +03:00
Artem Tarasov
bbea13bb4b Web: Client: Confirm: changePassword fix 2020-12-17 19:49:20 +03:00