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
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
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
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
b1dfa97386
Web: Client: Added support of homepage
2021-03-12 17:53:02 +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
1afbcc0009
Web: Settings: Added top loading indicator.
2021-03-11 10:19:56 +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
Viktor Fomin
9d06a6618a
Web: Client: change loader
2021-03-09 19:36:15 +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
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
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
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
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
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
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
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
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
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
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
Artem Tarasov
2619753ade
Web: Client: TgirdPartySettings: removed unused code
2021-01-18 17:57:51 +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
Ilya Oleshko
24127929aa
Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect
2021-01-15 11:52:29 +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
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
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
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
a4aa7d7e9c
Web: Client: Confirm: fix createUser
2020-12-18 16:22:41 +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
Artem Tarasov
bbea13bb4b
Web: Client: Confirm: changePassword fix
2020-12-17 19:49:20 +03:00
Artem Tarasov
51d07b5652
Web: Client: Confirm: refactoring
2020-12-17 19:37:52 +03:00
Artem Tarasov
5542a09575
Web: Clietn: Confirm: fixed redirect (changePassword)
2020-12-17 19:27:56 +03:00
Artem Tarasov
7851635005
Web: Client: Confirm: fix change password
2020-12-17 16:20:53 +03:00
Artem Tarasov
16d738e5ca
Web: Common/Client: changePassword: added logout if user is logged in
2020-12-17 14:49:30 +03:00
Artem Tarasov
3daee8efbb
Web: Client: Confirm: fixed api method call
2020-12-17 12:38:23 +03:00
Artem Tarasov
b565bfc77c
Web: Client: Confirm: fixed crash of the app when trying to change pass if the user is authorized on the portal
2020-12-17 12:32:58 +03:00
4afadf2e0c
Web: Added support of public folders + moved back to original index.html
2020-12-15 19:27:30 +03:00
c9293ac86d
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.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/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/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/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/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# 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/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2020-12-15 18:40:27 +03:00
TatianaLopaeva
eb0743a3ad
Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page.
2020-12-15 14:08:14 +03:00
TatianaLopaeva
c9a8027ddf
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/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.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.Components/package.json
2020-12-11 11:12:28 +03:00
42bfa9a3a6
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
2020-12-08 15:12:42 +03:00
694daae135
Fixed redirection to default page if already logged-in
2020-12-08 15:12:33 +03:00
Ilya Oleshko
d2719e1cd9
Web: Fixed usage lodash/isEqual on fast-deep-equal
2020-12-08 14:09:46 +03:00
7c51353970
Moved ModuleTile into Home page
2020-12-07 11:35:36 +03:00
Ilya Oleshko
4147d2f31a
Web: Fixed temp loaders
2020-12-07 11:11:04 +03:00
71b6e9f27d
Web: Files: init Files build and loading (Moved out from CRA)
2020-12-07 10:49:07 +03:00
Ilya Oleshko
cd100eba85
Web: Client: Fixed redirect after actions
2020-12-07 09:43:40 +03:00
70aa6c023d
Web: Added dynostore for people reducers loading
2020-12-06 20:15:01 +03:00
2baf8cbc76
Fixed confirm link user creation
2020-12-04 17:15:00 +03:00
0784453daf
Fix errors on login and logout
2020-12-04 14:21:51 +03:00
Ilya Oleshko
c32fc83399
Web: Client: Fixed property name, added missing property
2020-12-04 11:58:15 +03:00
Ilya Oleshko
d03584fcdd
Web: Fixed isAuthenticated logic
2020-12-04 11:38:15 +03:00
1ed59c1694
Web: People: init People build and loading (Moved out from CRA)
2020-12-03 13:09:33 +03:00
f1119a3afd
Web: Fixed Login/logout working
2020-12-01 13:45:27 +03:00
c963f2f2a3
Web: Added concurrently run of apps + fixed CORS problems
2020-12-01 13:02:31 +03:00
d78912fd32
Web: Client: Added NavMenu
2020-12-01 11:05:39 +03:00
f1bcf02a11
Web: Client: Added support of sass files
2020-12-01 10:53:38 +03:00
TatianaLopaeva
2cebf625fc
Merge branch 'develop' into feature/fix-hide/show-header
2020-12-01 10:45:48 +03:00
172d93040b
Web: Client: init frame work
2020-11-30 11:35:50 +03:00
8c965fa4e1
Web: People: changed empty screen description, fixed icons alignment
2020-11-28 13:44:31 +03:00
9b10672daf
Web: Client: init re-write to webpack 5
2020-11-27 20:40:38 +03:00
beee70cd15
yarn workspaces init commit
2020-11-21 16:07:23 +03:00
TatianaLopaeva
10db39683f
Web: Added Layout to App
2020-11-17 12:04:10 +03:00
Artem Tarasov
4031a609b8
Merge branch 'develop' into hotfix/documents-bugfix
...
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
Vladislav Makhov
633a5415c0
Fix url
2020-11-10 08:14:56 +03:00
Vladislav Makhov
21234d6a39
Remove unused data
2020-11-09 16:24:32 +03:00
Vladislav Makhov
078bb238fd
Add url to store
2020-11-09 16:15:36 +03:00
Vladislav Makhov
7c6d5a9e54
Add translation
2020-11-09 15:58:58 +03:00
Vladislav Makhov
8ac2ad73d6
Fix title
2020-11-09 15:31:24 +03:00
Vladislav Makhov
cdaa816b36
Fix Help center link
2020-11-09 15:27:07 +03:00
Vladislav Makhov
fee439b390
Refactoring
2020-11-09 15:11:46 +03:00
Vladislav Makhov
eeced56986
Refactoring
2020-11-09 13:03:18 +03:00
Vladislav Makhov
430c7ae73d
Remove unused code
2020-11-09 12:05:17 +03:00
Vladislav Makhov
d569e8dd74
Refactoring
2020-11-09 12:02:03 +03:00
Vladislav Makhov
102837ed04
Add selector
2020-11-09 09:16:44 +03:00
Vladislav Makhov
c9eeeed26e
Add separator
2020-11-06 16:20:27 +03:00
Vladislav Makhov
25c812937d
Rename sendConsumerNewProps to updateConsumerProps
2020-11-06 14:29:55 +03:00
Vladislav Makhov
462c7578fb
Moved declaration out from render
2020-11-05 18:56:45 +03:00
Vladislav Makhov
b777439f09
Change to decomposed prop consumer
2020-11-05 18:43:21 +03:00
Vladislav Makhov
79d2940514
Rename prop NewProps to newProps
2020-11-05 18:41:01 +03:00
Vladislav Makhov
9220ab7d4f
Fix name
2020-11-05 18:38:31 +03:00
Vladislav Makhov
fc534aca67
Fix name
2020-11-05 18:38:00 +03:00
Vladislav Makhov
2108c2fba9
Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports
2020-11-05 18:20:15 +03:00
Vladislav Makhov
baa90d1a84
remove console warnings
2020-11-05 18:17:10 +03:00
Vladislav Makhov
c483acfde3
this.state decompose
2020-11-05 18:14:59 +03:00
Vladislav Makhov
49acf0168c
Moved declarations out from render
2020-11-05 18:11:32 +03:00
Artem Tarasov
b077f450b5
Web: Client: applied prop size for Avatar Component
2020-11-05 11:39:56 +03:00
Vladislav Makhov
550d08dc51
Fix modal
2020-11-03 17:48:05 +03:00
Vladislav Makhov
1e483de4ba
Merge branch 'develop' into feature/third-party-settings
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
Artem Tarasov
324b12a29e
Web: Client: Wizard: fixed styles
2020-10-30 10:01:19 +03:00
TatianaLopaeva
41d0c3e9d9
Merge branch 'develop' into feature/people-filter-empty-screen
2020-10-19 12:11:34 +03:00
00c5f40cf8
Web: Client: Applied prettier style fix
2020-10-16 16:20:12 +03:00
11c2efde81
Web: Client: Removed old loader and toast
2020-10-15 19:28:31 +03:00
ff1c1765b5
Web: Clients: Turned off Suspense fallback
2020-10-15 18:07:23 +03:00
2fa205cb6f
Web: Clients: Fixed catching of initial API errors
2020-10-13 16:31:21 +03:00
746ecc7f40
Web: Clients: Fixed applying single cursor on loading
2020-10-13 16:20:49 +03:00
5d76e7e6b0
Web: Redesigned displaying of loading processes
2020-10-13 15:51:14 +03:00
TatianaLopaeva
ac697d28fc
Web: Added getLanguage selector
2020-10-13 12:17:45 +03:00
TatianaLopaeva
1010886262
Web: Refactoring
2020-10-12 16:56:34 +03:00
Artem Tarasov
679413c7b1
Web: Client: wizard: fixed layout
2020-10-12 12:01:27 +03:00
TatianaLopaeva
0b56cae632
Web: Added className and color for icon, margin-right moved to styles
2020-10-08 16:35:43 +03:00
TatianaLopaeva
3fb980fefc
Web: Added font-weight and color by layout
2020-10-08 14:51:40 +03:00
TatianaLopaeva
a992234355
Web: Changed margin-right by layout
2020-10-08 12:05:48 +03:00
Artem Tarasov
e1fd3f211a
Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword
2020-10-08 10:28:36 +03:00
Artem Tarasov
e2f3daacec
Web: Client: confirm: added passwordHash to co createUser, activateUser
2020-10-07 19:52:25 +03:00
Artem Tarasov
2547a70498
Web: Client: confirm: fixed the name of the passed parameter in /people
2020-10-07 19:10:35 +03:00
Artem Tarasov
5e0e8e9b3b
Web: Client: confirm: added transfer of hash instead of password
2020-10-07 18:23:14 +03:00
Ilya Oleshko
c0d798c141
Web: Client: Confirm : Fixed min password length property, now it get from settings
2020-10-07 15:02:56 +03:00
e76e50dc79
Web: ServiceWorkers: Turned off debug mode
2020-10-07 13:43:51 +03:00
8d7cf4f2dc
Web: Replaced getCurrentModule with getCurrentProduct selector
2020-10-05 20:56:36 +03:00
63ee865d98
Merge branch 'feature/files' into feature/loading-acceleration
...
# Conflicts:
# 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
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
2020-10-05 15:37:09 +03:00
8e0dc5dda4
Web: Client: Fixed merge error
2020-10-05 14:26:31 +03:00
d00d16ee02
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
Artem Tarasov
afedcc603c
Web: Client: wizard: deleted unused props
2020-10-01 11:06:48 +03:00
Artem Tarasov
17d999f538
refactoring
2020-10-01 00:44:49 +03:00
Artem Tarasov
bfdfcbb4b5
Web: Client: Wizard: added password hash
2020-09-30 14:22:14 +03:00
ad4b28d1f2
Merge branch 'feature/files' into feature/loading-acceleration
...
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.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.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/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
TatianaLopaeva
09f8b3df6b
Deleted unnecessary variable
2020-09-29 09:18:43 +03:00
TatianaLopaeva
ea2f5ec097
Merge branch 'feature/files' into feature/payments-enterprise
2020-09-29 09:06:16 +03:00
TatianaLopaeva
463bdc0ec8
Refactoring buttonContainer and index
2020-09-29 09:05:02 +03:00
TatianaLopaeva
a09953ff73
Refactoring and added Trans from "react-i18next"
2020-09-28 16:03:43 +03:00
Artem Tarasov
5426089bdb
Web: Client: refactoring translate Wizard
2020-09-28 13:09:34 +03:00
TatianaLopaeva
8139997ada
Refactoring headerContainer
2020-09-28 12:07:18 +03:00
TatianaLopaeva
26efa35a32
Refactoring translation
2020-09-28 11:35:53 +03:00
TatianaLopaeva
e51c65d0b7
Refactoring to variables condition
2020-09-28 10:19:08 +03:00
a6180afa35
Web: Normalize routing + refactoring
2020-09-25 19:14:50 +03:00
TatianaLopaeva
3357a2c687
Refactoring reducer
2020-09-25 16:38:36 +03:00
TatianaLopaeva
c9a8fcbd13
Re-write to variables condition
2020-09-25 10:39:22 +03:00
TatianaLopaeva
06b6386489
Simplify action type
2020-09-24 15:24:58 +03:00
TatianaLopaeva
555f9b0812
Refactoring and deleted className
2020-09-24 14:30:19 +03:00
885eb4a691
Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring
2020-09-23 18:42:47 +03:00
TatianaLopaeva
e5cf2db796
Refactoring toast
2020-09-23 17:45:02 +03:00
TatianaLopaeva
e515be4271
Refactoring styles, actions and reducer
2020-09-23 16:58:02 +03:00
TatianaLopaeva
60cc7c1706
Added setDocumentTitle
2020-09-23 15:41:12 +03:00
TatianaLopaeva
1849e3712d
Merge branch 'feature/files' into feature/payments-enterprise
2020-09-23 15:25:23 +03:00
TatianaLopaeva
1a0881d58a
Refactoring styles
2020-09-23 14:44:27 +03:00
TatianaLopaeva
ee148a0b23
Refactoring styles
2020-09-23 11:08:41 +03:00
TatianaLopaeva
27774c97bd
Refactoring styles for headerContainer and buttonContainer (added grid for desktop)
2020-09-22 17:08:18 +03:00
TatianaLopaeva
41930dcb38
Changed min-width for containers
2020-09-22 15:36:29 +03:00
TatianaLopaeva
f9ca91fe51
Refactoring styles
2020-09-22 14:56:52 +03:00
TatianaLopaeva
2ae3926d1b
Added inserts line breaks when words are exceeding the width of the container, to avoid overflow.
2020-09-22 11:43:08 +03:00
TatianaLopaeva
87ee165027
Refactoring styles
2020-09-22 10:31:33 +03:00
TatianaLopaeva
a6b602851b
Added changeDocumentTitle
2020-09-21 15:15:38 +03:00
TatianaLopaeva
ca420104fc
Merge branch 'feature/files' into feature/payments-enterprise
...
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
Artem Tarasov
1bf4a243fd
Web: Client: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
2020-09-21 14:53:24 +03:00
TatianaLopaeva
24c93d2026
Added useTranslation to containers
2020-09-21 14:39:06 +03:00
TatianaLopaeva
13a9e3e73b
Changed styles and Added flexible length for tablet and mobile
2020-09-21 10:17:20 +03:00
0f00799480
Web: Client: Fixed redirect to defaultPage
2020-09-19 18:24:48 +03:00
TatianaLopaeva
2d684556b6
Refactoring
2020-09-18 18:15:12 +03:00
TatianaLopaeva
833b2c8860
Refactoring
2020-09-18 17:36:56 +03:00
TatianaLopaeva
0945cf05f3
Refactoring
2020-09-18 17:33:33 +03:00
4a09b4b5f2
Web: fixed body scroll
2020-09-18 17:06:35 +03:00
TatianaLopaeva
81583aca4f
Changed logic for standaloneMod and refactoring header-container
2020-09-18 14:46:54 +03:00
TatianaLopaeva
564b250438
Changed margin of header-container
2020-09-18 13:23:35 +03:00
TatianaLopaeva
f4e876ccb5
Refactoring styles of advantages-container, button-container, contact-container
2020-09-18 12:25:49 +03:00
TatianaLopaeva
57d8da2600
Changed translation (ru)
2020-09-18 12:22:57 +03:00
Artem Tarasov
f3b8e4880c
Web: Files: refactoring - changing document.title with changeTitleDocument()
2020-09-18 11:18:48 +03:00
TatianaLopaeva
332b267157
Refactoring header-container
2020-09-18 10:24:48 +03:00
TatianaLopaeva
b1b07fc5de
Changed logic of getSettingsPayment
2020-09-18 10:22:35 +03:00
TatianaLopaeva
fbb0787eff
Added AcceptLicense
2020-09-17 17:07:32 +03:00
2f4a3141d5
Web: People: Speeded up loading first page + refactoring
2020-09-17 11:28:23 +03:00
fdf4e7564b
Web: Client: Speeded up loading first page + refactoring
2020-09-17 10:18:44 +03:00
TatianaLopaeva
8ecc93a30c
Changed logic of upload license
2020-09-16 10:33:06 +03:00
TatianaLopaeva
3eeb24a5b5
Merge branch 'feature/files' into feature/payments-enterprise
...
# Conflicts:
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-15 17:52:45 +03:00
TatianaLopaeva
d8abe20133
Refactoring
2020-09-15 17:23:57 +03:00
TatianaLopaeva
ce32451441
Changed reducer and actions: added setLicenseUpload and resetUploadedLicense
2020-09-15 14:16:12 +03:00
TatianaLopaeva
ed85445dcc
Changed format
2020-09-15 11:10:19 +03:00
TatianaLopaeva
7da745b96c
Refactoring actions and reducer
2020-09-15 11:01:54 +03:00
Alexey Kostenko
72ac3e9b15
Web: Client/Components: Fix dropDown styles on wizard
2020-09-15 09:02:24 +03:00
TatianaLopaeva
1f887f4b5b
Refactoring
2020-09-14 12:31:56 +03:00
99a6fd523e
Web: Client: Moved organizationName into authReducer
2020-09-11 18:03:40 +03:00
TatianaLopaeva
18147c3248
Added color for text when support is not available
2020-09-11 08:31:44 +03:00
TatianaLopaeva
e4034a8724
Added information when support is not available by layout, changed logic for data comparison
2020-09-10 17:17:23 +03:00
TatianaLopaeva
3968d09123
Refactoring styles for header-container
2020-09-10 16:24:11 +03:00
TatianaLopaeva
c4cdfe3191
Deleted nav-thumb-horizontal
2020-09-10 15:54:02 +03:00
TatianaLopaeva
fae1522c01
Refactoring styles for advantages-container
2020-09-10 15:04:13 +03:00
TatianaLopaeva
2b24c97d9e
Refactoring styles of advantages-container
2020-09-10 14:57:29 +03:00
7433eea815
Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh
2020-09-10 13:19:06 +03:00
TatianaLopaeva
8a465e838d
Refactoring
2020-09-10 09:08:23 +03:00
TatianaLopaeva
305bb8ac7b
Refactoring
2020-09-10 09:05:55 +03:00
b3b6fd0938
Web: Components: Re-written ModalDialog component with SLOT pattern
2020-09-09 21:49:25 +03:00
TatianaLopaeva
dc4199a6c8
Changed componentDidMount and componentDidUpdate at index, changed reducer and actions
2020-09-09 17:06:42 +03:00
Vladislav Makhov
d5d086761e
Refactoring
2020-09-09 12:42:45 +03:00
TatianaLopaeva
957c7cd741
Changed style for header-container
2020-09-09 11:22:44 +03:00
Vladislav Makhov
1ff8b7b3a1
Refactoring
2020-09-09 10:32:51 +03:00
Vladislav Makhov
657901777f
Refactoring
2020-09-09 09:00:27 +03:00
Vladislav Makhov
86438647b8
Format PropTypes
2020-09-08 16:07:07 +03:00
Vladislav Makhov
66a0d9f60d
PropTypes
2020-09-08 15:54:20 +03:00
TatianaLopaeva
46e9124f81
Added api methods for payments
2020-09-08 15:39:45 +03:00
Vladislav Makhov
8a9af72f1e
Fix url address
2020-09-08 14:06:43 +03:00
Vladislav Makhov
24a2df3b16
Fix tree settings for t.p.s.
2020-09-08 13:38:25 +03:00
Vladislav Makhov
d864984596
Refactoring
2020-09-08 13:08:56 +03:00
Vladislav Makhov
806e48bd6d
Fix translation
2020-09-08 12:09:17 +03:00
Vladislav Makhov
653d60d897
Format styles
2020-09-08 10:57:26 +03:00
Vladislav Makhov
eccc420fd1
Format styles
2020-09-08 10:30:09 +03:00
Vladislav Makhov
31f28acf88
Fix logos
2020-09-08 10:21:49 +03:00
Vladislav Makhov
9934a6b06e
Refactoring
2020-09-08 09:10:55 +03:00
72ebd235ec
Merge branch 'feature/files' into feature/payments-enterprise
2020-09-07 18:42:57 +03:00
Artem Tarasov
6d68dfd0c6
added redirect from / to homepage(settings in state.auth.settings.homepage)
2020-09-07 18:26:44 +03:00
Vladislav Makhov
167e346575
Merge branch 'feature/files' into feature/third-party-settings
2020-09-07 15:34:08 +03:00
TatianaLopaeva
e802727b1b
Changed style for buttons
2020-09-07 14:46:58 +03:00
TatianaLopaeva
ca16bff3d0
Deleted text about Created Portals
2020-09-07 14:34:51 +03:00
TatianaLopaeva
5be50ebef9
Merge branch 'feature/files' into feature/payments-enterprise
...
# Conflicts:
# web/ASC.Web.Common/src/api/client.js
2020-09-06 13:10:24 +03:00
TatianaLopaeva
23666db461
Changed style for buttons, added logic for loading file when clicking a file, hidden FileInput
2020-09-06 12:49:37 +03:00
Vladislav Makhov
93c366d04e
Refactoring
2020-09-06 12:15:51 +03:00
31f19a0f96
Web: Client: Refactoring of initial requests calling
2020-09-04 20:37:53 +03:00
de41a366f6
Web: Client: Fixed layout in Wizard and removed useless constant
2020-09-04 20:34:00 +03:00
Vladislav Makhov
f5062b3fdf
Fix naming
2020-09-04 14:41:03 +03:00
Vladislav Makhov
b545b7ffa7
Add possibility to update consumer props values
2020-09-04 14:39:05 +03:00
TatianaLopaeva
eb8b6fce38
Changed the license upload notification: Added toastr and Deleted modal-dialog-container, Changed text of notification
2020-09-04 12:05:55 +03:00
Artem Tarasov
a017814a62
fixed wizard render
2020-09-04 11:36:16 +03:00
4686122183
Merge branch 'feature/files' into feature/payments-enterprise
2020-09-04 10:15:48 +03:00
TatianaLopaeva
c104ed287c
Delete debugger
2020-09-04 08:41:47 +03:00
Vladislav Makhov
ae1d9f242a
Fix outer description
2020-09-03 18:24:19 +03:00
Vladislav Makhov
3000bf00bf
Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings
2020-09-03 18:10:00 +03:00
Vladislav Makhov
d9e99cec2b
Format style
2020-09-03 18:09:50 +03:00
94fe24b3bd
Merge branch 'feature/files' into feature/third-party-settings
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2020-09-03 17:43:44 +03:00
TatianaLopaeva
9b240a3539
Changed appsettings added window.location.href for 402
2020-09-03 17:01:59 +03:00
Vladislav Makhov
f7aeb419a1
Add Integration Icon
2020-09-03 12:28:32 +03:00
Vladislav Makhov
164163482c
Add icons
2020-09-03 12:22:50 +03:00
Vladislav Makhov
f3de49a6dc
Format styles
2020-09-03 10:43:46 +03:00
Vladislav Makhov
09b7501241
Refactoring
2020-09-02 18:22:52 +03:00
4ed48f06b4
Web: Client: Added forceBackend in createI18N
2020-09-02 18:02:42 +03:00
3c11d95772
Web: Settings: Fixed crash on language undefined
2020-09-02 18:02:15 +03:00
TatianaLopaeva
2a56b6dda4
Changed text by figma
2020-09-02 16:52:13 +03:00
Vladislav Makhov
a27beb5d81
Delete unused code
2020-09-02 15:47:53 +03:00
Vladislav Makhov
80431f4fc6
Redo styles
2020-09-02 15:17:08 +03:00
Vladislav Makhov
5b40301e44
Add translation
2020-09-02 14:44:56 +03:00
dc0940cca0
Web: Settings: Fixed TypeError: Cannot read property 'label' of undefined
2020-09-02 13:01:24 +03:00
Vladislav Makhov
c53b3dbd3e
Refactoring
2020-09-02 12:50:08 +03:00
da50146545
Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render )
2020-09-02 12:19:21 +03:00
0152274029
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
2020-09-01 18:34:06 +03:00
00c6ce5e9b
Web: Clients: Added api-cache in service-worker for base info for 30 Minutes
2020-09-01 18:11:20 +03:00
bd6c0d0338
Web: Clients: Fixed windows is not defined
2020-09-01 18:09:39 +03:00
bc8613c4f6
Web: Clients: Uncommented self.skipWaiting() on install service-worker
2020-09-01 17:53:24 +03:00
Vladislav Makhov
d596a6938e
Add several translations
2020-09-01 16:18:49 +03:00
Vladislav Makhov
deea50f763
Refactoring
2020-09-01 15:30:21 +03:00
TatianaLopaeva
319dbc1158
Added translation and text for trial period
2020-09-01 10:51:19 +03:00
TatianaLopaeva
29d2bfab61
Changed logic of trial
2020-09-01 10:35:15 +03:00
TatianaLopaeva
35a0cf98c0
Added logic of trial at header-container
2020-09-01 10:34:20 +03:00
Vladislav Makhov
e58bd5b5b2
Refactoring
2020-09-01 10:02:16 +03:00
TatianaLopaeva
991cc488d7
Added information about trial at reducer
2020-09-01 09:11:30 +03:00
TatianaLopaeva
e8751d21c0
Added information when support is no longer available
2020-08-31 15:40:42 +03:00
TatianaLopaeva
af9457df7a
Changed logic of date
2020-08-31 15:15:33 +03:00
TatianaLopaeva
93e4f42e19
Rename visible of modal-dialog-container
2020-08-28 18:25:09 +03:00
TatianaLopaeva
611a58b7df
Added changed language to end data of license
2020-08-28 18:19:16 +03:00
Vladislav Makhov
e67148864d
Refactoring
2020-08-28 12:07:34 +03:00
TatianaLopaeva
d3dde62de3
Changed max-width for mobile, changed api for UploadLicense, added path into App
2020-08-28 11:46:39 +03:00
TatianaLopaeva
2022bd4ac1
Merge branch 'feature/files' into feature/payments-enterprise
...
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
54464c3320
Changed margin-top at header-container
2020-08-28 10:51:22 +03:00
TatianaLopaeva
6816ebc6cb
Rename at index and modal-dialog-container
2020-08-28 10:50:38 +03:00
TatianaLopaeva
9bac1c0639
Added headline for payments and some translations
2020-08-28 10:49:18 +03:00
TatianaLopaeva
ca776849a1
Rename and changed store for payments
2020-08-28 10:47:38 +03:00
TatianaLopaeva
a65e06f847
Delete commit at index.js
2020-08-28 10:44:03 +03:00
TatianaLopaeva
35d35af498
Added translation and style for modal-dailog-container
2020-08-28 10:43:27 +03:00
TatianaLopaeva
ca90e4b6c2
Update index.js as a class, button-container and added modal-dialog container
2020-08-28 10:41:48 +03:00
TatianaLopaeva
5561348cdf
Rename click events
2020-08-28 10:41:00 +03:00
TatianaLopaeva
0e9e39387f
Update files with files upload, input was hidden, some changed in reducer
2020-08-28 10:39:49 +03:00
TatianaLopaeva
58054d1d91
Added setLiscense, some translations and changed action for payments
2020-08-28 10:39:12 +03:00
TatianaLopaeva
07f9344496
Changed styles by figma
2020-08-28 10:37:49 +03:00
TatianaLopaeva
3a756ed4e9
Added division into Enterprise and SaaS, added reducer for payments
2020-08-28 10:36:26 +03:00
TatianaLopaeva
792f2368ce
Changed images and rename them
2020-08-28 10:33:59 +03:00
TatianaLopaeva
745f3ed131
Added adaptation for mobile
2020-08-28 10:32:25 +03:00
TatianaLopaeva
251c222c24
Update files with containers and added adaptation for tablet
2020-08-28 10:28:23 +03:00
TatianaLopaeva
9fff932736
Changed App and images from png into svg, added action and reducer for payments
2020-08-28 10:26:39 +03:00
TatianaLopaeva
47e0b43485
Added state and propTypes
2020-08-28 09:48:44 +03:00
Vladislav Makhov
f3991a0900
Add reducer case, update initial state
2020-08-28 09:46:38 +03:00
Vladislav Makhov
c21a29da06
Add action and thunk
2020-08-28 09:45:46 +03:00
Vladislav Makhov
dce7d95fec
Fix routing
2020-08-27 15:22:39 +03:00
Vladislav Makhov
a49a5e6b19
Merge branch 'feature/files' into feature/third-party-settings
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-27 12:15:42 +03:00
Vladislav Makhov
bf65514ae2
Redo styles
2020-08-26 16:18:01 +03:00
Vladislav Makhov
f4ca7f8de1
Add toggle interaction
2020-08-24 15:13:24 +03:00
Vladislav Makhov
a47c9b4fba
Add consumers data
2020-08-24 10:19:00 +03:00
d5942241e8
Web: Clients: Parallelized initial API queries
2020-08-20 12:17:36 +03:00
05bc905831
Web: Clients: Fixed regex to transltaion.json files for serviceWorker
2020-08-19 21:18:23 +03:00
8d11e1b0c8
Web: Clients: Changed interaction with serviceWorker
2020-08-19 20:00:41 +03:00
TatianaLopaeva
19ba763a44
added onClick
2020-08-18 14:11:34 +03:00
TatianaLopaeva
e359ed7e79
update props
2020-08-18 10:55:36 +03:00
TatianaLopaeva
684667d5de
en support
2020-08-18 10:32:06 +03:00
TatianaLopaeva
b1f31c5bae
en support
2020-08-18 10:31:22 +03:00
TatianaLopaeva
fecb7383dd
added styled for desktop
2020-08-18 08:49:35 +03:00
5542e211df
Web Client: refactoring
2020-08-17 13:16:04 +03:00
Tatiana Lopaeva
271bfc1eb8
added payments
2020-08-17 12:20:24 +03:00
a1c4a8a9f5
Web Client: refactoring
2020-08-17 10:54:42 +03:00
c398eb8229
Web Client: simplified configuration of i18n (+ removed useless requests)
2020-08-14 22:14:42 +03:00
Alexey
58e73a9ffb
Web: Client: Settings: Refactoring
2020-08-13 14:21:59 +03:00
Alexey
cc0c852ae1
Web: Client: Settings: code formatting
2020-08-13 12:01:45 +03:00
Alexey
6d1a78922d
Web: Client: Settings: Refactoring
2020-08-13 11:11:03 +03:00
5795c6f324
Merge branch 'feature/files' into feature/customization
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Components/src/index.js
2020-08-13 10:07:14 +03:00
Ilya Oleshko
37fe1cab21
Merge branch 'master' into feature/files
2020-08-12 18:05:29 +03:00
Artem Tarasov
1bd341fc33
fix translate
2020-08-12 17:17:14 +03:00
Artem Tarasov
4499d82de9
decomposition
2020-08-12 16:32:42 +03:00
Artem Tarasov
c301178a16
fixed translate
2020-08-12 16:32:17 +03:00
Artem Tarasov
f110b2a49a
deleted Toast, added ModalDialog
2020-08-12 14:18:40 +03:00
Artem Tarasov
e3119d4610
fixed fontWeight link for License
2020-08-12 13:30:24 +03:00
Artem Tarasov
034d60707d
fixed link
2020-08-12 13:08:24 +03:00
Artem Tarasov
a19d7ec4cf
fixed modal dialog
2020-08-12 12:00:47 +03:00
Alexey
a8c0973d42
Merge branch 'feature/files' into feature/customization
2020-08-12 11:57:32 +03:00
Artem Tarasov
1503bc105b
fix link
2020-08-12 11:54:08 +03:00
Alexey
b3ebf23c7b
Web: Client: revert customization refactoring
2020-08-12 11:52:46 +03:00
Ilya Oleshko
09e67be27e
Web: Client: About: Fixed page wrapper
2020-08-11 15:47:31 +03:00
Ilya Oleshko
8709e83f9a
Web: Client: Confirm: Fixed sub pages containers
2020-08-11 15:46:50 +03:00
Ilya Oleshko
4800942452
Web: Client: Home: Fixed page container
2020-08-11 15:45:15 +03:00
Ilya Oleshko
ee0a040fb7
Web: Client: Settings: Fixed customization page container
2020-08-11 15:44:28 +03:00
Ilya Oleshko
f2f85f0ddc
Web: Client: Settings: Fixed Layout container
2020-08-11 15:43:12 +03:00
Ilya Oleshko
7bd5ff0b4f
Web: Client: Fixed ConfirmRoute wrapper
2020-08-11 15:41:45 +03:00
Artem Tarasov
325d497cc0
fixed accept file
2020-08-10 18:40:46 +03:00
Artem Tarasov
d463a4ab25
fixed bugs upload incorrect file license after upload current
2020-08-10 18:25:04 +03:00
Artem Tarasov
70f3098fb2
fixed modal message and accept files
2020-08-10 18:06:20 +03:00
Artem Tarasov
d338f546e0
Added message about successful upload
2020-08-10 13:29:32 +03:00
Artem Tarasov
ef9b4d52e9
added input highlighting
2020-08-10 11:22:49 +03:00
Artem Tarasov
56bd4e8411
fixed upload license
2020-08-10 10:27:58 +03:00
Artem Tarasov
b8d42d53ed
fixed language
2020-08-07 22:02:55 +03:00
Vladislav Makhov
df63fbae5d
TODO
2020-08-07 15:39:03 +03:00
Vladislav Makhov
8b9f85b01a
Delete unused file
2020-08-07 15:27:20 +03:00
Vladislav Makhov
f5e0f67863
Refactoring
2020-08-07 15:26:43 +03:00
Artem Tarasov
3b8796ca93
refactoring
2020-08-07 13:39:53 +03:00
Vladislav Makhov
f9ad3e60a8
Styles fix
2020-08-07 10:58:04 +03:00
Vladislav Makhov
40058ec43c
Styles fix
2020-08-06 14:03:09 +03:00
Vladislav Makhov
3e4c584237
Styles fix
2020-08-06 13:27:20 +03:00
Vladislav Makhov
3a38688d80
Translation fix
2020-08-06 11:03:56 +03:00
Alexey
d514d8399b
Web: Client: Settings: Added translate keys, refactoring
2020-08-06 10:50:04 +03:00
Alexey
2a0641decb
Web: Components: Added SaveCancelButtons component
2020-08-06 10:00:41 +03:00
Artem Tarasov
3838c5ae39
fix
2020-08-06 09:44:52 +03:00
Artem Tarasov
c4ba6adee2
fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout
2020-08-06 00:01:41 +03:00
Alexey
5a93916314
Web: Client: Settings: Refactoring
2020-08-05 18:08:49 +03:00
Artem Tarasov
5c8efbd7c5
upload license
2020-08-05 15:27:28 +03:00
Alexey
2dd3f6e3fa
Web: Client: Settings: Fixed save custom title
2020-08-05 15:19:51 +03:00
Vladislav Makhov
db04df64b2
State fix
2020-08-05 15:14:10 +03:00
Vladislav Makhov
cff3cb9bcd
Title translation
2020-08-05 15:13:53 +03:00
Vladislav Makhov
79659d8df4
Optimized modal dialog working with multiple consumers data.
2020-08-05 11:36:52 +03:00
Vladislav Makhov
d0c8cb7486
Add modal dialog
2020-08-05 09:07:41 +03:00
Alexey
dba555e2b7
Web: Client: Settings: Updated customization and custom-titles pages, small actions fix
2020-08-04 17:53:32 +03:00
Artem Tarasov
8257c957cb
fix upload license
2020-08-04 16:39:05 +03:00
Vladislav Makhov
bdfdd76f43
Add styles and data prototypes
2020-08-04 11:53:00 +03:00
Artem Tarasov
5ccc0fc21c
upload fix
2020-08-04 11:48:43 +03:00
Alexey
5148c7d54e
Web: Client: Settings: Added SaveSettingsButtons component to custom-tiles page
2020-08-04 10:46:36 +03:00
Vladislav Makhov
153a420674
Add routing
2020-08-04 09:53:13 +03:00
Vladislav Makhov
a1f53b16c4
TPS init
2020-08-04 09:52:58 +03:00
Artem Tarasov
bdeedbbb42
added seLicense()
2020-08-03 22:36:13 +03:00
Artem Tarasov
555eac84b8
add method getIsRequiredLicense
2020-08-03 22:04:49 +03:00
Artem Tarasov
afc8803ff4
added timezone transfer
2020-08-03 16:14:05 +03:00
Artem Tarasov
90cda6ef62
fixed redirect to /login
2020-08-03 10:57:58 +03:00
Alexey
c5a99950d5
Web: Client: Settings: Fixed save button event
2020-08-02 11:03:08 +03:00
Alexey
547e95f8e9
Web: Client: Settings: Show a reminder only after re-visiting the page with unsaved changes
2020-08-02 10:36:15 +03:00
Alexey
d588567ac6
Web: Client: Settings: SaveSettingsButtons mobile style fix
2020-08-02 09:38:59 +03:00
Alexey
1d1740e7e4
Web: Client: Settings: Added a handler for the cancel button
2020-08-02 07:54:44 +03:00
Artem Tarasov
f988fa5573
refactoring layout
2020-08-01 19:10:21 +03:00
Artem Tarasov
d13383f507
refactoring styles
2020-08-01 02:00:40 +03:00
Artem Tarasov
652371a42c
fixed layout
2020-07-31 16:02:59 +03:00
Artem Tarasov
f95d788516
fixed modal
2020-07-31 15:20:12 +03:00
Artem Tarasov
b40a6d91bc
added ErrorContainer if wizard not init
2020-07-31 15:05:28 +03:00
Artem Tarasov
d8f25319a1
fixed redirect drom login page
2020-07-31 14:31:46 +03:00
Alexey
f497aa5ba2
Web: Client: Settings: Added saveSettingButtons component, added system for saving temporary settings without applying
2020-07-31 11:35:14 +03:00
Artem Tarasov
2e42c813b8
fixed actions
2020-07-30 13:50:13 +03:00
Artem Tarasov
2a049f8d78
before merge
2020-07-30 13:07:05 +03:00
Artem Tarasov
70b95179f0
refactoring
2020-07-29 23:27:56 +03:00
Artem Tarasov
0bafcc7b1d
refactoring
2020-07-29 19:01:57 +03:00
Artem Tarasov
baf77c3979
fix styles, refactoring
2020-07-29 18:16:16 +03:00
Artem Tarasov
e949ff75ba
added Layout
2020-07-29 13:05:23 +03:00
Alexey
e7d3b6000b
Web: Client: Settings: Fix mobile styles on customization page
2020-07-28 10:17:32 +03:00
Alexey
7982194f5a
Web: Client: Settings: Fix language-and-time-zone and customization pages, refactoring
2020-07-27 18:13:01 +03:00
Alexey
3ec06cab83
Web: Client: Settings: Fix custom-tiles page, refactoring
2020-07-27 17:24:41 +03:00
Alexey
27055fb58a
Web: Client: Settings: Refactoring customization page
2020-07-27 14:39:28 +03:00
Alexey
c2ad40995e
Web: Client: Settings: Added custom-titles page, updated customization page
2020-07-27 09:38:02 +03:00
Artem Tarasov
aca4ce9c32
added checking, refacktoring
2020-07-24 15:30:11 +03:00
Artem Tarasov
cbda5efd21
refactoring styles of settings-box
2020-07-24 09:39:11 +03:00
Alexey
b35af29ec8
Web: Client: Settings: Updated section header, refactoring
2020-07-23 18:56:57 +03:00
Alexey
e067346d2c
Web: Client: Settings: Routing, updated tree
2020-07-23 16:37:18 +03:00
Artem Tarasov
5bf6f7de50
added onInputFileHandler
2020-07-23 16:26:32 +03:00
Artem Tarasov
8fd658ced9
added FileInput
2020-07-23 15:52:20 +03:00
Artem Tarasov
a0b99cc097
refactoring
2020-07-23 12:35:42 +03:00
Artem Tarasov
6a3922accc
added functionality to change email
2020-07-23 11:16:55 +03:00
Artem Tarasov
dcee7b97b8
layout fix, added new view
2020-07-23 11:03:30 +03:00
Artem Tarasov
037bed591f
styles fix
2020-07-22 18:47:37 +03:00
Artem Tarasov
109b39153b
added link for generate pass
2020-07-22 15:14:50 +03:00
Artem Tarasov
96b07eaf81
layout fix
2020-07-22 14:48:19 +03:00
Artem Tarasov
9414fad3d1
fix
2020-07-22 08:52:59 +03:00
Artem Tarasov
b0585d4ec0
fix layout
2020-07-21 17:00:12 +03:00
Artem Tarasov
baaa29172d
fix bug
2020-07-21 16:30:22 +03:00
Artem Tarasov
ee86ce8140
added settings pass
2020-07-21 15:10:09 +03:00
Artem Tarasov
3865909d9a
fixed margin settings
2020-07-21 14:44:17 +03:00
Artem Tarasov
55c19bbd43
fixed Button
2020-07-21 14:01:54 +03:00
Artem Tarasov
098fa8dd3a
fixed EmailInput
2020-07-21 13:55:54 +03:00
Artem Tarasov
d1561a1954
delete translation for tooltip pasword input
2020-07-21 13:50:14 +03:00
Artem Tarasov
228edd119d
fixe PasswordInput
2020-07-21 13:49:16 +03:00
Alexey
cb0a734a78
Web: Components: Updated tree-menu in settings section
2020-07-20 16:22:52 +03:00
Artem Tarasov
2469126f7a
hidden input license file
2020-07-15 14:26:49 +03:00
Artem Tarasov
7e3ba192b1
fixed file name in input type=file
2020-07-15 14:01:29 +03:00
Artem Tarasov
6d2deca3c6
layout fix
2020-07-15 11:47:21 +03:00
Artem Tarasov
84ca1146a0
layout fix
2020-07-14 17:46:00 +03:00
Artem Tarasov
80a5e224e8
added PropTypes and deleted console.log
2020-07-12 12:34:42 +03:00
Artem Tarasov
0e2da28101
added getPortalSettings after wizard completed
2020-07-10 19:00:21 +03:00
Artem Tarasov
491a3d32da
added routing after completed Wizard
2020-07-10 18:08:22 +03:00
Artem Tarasov
f8e9cfc5f0
added onKeyPressHandler
2020-07-10 13:10:54 +03:00
Artem Tarasov
486dbe1fb5
layout fix
2020-07-10 11:26:16 +03:00
Artem Tarasov
92fdf4c41d
added Toast
2020-07-09 17:57:53 +03:00
Artem Tarasov
5d1043af13
added Loader
2020-07-09 15:11:08 +03:00
Artem Tarasov
11be0a1ef3
added in PasswordInput NewPasswordButtonVisible from /new-login-page
2020-07-09 14:12:53 +03:00
Artem Tarasov
27ddc44211
added truncate label timezone
2020-07-09 12:47:07 +03:00