Commit Graph

641 Commits

Author SHA1 Message Date
TatianaLopaeva
2a56b6dda4 Changed text by figma 2020-09-02 16:52:13 +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