|
|
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 |
|
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 |
|
Daniil Chemerkin
|
ab9250f5c3
|
Develop
|
2024-06-16 22:51:39 +00:00 |
|
Daniil Chemerkin
|
8d4b4870b9
|
Merge branch 'AW-112-google-pay-bug' into 'develop'
AW-112-google-pay-bug
See merge request witapp/aura-webapp!179
|
2024-06-16 17:58:36 +00:00 |
|
Денис Катаев
|
f3a60806ed
|
AW-112-google-pay-bug
|
2024-06-16 17:58:36 +00:00 |
|
|
|
42c4350f29
|
Merge branch 'main' of https://gitlab.com/witapp/aura-webapp into develop
|
2024-06-15 01:59:46 +04:00 |
|
Daniil Chemerkin
|
bb8d8073e3
|
Merge branch 'hotfix/returnUrlError' into 'main'
change "" to ``
See merge request witapp/aura-webapp!177
|
2024-06-14 21:46:56 +00:00 |
|
dev.daminik00
|
b318eaf7bc
|
change "" to ``
|
2024-06-14 23:46:11 +02:00 |
|
Daniil Chemerkin
|
536bfb2920
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!176
|
2024-06-13 00:59:26 +00:00 |
|
Daniil Chemerkin
|
bafd8cda00
|
Develop
|
2024-06-13 00:59:26 +00:00 |
|
Daniil Chemerkin
|
f9e141d66a
|
Merge branch 'AW-104-express-checkout-edits' into 'develop'
AW-104-express-checkout-edits
See merge request witapp/aura-webapp!175
|
2024-06-13 00:43:32 +00:00 |
|
Денис Катаев
|
90ad1b8a16
|
AW-104-express-checkout-edits
|
2024-06-13 00:43:32 +00:00 |
|
Daniil Chemerkin
|
2fb3606989
|
Merge branch 'AW-86-underline-links' into 'develop'
AW-86-underline-links
See merge request witapp/aura-webapp!174
|
2024-06-13 00:01:54 +00:00 |
|
Денис Катаев
|
9affc8a43b
|
AW-86-underline-links
|
2024-06-13 00:01:54 +00:00 |
|
Daniil Chemerkin
|
243fb9e2b1
|
Merge branch 'AW-104-express-checkout' into 'develop'
AW-104-express-checkout
See merge request witapp/aura-webapp!173
|
2024-06-12 23:15:41 +00:00 |
|
Денис Катаев
|
d8da6d9de6
|
AW-104-express-checkout
|
2024-06-12 23:15:41 +00:00 |
|
Daniil Chemerkin
|
fb00697993
|
Merge branch 'AW-104-stripe-button' into 'develop'
AW-104-stripe-button
See merge request witapp/aura-webapp!172
|
2024-06-11 19:23:06 +00:00 |
|
Денис Катаев
|
5fdaa06f85
|
AW-104-stripe-button
|
2024-06-11 19:23:06 +00:00 |
|
Daniil Chemerkin
|
cacd28b395
|
Merge branch 'AW-86-policyMark' into 'develop'
AW-86-policyMark
See merge request witapp/aura-webapp!165
|
2024-06-11 17:40:00 +00:00 |
|
Денис Катаев
|
cdbf5924a6
|
AW-86-policyMark
|
2024-06-11 17:40:00 +00:00 |
|
