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 |
|