Commit Graph

160 Commits

Author SHA1 Message Date
TatianaLopaeva
0945cf05f3 Refactoring 2020-09-18 17:33:33 +03:00
TatianaLopaeva
81583aca4f Changed logic for standaloneMod and refactoring header-container 2020-09-18 14:46:54 +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
TatianaLopaeva
8ecc93a30c Changed logic of upload license 2020-09-16 10:33:06 +03:00
TatianaLopaeva
ce32451441 Changed reducer and actions: added setLicenseUpload and resetUploadedLicense 2020-09-15 14:16:12 +03:00
TatianaLopaeva
7da745b96c Refactoring actions and reducer 2020-09-15 11:01:54 +03:00
TatianaLopaeva
1f887f4b5b Refactoring 2020-09-14 12:31:56 +03:00
TatianaLopaeva
8a465e838d Refactoring 2020-09-10 09:08:23 +03:00
TatianaLopaeva
dc4199a6c8 Changed componentDidMount and componentDidUpdate at index, changed reducer and actions 2020-09-09 17:06:42 +03:00
TatianaLopaeva
46e9124f81 Added api methods for payments 2020-09-08 15:39:45 +03:00
TatianaLopaeva
9b240a3539 Changed appsettings added window.location.href for 402 2020-09-03 17:01:59 +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
611a58b7df Added changed language to end data of license 2020-08-28 18:19:16 +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
ca776849a1 Rename and changed store for payments 2020-08-28 10:47:38 +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
3a756ed4e9 Added division into Enterprise and SaaS, added reducer for payments 2020-08-28 10:36:26 +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
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
Artem Tarasov
d463a4ab25 fixed bugs upload incorrect file license after upload current 2020-08-10 18:25:04 +03:00
Artem Tarasov
3b8796ca93 refactoring 2020-08-07 13:39:53 +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
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
Artem Tarasov
5ccc0fc21c upload fix 2020-08-04 11:48:43 +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
Artem Tarasov
f95d788516 fixed modal 2020-07-31 15:20:12 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +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
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
84ca1146a0 layout fix 2020-07-14 17:46:00 +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
6c01f7392f added method setPortalOwner 2020-07-08 18:15:50 +03:00
Artem Tarasov
6dd5c338fe fix translation and layout 2020-07-08 15:34:29 +03:00
Artem Tarasov
07089f2fc7 added api methods 2020-07-08 11:29:44 +03:00
Artem Tarasov
779eb155b5 added action getPortalCultures, fix routing 2020-07-07 14:50:31 +03:00
Artem Tarasov
c0e5626c1f deleted unnecessary func and action in Wizard 2020-07-06 14:26:47 +03:00
Artem Tarasov
83fc1b18c6 added Loader in Wizard page 2020-07-06 12:57:43 +03:00