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 |
|
Artem Tarasov
|
94ee712c0e
|
fixed warning
|
2020-06-30 17:29:54 +03:00 |
|
Artem Tarasov
|
3286df2572
|
added Redux
|
2020-06-30 14:35:16 +03:00 |
|
Artem Tarasov
|
ed48224a7d
|
added Redux Wizard
|
2020-06-29 18:07:05 +03:00 |
|
|
|
218ece84e4
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
|
2019-12-19 10:15:25 +03:00 |
|
|
|
49661f1b31
|
Web: Client: fixed paging on accessRight admins page
|
2019-12-19 09:59:10 +03:00 |
|
|
|
06c220634a
|
web: client: Applied changes in AdvancedSelector on OwnerSettings page
|
2019-12-15 21:51:51 +03:00 |
|
|
|
84f6fba008
|
web: client: Applied changes in AdvancedSelector on AdminsSettings page
|
2019-12-15 21:39:34 +03:00 |
|
Daniil Senkiv
|
781833d38d
|
moved actions from web.common to web.client and people modules
|
2019-12-05 20:00:53 +03:00 |
|
Daniil Senkiv
|
276eefe679
|
Moved actions for confirm pages from web.common to web.client, applying to pages
|
2019-12-05 16:50:07 +03:00 |
|
Daniil Senkiv
|
402226eca6
|
moved information for confirm pages from web.common to web.client, added confirm reducer
|
2019-12-04 17:35:38 +03:00 |
|
|
|
74530bfa76
|
Merge branch 'master' into feature/asc-web-common
# Conflicts:
# products/ASC.People/Client/src/App.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
|
2019-11-19 13:34:36 +03:00 |
|
|
|
629d426a55
|
Web: Client: refactoring accessRight sub-pages code
|
2019-11-19 09:25:48 +03:00 |
|
|
|
da027e13af
|
Web: Client: added pageLoader to accessRights sub-pages, added advanced selector to owner page added new translations
|
2019-11-18 13:15:17 +03:00 |
|
|
|
b38b9b2a2a
|
web: Client: Replaced services folder to ASC.Web.Common realization
|
2019-11-18 10:14:44 +03:00 |
|
|
|
a75d6e7ecc
|
web: Removed auth folder from store (after change to asc-web-common variant)
|
2019-11-15 16:29:49 +03:00 |
|
|
|
49d5000cd2
|
Merge branch 'master' into feature/asc-web-common
|
2019-11-15 15:29:57 +03:00 |
|
|
|
2d47d639dd
|
web: People: Replaced auth store to ASC.Web.Common realization
|
2019-11-15 12:38:31 +03:00 |
|
