Commit Graph

678 Commits

Author SHA1 Message Date
Daniil Chemerkin
89764a0ce4 Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!216
2024-06-30 19:05:50 +00:00
Daniil Chemerkin
7f183368e8 Merge branch 'hotfix/videoTime' into 'develop'
change time

See merge request witapp/aura-webapp!215
2024-06-30 19:05:34 +00:00
dev.daminik00
aa427b66d7 change time 2024-06-30 21:04:55 +02:00
Daniil Chemerkin
bf0ea888d4 Merge branch 'develop' into 'main'
Main

See merge request witapp/aura-webapp!214
2024-06-30 14:03:54 +00:00
Daniil Chemerkin
a1ef58365a Merge branch 'feature/AW-122' into 'develop'
Добавил препрогрузку оплаты

See merge request witapp/aura-webapp!208
2024-06-30 13:51:38 +00:00
Daniil Chemerkin
6613999f65 Merge branch 'develop' into 'main'
Main

See merge request witapp/aura-webapp!212
2024-06-29 16:30:34 +00:00
Daniil Chemerkin
3ebb111e1b Merge branch 'revert-1d378356' into 'develop'
Revert "Merge branch 'video-overlay' into 'develop'"

See merge request witapp/aura-webapp!213
2024-06-29 16:26:03 +00:00
Daniil Chemerkin
ff57362f9e Revert "Merge branch 'video-overlay' into 'develop'" 2024-06-29 16:26:02 +00:00
Daniil Chemerkin
e6a89574ee Merge branch 'fix-lottie' into 'develop'
fix-lottie

See merge request witapp/aura-webapp!211
2024-06-29 15:35:17 +00:00
Daniil Chemerkin
4ac4386d72 Merge branch 'AW-125-feauture-parameter' into 'develop'
AW-125-feature-parameter

See merge request witapp/aura-webapp!210
2024-06-29 15:35:06 +00:00
Daniil Chemerkin
1d37835694 Merge branch 'video-overlay' into 'develop'
video-overlay

See merge request witapp/aura-webapp!209
2024-06-29 15:34:24 +00:00
c37dba720e video-overlay 2024-06-29 16:41:43 +04:00
bc8bed6b44 fix-lottie 2024-06-29 15:21:04 +04:00
37e5dc69c3 AW-125-feature-parameter 2024-06-29 13:55:23 +04:00
yury
9acb62b647 Revert "Revert "feat: Добавил препрогрузку оплаты""
This reverts commit 7652b17e80.
2024-06-29 06:04:07 +03:00
yury
7652b17e80 Revert "feat: Добавил препрогрузку оплаты"
This reverts commit 49cea63a95.
2024-06-29 06:03:54 +03:00
yury
49cea63a95 feat: Добавил препрогрузку оплаты 2024-06-29 06:02:33 +03:00
89b0939b83 AW-106-klaviyo-metric 2024-06-28 12:43:33 +04:00
Daniil Chemerkin
25b2a6ed4e Merge branch 'develop' into 'main'
AW-121-personal-video

See merge request witapp/aura-webapp!206
2024-06-27 00:47:37 +00:00
Daniil Chemerkin
b5f6329467 Merge branch 'AW-123-yandex-metric' into 'develop'
AW-123-yandex-metric

See merge request witapp/aura-webapp!205
2024-06-27 00:30:46 +00:00
fa500e3d81 AW-123-yandex-metric
add AuraSelectTrial & AuraPaymentMethodsOpened goals
add trigger on change route
visible personal video for webvisor
2024-06-27 04:26:53 +04:00
Daniil Chemerkin
d1648d8219 Merge branch 'trial-payment-page' into 'develop'
trial-payment-page

See merge request witapp/aura-webapp!204
2024-06-26 22:54:55 +00:00
814e718fee trial-payment-page
fix x scrolling
2024-06-27 02:52:36 +04:00
Daniil Chemerkin
fd84daf8db Merge branch 'compressed-images' into 'develop'
compressed-images

See merge request witapp/aura-webapp!203
2024-06-26 22:03:22 +00:00
a0a3e5c471 compressed-images
change images
2024-06-27 00:24:34 +04:00
Daniil Chemerkin
ca43e64c06 Merge branch 'feature/AW-120' into 'develop'
feat: Change payment window on palmistry/payment

See merge request witapp/aura-webapp!201
2024-06-26 13:57:02 +00:00
Daniil Chemerkin
da53759bd5 Merge branch 'AW-121-personal-video' into 'develop'
AW-121-personal-video

See merge request witapp/aura-webapp!202
2024-06-26 13:56:38 +00:00
b0cb068eb6 AW-121-personal-video
position sticky for personal video
2024-06-26 17:43:36 +04:00
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