dev.daminik00
|
1f983df427
|
add sass
|
2024-06-25 23:01:11 +02:00 |
|
yury
|
5ca0a636cc
|
feat: Change payment window on palmistry/payment
|
2024-06-25 04:24:52 +03:00 |
|
Daniil Chemerkin
|
ca79e53b00
|
Merge branch 'develop' into 'main'
AW-115-lottie-optimization
See merge request witapp/aura-webapp!200
|
2024-06-25 00:09:26 +00:00 |
|
|
|
f7ef213c00
|
Merge branch 'main' of https://gitlab.com/witapp/aura-webapp into develop
|
2024-06-25 04:08:28 +04:00 |
|
Daniil Chemerkin
|
c015423edb
|
Merge branch 'onboarding-edits' into 'develop'
onboarding-edits
See merge request witapp/aura-webapp!199
|
2024-06-24 23:54:21 +00:00 |
|
|
|
ead30aa974
|
onboarding-edits
change loader
|
2024-06-25 03:52:21 +04:00 |
|
Daniil Chemerkin
|
9f25146c95
|
Merge branch 'play-pause-yandex-triggers' into 'develop'
play-pause-yandex-triggers
See merge request witapp/aura-webapp!198
|
2024-06-24 22:45:44 +00:00 |
|
|
|
966716fd61
|
play-pause-yandex-triggers
add triggers to play/pause control
|
2024-06-25 02:39:31 +04:00 |
|
Daniil Chemerkin
|
9f899518fd
|
Merge branch 'hide-lotti-from-yandex' into 'develop'
hide-lottie-from-yandex
See merge request witapp/aura-webapp!197
|
2024-06-24 22:35:19 +00:00 |
|
Денис Катаев
|
8499eef3c2
|
Merge branch 'develop' into 'hide-lotti-from-yandex'
# Conflicts:
# src/components/pages/ABDesign/v1/pages/TrialPayment/components/PersonalVideo/index.tsx
|
2024-06-24 22:34:23 +00:00 |
|
Daniil Chemerkin
|
8d65ba6380
|
Merge branch 'play-pause-button' into 'develop'
play-pause-button
See merge request witapp/aura-webapp!196
|
2024-06-24 22:28:49 +00:00 |
|
|
|
98702c8fcf
|
hide-lottie-from-yandex
hide lottie from webvisor, add reachGoals
|
2024-06-25 02:23:56 +04:00 |
|
|
|
0bdcd91b8d
|
play-pause-button
add play/pause control to personal video
|
2024-06-25 01:41:53 +04:00 |
|
Daniil Chemerkin
|
98735276c4
|
Merge branch 'fix-blur-button' into 'develop'
fix blur button
See merge request witapp/aura-webapp!195
|
2024-06-24 18:46:49 +00:00 |
|
|
|
c7a4e545d0
|
fix blur button
|
2024-06-24 22:19:22 +04:00 |
|
Daniil Chemerkin
|
a454c95611
|
Merge branch 'AW-119-personal-video-edits' into 'develop'
AW-119-personal-video-edits
See merge request witapp/aura-webapp!194
|
2024-06-24 14:33:34 +00:00 |
|
|
|
005b44324a
|
AW-119-personal-video-edits
add video preview and change loading on /v1/onboarding page
|
2024-06-24 18:29:36 +04:00 |
|
Daniil Chemerkin
|
c07a1a9724
|
Merge branch 'AW-119-personal-video' into 'develop'
AW-119-personal-video
See merge request witapp/aura-webapp!193
|
2024-06-24 13:12:53 +00:00 |
|
|
|
1430b67f31
|
AW-119-personal-video
show generated personal video on /v1/trial-payment page
|
2024-06-24 17:06:52 +04:00 |
|
Daniil Chemerkin
|
93896b9b19
|
Merge branch 'feature/blur-component' into 'develop'
Feature/blur component
See merge request witapp/aura-webapp!192
|
2024-06-22 08:17:16 +00:00 |
|
yury
|
386798682a
|
feat: fix button width
|
2024-06-22 11:15:46 +03:00 |
|
Yury
|
1d121946d5
|
Merge branch 'feature/blur-component' into 'develop'
Feature/blur component
See merge request witapp/aura-webapp!191
|
2024-06-22 07:58:48 +00:00 |
|
Yury
|
2408481948
|
Feature/blur component
|
2024-06-22 07:58:47 +00:00 |
|
yury
|
53ea9ae8e0
|
feat: add blur only one page
|
2024-06-22 10:58:33 +03:00 |
|
yury
|
175f75f068
|
feat: fix blur
|
2024-06-22 05:06:32 +03:00 |
|
yury
|
fb864abe80
|
feat: fix blur
|
2024-06-22 05:01:43 +03:00 |
|
yury
|
101b451a38
|
feat: fix blur
|
2024-06-22 04:52:46 +03:00 |
|
Daniil Chemerkin
|
84383b6e07
|
Merge branch 'feature/blur-component' into 'develop'
Add blur component
See merge request witapp/aura-webapp!190
|
2024-06-21 23:15:48 +00:00 |
|
yury
|
aebd1cf0e8
|
feat: fix blur size
|
2024-06-22 02:12:29 +03:00 |
|
yury
|
5568539ee4
|
feat: Add Blur component and add blur on page v1/questionnaire/relationships/currentlyAffecting
|
2024-06-22 00:03:54 +03:00 |
|
Daniil Chemerkin
|
55c2207a41
|
Merge branch 'AW-115-lottie-optimization-edits' into 'develop'
AW-115-lottie-optimization-edits
See merge request witapp/aura-webapp!189
|
2024-06-21 10:26:51 +00:00 |
|
|
|
7ea45de6a2
|
AW-115-lottie-optimization-edits
preload, fix height animation container
|
2024-06-21 05:43:36 +04:00 |
|
Daniil Chemerkin
|
b6efaed3d1
|
Merge branch 'AW-115-lottie-optimization' into 'develop'
AW-115-lottie-optimization
See merge request witapp/aura-webapp!188
|
2024-06-20 23:52:35 +00:00 |
|
|
|
959f42dfbe
|
AW-115-lottie-optimization
using @lottiefiles/dotlottie-react , preload animations, save animations to indexedDB
|
2024-06-21 03:34:21 +04:00 |
|
Daniil Chemerkin
|
9db774383f
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!187
|
2024-06-18 22:10:03 +00:00 |
|
Daniil Chemerkin
|
9d99d6f90e
|
Develop
|
2024-06-18 22:10:03 +00:00 |
|
dev.daminik00
|
873a797651
|
Merge branch 'refs/heads/main' into develop
# Conflicts:
# src/components/pages/TrialPayment/components/PaymentModal/index.tsx
|
2024-06-18 23:43:51 +02:00 |
|
Daniil Chemerkin
|
d8b1121b92
|
Merge branch 'AW-114-payment-preloading' into 'develop'
AW-114-payment-preloading
See merge request witapp/aura-webapp!186
|
2024-06-17 23:01:46 +00:00 |
|
Денис Катаев
|
8c9afc4aeb
|
AW-114-payment-preloading
|
2024-06-17 23:01:46 +00:00 |
|
Daniil Chemerkin
|
9f383f5081
|
Merge branch 'AW-105-palmistry-points-edits' into 'develop'
AW-105-palmistry-points-edits
See merge request witapp/aura-webapp!185
|
2024-06-17 22:17:26 +00:00 |
|
Денис Катаев
|
e200667823
|
AW-105-palmistry-points-edits
|
2024-06-17 22:17:26 +00:00 |
|
Daniil Chemerkin
|
524de968e6
|
Merge branch 'AW-105-palmistry-points' into 'develop'
AW-105-palmistry-points
See merge request witapp/aura-webapp!183
|
2024-06-17 21:34:26 +00:00 |
|
Денис Катаев
|
d38ee696d1
|
AW-105-palmistry-points
|
2024-06-17 21:34:26 +00:00 |
|
Daniil Chemerkin
|
6a965cd1ef
|
Merge branch 'AW-111-auth-bug' into 'develop'
AW-111-auth-bug
See merge request witapp/aura-webapp!182
|
2024-06-17 21:34:17 +00:00 |
|
Денис Катаев
|
7a77e3f059
|
AW-111-auth-bug
|
2024-06-17 21:34:17 +00:00 |
|
Daniil Chemerkin
|
16acee2d09
|
Merge branch 'revert-ee65a4ac' into 'develop'
Revert "Merge branch 'AW-103-lottie' into 'develop'"
See merge request witapp/aura-webapp!184
|
2024-06-17 21:34:02 +00:00 |
|
Daniil Chemerkin
|
5d92220adc
|
Revert "Merge branch 'AW-103-lottie' into 'develop'"
|
2024-06-17 21:34:01 +00:00 |
|
Daniil Chemerkin
|
ee65a4aceb
|
Merge branch 'AW-103-lottie' into 'develop'
AW-103-lottie
See merge request witapp/aura-webapp!180
|
2024-06-16 23:11:48 +00:00 |
|
Денис Катаев
|
27e989d784
|
AW-103-lottie
|
2024-06-16 23:11:48 +00:00 |
|
Daniil Chemerkin
|
498ccdddea
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!181
|
2024-06-16 22:51:39 +00:00 |
|
