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 |
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +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 |
|
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 |
|
TatianaLopaeva
|
9b240a3539
|
Changed appsettings added window.location.href for 402
|
2020-09-03 17:01:59 +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 |
|
|
dc0940cca0
|
Web: Settings: Fixed TypeError: Cannot read property 'label' of undefined
|
2020-09-02 13:01:24 +03:00 |
|
|
0eb3b2b4d3
|
Update yarn.lock files
|
2020-09-02 12:30:53 +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 |
|
TatianaLopaeva
|
6ee4cbc5b4
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-01 11:05:58 +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 |
|
TatianaLopaeva
|
991cc488d7
|
Added information about trial at reducer
|
2020-09-01 09:11:30 +03:00 |
|
|
062a3a793f
|
Update yarn.lock files
|
2020-08-31 17:45:37 +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 |
|
|
d9f70df70a
|
Update yarn.lock files
|
2020-08-31 12:42:36 +03:00 |
|
|
67f2e3feb8
|
Web: Client: Added Webpack-bundle-analyzer
|
2020-08-31 11:43:26 +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 |
|
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 |
|
|
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 |
|
Artem Tarasov
|
3b8796ca93
|
refactoring
|
2020-08-07 13:39:53 +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 |
|
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 |
|
Alexey
|
5148c7d54e
|
Web: Client: Settings: Added SaveSettingsButtons component to custom-tiles page
|
2020-08-04 10:46:36 +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 |
|