Vladislav Makhov
|
25c812937d
|
Rename sendConsumerNewProps to updateConsumerProps
|
2020-11-06 14:29:55 +03:00 |
|
Vladislav Makhov
|
462c7578fb
|
Moved declaration out from render
|
2020-11-05 18:56:45 +03:00 |
|
Vladislav Makhov
|
b777439f09
|
Change to decomposed prop consumer
|
2020-11-05 18:43:21 +03:00 |
|
Vladislav Makhov
|
79d2940514
|
Rename prop NewProps to newProps
|
2020-11-05 18:41:01 +03:00 |
|
Vladislav Makhov
|
9220ab7d4f
|
Fix name
|
2020-11-05 18:38:31 +03:00 |
|
Vladislav Makhov
|
fc534aca67
|
Fix name
|
2020-11-05 18:38:00 +03:00 |
|
Vladislav Makhov
|
2108c2fba9
|
Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports
|
2020-11-05 18:20:15 +03:00 |
|
Vladislav Makhov
|
baa90d1a84
|
remove console warnings
|
2020-11-05 18:17:10 +03:00 |
|
Vladislav Makhov
|
c483acfde3
|
this.state decompose
|
2020-11-05 18:14:59 +03:00 |
|
Vladislav Makhov
|
49acf0168c
|
Moved declarations out from render
|
2020-11-05 18:11:32 +03:00 |
|
Artem Tarasov
|
b077f450b5
|
Web: Client: applied prop size for Avatar Component
|
2020-11-05 11:39:56 +03:00 |
|
Vladislav Makhov
|
550d08dc51
|
Fix modal
|
2020-11-03 17:48:05 +03:00 |
|
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 |
|
Artem Tarasov
|
324b12a29e
|
Web: Client: Wizard: fixed styles
|
2020-10-30 10:01:19 +03:00 |
|
TatianaLopaeva
|
41d0c3e9d9
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 12:11:34 +03:00 |
|
|
00c5f40cf8
|
Web: Client: Applied prettier style fix
|
2020-10-16 16:20:12 +03:00 |
|
|
11c2efde81
|
Web: Client: Removed old loader and toast
|
2020-10-15 19:28:31 +03:00 |
|
|
ff1c1765b5
|
Web: Clients: Turned off Suspense fallback
|
2020-10-15 18:07:23 +03:00 |
|
|
2fa205cb6f
|
Web: Clients: Fixed catching of initial API errors
|
2020-10-13 16:31:21 +03:00 |
|
|
746ecc7f40
|
Web: Clients: Fixed applying single cursor on loading
|
2020-10-13 16:20:49 +03:00 |
|
|
5d76e7e6b0
|
Web: Redesigned displaying of loading processes
|
2020-10-13 15:51:14 +03:00 |
|
TatianaLopaeva
|
ac697d28fc
|
Web: Added getLanguage selector
|
2020-10-13 12:17:45 +03:00 |
|
TatianaLopaeva
|
1010886262
|
Web: Refactoring
|
2020-10-12 16:56:34 +03:00 |
|
Artem Tarasov
|
679413c7b1
|
Web: Client: wizard: fixed layout
|
2020-10-12 12:01:27 +03:00 |
|
TatianaLopaeva
|
0b56cae632
|
Web: Added className and color for icon, margin-right moved to styles
|
2020-10-08 16:35:43 +03:00 |
|
TatianaLopaeva
|
3fb980fefc
|
Web: Added font-weight and color by layout
|
2020-10-08 14:51:40 +03:00 |
|
TatianaLopaeva
|
a992234355
|
Web: Changed margin-right by layout
|
2020-10-08 12:05:48 +03:00 |
|
Artem Tarasov
|
e1fd3f211a
|
Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword
|
2020-10-08 10:28:36 +03:00 |
|
Artem Tarasov
|
e2f3daacec
|
Web: Client: confirm: added passwordHash to co createUser, activateUser
|
2020-10-07 19:52:25 +03:00 |
|
Artem Tarasov
|
2547a70498
|
Web: Client: confirm: fixed the name of the passed parameter in /people
|
2020-10-07 19:10:35 +03:00 |
|
Artem Tarasov
|
5e0e8e9b3b
|
Web: Client: confirm: added transfer of hash instead of password
|
2020-10-07 18:23:14 +03:00 |
|
Ilya Oleshko
|
c0d798c141
|
Web: Client: Confirm : Fixed min password length property, now it get from settings
|
2020-10-07 15:02:56 +03:00 |
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
|
8e0dc5dda4
|
Web: Client: Fixed merge error
|
2020-10-05 14:26:31 +03:00 |
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
Artem Tarasov
|
afedcc603c
|
Web: Client: wizard: deleted unused props
|
2020-10-01 11:06:48 +03:00 |
|
Artem Tarasov
|
17d999f538
|
refactoring
|
2020-10-01 00:44:49 +03:00 |
|
Artem Tarasov
|
bfdfcbb4b5
|
Web: Client: Wizard: added password hash
|
2020-09-30 14:22:14 +03:00 |
|
|
ad4b28d1f2
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
|
2020-09-29 11:48:36 +03:00 |
|
TatianaLopaeva
|
09f8b3df6b
|
Deleted unnecessary variable
|
2020-09-29 09:18:43 +03:00 |
|
TatianaLopaeva
|
ea2f5ec097
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-29 09:06:16 +03:00 |
|
TatianaLopaeva
|
463bdc0ec8
|
Refactoring buttonContainer and index
|
2020-09-29 09:05:02 +03:00 |
|
TatianaLopaeva
|
a09953ff73
|
Refactoring and added Trans from "react-i18next"
|
2020-09-28 16:03:43 +03:00 |
|
Artem Tarasov
|
5426089bdb
|
Web: Client: refactoring translate Wizard
|
2020-09-28 13:09:34 +03:00 |
|
TatianaLopaeva
|
8139997ada
|
Refactoring headerContainer
|
2020-09-28 12:07:18 +03:00 |
|
TatianaLopaeva
|
26efa35a32
|
Refactoring translation
|
2020-09-28 11:35:53 +03:00 |
|
TatianaLopaeva
|
e51c65d0b7
|
Refactoring to variables condition
|
2020-09-28 10:19:08 +03:00 |
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
TatianaLopaeva
|
3357a2c687
|
Refactoring reducer
|
2020-09-25 16:38:36 +03:00 |
|
TatianaLopaeva
|
c9a8fcbd13
|
Re-write to variables condition
|
2020-09-25 10:39:22 +03:00 |
|
TatianaLopaeva
|
06b6386489
|
Simplify action type
|
2020-09-24 15:24:58 +03:00 |
|
TatianaLopaeva
|
555f9b0812
|
Refactoring and deleted className
|
2020-09-24 14:30:19 +03:00 |
|
|
885eb4a691
|
Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring
|
2020-09-23 18:42:47 +03:00 |
|
TatianaLopaeva
|
e5cf2db796
|
Refactoring toast
|
2020-09-23 17:45:02 +03:00 |
|
TatianaLopaeva
|
e515be4271
|
Refactoring styles, actions and reducer
|
2020-09-23 16:58:02 +03:00 |
|
TatianaLopaeva
|
60cc7c1706
|
Added setDocumentTitle
|
2020-09-23 15:41:12 +03:00 |
|
TatianaLopaeva
|
1849e3712d
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-23 15:25:23 +03:00 |
|
TatianaLopaeva
|
1a0881d58a
|
Refactoring styles
|
2020-09-23 14:44:27 +03:00 |
|
TatianaLopaeva
|
ee148a0b23
|
Refactoring styles
|
2020-09-23 11:08:41 +03:00 |
|
TatianaLopaeva
|
27774c97bd
|
Refactoring styles for headerContainer and buttonContainer (added grid for desktop)
|
2020-09-22 17:08:18 +03:00 |
|
TatianaLopaeva
|
41930dcb38
|
Changed min-width for containers
|
2020-09-22 15:36:29 +03:00 |
|
TatianaLopaeva
|
f9ca91fe51
|
Refactoring styles
|
2020-09-22 14:56:52 +03:00 |
|
TatianaLopaeva
|
2ae3926d1b
|
Added inserts line breaks when words are exceeding the width of the container, to avoid overflow.
|
2020-09-22 11:43:08 +03:00 |
|
TatianaLopaeva
|
87ee165027
|
Refactoring styles
|
2020-09-22 10:31:33 +03:00 |
|
TatianaLopaeva
|
a6b602851b
|
Added changeDocumentTitle
|
2020-09-21 15:15:38 +03:00 |
|
TatianaLopaeva
|
ca420104fc
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
|
2020-09-21 14:54:05 +03:00 |
|
Artem Tarasov
|
1bf4a243fd
|
Web: Client: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:53:24 +03:00 |
|
TatianaLopaeva
|
24c93d2026
|
Added useTranslation to containers
|
2020-09-21 14:39:06 +03:00 |
|
TatianaLopaeva
|
13a9e3e73b
|
Changed styles and Added flexible length for tablet and mobile
|
2020-09-21 10:17:20 +03:00 |
|
|
0f00799480
|
Web: Client: Fixed redirect to defaultPage
|
2020-09-19 18:24:48 +03:00 |
|
TatianaLopaeva
|
2d684556b6
|
Refactoring
|
2020-09-18 18:15:12 +03:00 |
|
TatianaLopaeva
|
833b2c8860
|
Refactoring
|
2020-09-18 17:36:56 +03:00 |
|
TatianaLopaeva
|
0945cf05f3
|
Refactoring
|
2020-09-18 17:33:33 +03:00 |
|
|
4a09b4b5f2
|
Web: fixed body scroll
|
2020-09-18 17:06:35 +03:00 |
|
TatianaLopaeva
|
81583aca4f
|
Changed logic for standaloneMod and refactoring header-container
|
2020-09-18 14:46:54 +03:00 |
|
TatianaLopaeva
|
564b250438
|
Changed margin of header-container
|
2020-09-18 13:23:35 +03:00 |
|
TatianaLopaeva
|
f4e876ccb5
|
Refactoring styles of advantages-container, button-container, contact-container
|
2020-09-18 12:25:49 +03:00 |
|
TatianaLopaeva
|
57d8da2600
|
Changed translation (ru)
|
2020-09-18 12:22:57 +03:00 |
|
Artem Tarasov
|
f3b8e4880c
|
Web: Files: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:18:48 +03:00 |
|
TatianaLopaeva
|
332b267157
|
Refactoring header-container
|
2020-09-18 10:24:48 +03:00 |
|
TatianaLopaeva
|
b1b07fc5de
|
Changed logic of getSettingsPayment
|
2020-09-18 10:22:35 +03:00 |
|
TatianaLopaeva
|
fbb0787eff
|
Added AcceptLicense
|
2020-09-17 17:07:32 +03:00 |
|
|
2f4a3141d5
|
Web: People: Speeded up loading first page + refactoring
|
2020-09-17 11:28:23 +03:00 |
|
|
fdf4e7564b
|
Web: Client: Speeded up loading first page + refactoring
|
2020-09-17 10:18:44 +03:00 |
|
TatianaLopaeva
|
8ecc93a30c
|
Changed logic of upload license
|
2020-09-16 10:33:06 +03:00 |
|
TatianaLopaeva
|
3eeb24a5b5
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-15 17:52:45 +03:00 |
|
TatianaLopaeva
|
d8abe20133
|
Refactoring
|
2020-09-15 17:23:57 +03:00 |
|
TatianaLopaeva
|
ce32451441
|
Changed reducer and actions: added setLicenseUpload and resetUploadedLicense
|
2020-09-15 14:16:12 +03:00 |
|
TatianaLopaeva
|
ed85445dcc
|
Changed format
|
2020-09-15 11:10:19 +03:00 |
|
TatianaLopaeva
|
7da745b96c
|
Refactoring actions and reducer
|
2020-09-15 11:01:54 +03:00 |
|
Alexey Kostenko
|
72ac3e9b15
|
Web: Client/Components: Fix dropDown styles on wizard
|
2020-09-15 09:02:24 +03:00 |
|
TatianaLopaeva
|
1f887f4b5b
|
Refactoring
|
2020-09-14 12:31:56 +03:00 |
|
|
99a6fd523e
|
Web: Client: Moved organizationName into authReducer
|
2020-09-11 18:03:40 +03:00 |
|
TatianaLopaeva
|
18147c3248
|
Added color for text when support is not available
|
2020-09-11 08:31:44 +03:00 |
|
TatianaLopaeva
|
e4034a8724
|
Added information when support is not available by layout, changed logic for data comparison
|
2020-09-10 17:17:23 +03:00 |
|
TatianaLopaeva
|
3968d09123
|
Refactoring styles for header-container
|
2020-09-10 16:24:11 +03:00 |
|
TatianaLopaeva
|
c4cdfe3191
|
Deleted nav-thumb-horizontal
|
2020-09-10 15:54:02 +03:00 |
|
TatianaLopaeva
|
fae1522c01
|
Refactoring styles for advantages-container
|
2020-09-10 15:04:13 +03:00 |
|