Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
TatianaLopaeva
|
5d01d660a5
|
Return lock.png
|
2020-09-24 13:05:17 +03:00 |
|
TatianaLopaeva
|
59716a184b
|
Deleted png images
|
2020-09-24 12:14:56 +03:00 |
|
TatianaLopaeva
|
6021ea4a76
|
Deleted png images
|
2020-09-24 12:01:08 +03:00 |
|
Vladislav Makhov
|
31f28acf88
|
Fix logos
|
2020-09-08 10:21:49 +03:00 |
|
TatianaLopaeva
|
792f2368ce
|
Changed images and rename them
|
2020-08-28 10:33:59 +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
|
fecb7383dd
|
added styled for desktop
|
2020-08-18 08:49:35 +03:00 |
|
Tatiana Lopaeva
|
271bfc1eb8
|
added payments
|
2020-08-17 12:20:24 +03:00 |
|
Artem Tarasov
|
36f11ff673
|
Created page Wizard
|
2020-06-19 16:47:41 +03:00 |
|
|
|
35ee20c957
|
Web: Client: added logo icons
|
2020-02-14 16:05:32 +03:00 |
|
Ilya Oleshko
|
e99d1acc3c
|
Web: Common: Layout: Added use of icons from module
|
2020-02-12 16:18:23 +03:00 |
|
|
|
effad5439c
|
web: Added dummy Documents product
|
2020-01-27 14:07:02 +03:00 |
|
Daniil Senkiv
|
5c61500118
|
Web.Client: Settings: added WhiteLabel page with getting logo urls, sizes, text for logo; added function for generating (drawing) logo
|
2019-11-13 12:22:50 +03:00 |
|
|
|
4da674ab75
|
web: People: Added people.svg
|
2019-08-05 18:24:34 +03:00 |
|
|
|
d24a08b16f
|
Moved Studio->ClientApp to separated ASC.Web.Client folder
|
2019-07-09 14:51:18 +03:00 |
|
