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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b0cb068eb6
|
AW-121-personal-video
position sticky for personal video
|
2024-06-26 17:43:36 +04:00 |
|
yury
|
5ca0a636cc
|
feat: Change payment window on palmistry/payment
|
2024-06-25 04:24:52 +03:00 |
|
|
|
ead30aa974
|
onboarding-edits
change loader
|
2024-06-25 03:52:21 +04:00 |
|
|
|
966716fd61
|
play-pause-yandex-triggers
add triggers to play/pause control
|
2024-06-25 02:39:31 +04: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 |
|
|
|
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 |
|
|
|
c7a4e545d0
|
fix blur button
|
2024-06-24 22:19:22 +04: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 |
|
|
|
1430b67f31
|
AW-119-personal-video
show generated personal video on /v1/trial-payment page
|
2024-06-24 17:06:52 +04:00 |
|
yury
|
386798682a
|
feat: fix button width
|
2024-06-22 11:15:46 +03: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 |
|
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 |
|
|
|
7ea45de6a2
|
AW-115-lottie-optimization-edits
preload, fix height animation container
|
2024-06-21 05:43:36 +04:00 |
|
|
|
959f42dfbe
|
AW-115-lottie-optimization
using @lottiefiles/dotlottie-react , preload animations, save animations to indexedDB
|
2024-06-21 03:34:21 +04:00 |
|
Денис Катаев
|
8c9afc4aeb
|
AW-114-payment-preloading
|
2024-06-17 23:01:46 +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
|
5d92220adc
|
Revert "Merge branch 'AW-103-lottie' into 'develop'"
|
2024-06-17 21:34:01 +00:00 |
|
Денис Катаев
|
27e989d784
|
AW-103-lottie
|
2024-06-16 23:11:48 +00:00 |
|
Денис Катаев
|
f3a60806ed
|
AW-112-google-pay-bug
|
2024-06-16 17:58:36 +00:00 |
|
dev.daminik00
|
b318eaf7bc
|
change "" to ``
|
2024-06-14 23:46:11 +02:00 |
|
Daniil Chemerkin
|
bafd8cda00
|
Develop
|
2024-06-13 00:59:26 +00:00 |
|
Daniil Chemerkin
|
306204f126
|
Develop
|
2024-06-06 23:15:42 +00:00 |
|
Daniil Chemerkin
|
7946e9ffb2
|
Merge branch 'AW-97-yandex-metric-optimization' into 'develop'
AW-97-yandex-metric-optimization
See merge request witapp/aura-webapp!163
|
2024-06-03 16:59:51 +00:00 |
|
Денис Катаев
|
663b887a04
|
AW-97-yandex-metric-optimization
|
2024-06-03 16:59:51 +00:00 |
|
Денис Катаев
|
7b25d989a4
|
AW-98-parameters-new-payment
|
2024-06-03 16:59:41 +00:00 |
|
Денис Катаев
|
ea4ed6e4d6
|
AW-92-trial-payment-page-v1
|
2024-06-02 00:06:12 +00:00 |
|
Денис Катаев
|
3c271ab42c
|
AW-91-bug-video-background
|
2024-06-01 23:44:29 +00:00 |
|
Денис Катаев
|
8a601b03c1
|
AW-90-bug-payment-discount-page
|
2024-06-01 23:28:46 +00:00 |
|
Денис Катаев
|
9c3c5b14d3
|
edits
|
2024-06-01 22:39:58 +00:00 |
|
dev.daminik00
|
c66b6410b1
|
update images
|
2024-06-01 02:11:43 +02:00 |
|
dev.daminik00
|
94dbeea433
|
Merge branch 'refs/heads/main' into develop
# Conflicts:
# index.html
# src/components/pages/ABDesign/v1/pages/TrialPayment/components/PaymentModal/index.tsx
# src/components/pages/PaymentWithEmailPage/index.tsx
# src/components/pages/TrialPayment/components/PaymentModal/index.tsx
|
2024-06-01 00:40:02 +02:00 |
|
Daniil Chemerkin
|
eceea48644
|
Merge branch 'new-images-compatibility' into 'develop'
new-images-compatibility
See merge request witapp/aura-webapp!150
|
2024-05-31 10:06:38 +00:00 |
|
Денис Катаев
|
872fe16511
|
new-images-compatibility
|
2024-05-31 10:06:38 +00:00 |
|
Daniil Chemerkin
|
fcb60fc459
|
Merge branch 'new-payment-method' into 'develop'
new-payment-method
See merge request witapp/aura-webapp!149
|
2024-05-31 10:06:28 +00:00 |
|
Денис Катаев
|
8992ed788c
|
new-payment-method
|
2024-05-31 10:06:28 +00:00 |
|
Денис Катаев
|
e6018dedb4
|
metric-data-gender
|
2024-05-31 10:06:18 +00:00 |
|
Денис Катаев
|
fb26f56598
|
hotfix-yandex-metric-loading
|
2024-05-28 04:39:03 +00:00 |
|
Денис Катаев
|
a64c98914a
|
images-zodiacSigns-leo
|
2024-05-27 22:21:53 +00:00 |
|
Daniil Chemerkin
|
f06bb85bae
|
Merge branch 'AW-82-singlePaymentProductsBugDev' into 'develop'
AW-82-singlePaymentProductsBugDev
See merge request witapp/aura-webapp!145
|
2024-05-27 20:43:52 +00:00 |
|
Денис Катаев
|
44afa048a8
|
AW-82-singlePaymentProductsBugDev
|
2024-05-27 20:43:52 +00:00 |
|
Денис Катаев
|
3ee9e0fe90
|
AW-84-AW-85-defaultContent-loadContent
|
2024-05-27 20:43:33 +00:00 |
|
Денис Катаев
|
5f8bf9aeb2
|
hotfix-yandex-metric-2
|
2024-05-21 11:12:55 +00:00 |
|
Денис Катаев
|
ff9fce9483
|
AW-79-AW-80-AW-81-newPaymentMethod-Placement
|
2024-05-20 14:24:53 +00:00 |
|
|
|
32534bbb14
|
hotfix-returnUrl
|
2024-05-19 00:07:54 +04:00 |
|
Daniil Chemerkin
|
8dea221cc3
|
Develop
|
2024-05-17 16:29:26 +00:00 |
|
|
|
a8e26611d3
|
Merge branch 'main' of https://gitlab.com/witapp/aura-webapp into develop
|
2024-05-17 20:25:28 +04:00 |
|
Денис Катаев
|
e0adecbbc0
|
trello-edits
|
2024-05-16 08:23:03 +00:00 |
|
Daniil Chemerkin
|
63cd2e5798
|
Develop
|
2024-05-14 22:59:10 +00:00 |
|
Daniil Chemerkin
|
e8bec3ceef
|
redesignAB
|
2024-05-14 20:18:56 +00:00 |
|
Daniil Chemerkin
|
f36c9a7fc7
|
Develop
|
2024-05-10 20:09:11 +00:00 |
|
Денис Катаев
|
ac876a67ed
|
AW-70-paymentResultPage
|
2024-05-10 20:05:43 +00:00 |
|
Daniil Chemerkin
|
c9a6f71b82
|
Develop
|
2024-05-06 21:42:06 +00:00 |
|
Денис Катаев
|
f3abf257db
|
AW-69-additional-purchases
|
2024-05-06 19:48:45 +00:00 |
|
dev.daminik00
|
1f51ec4ec2
|
update stripe trial
|
2024-05-05 00:55:20 +02:00 |
|
dev.daminik00
|
72426a65de
|
update stripe trial
|
2024-05-05 00:49:08 +02:00 |
|
Daniil Chemerkin
|
845725f9f3
|
Merge branch 'AW-58-newJWTTokenMethod' into 'develop'
AW-58-newJWTTokenMethod
See merge request witapp/aura-webapp!117
|
2024-05-04 20:11:35 +00:00 |
|
Денис Катаев
|
3a87ee5c93
|
AW-58-newJWTTokenMethod
|
2024-05-04 20:11:35 +00:00 |
|
Денис Катаев
|
2d7be6a578
|
AW-51-newAuthentication
|
2024-05-04 20:11:24 +00:00 |
|
Daniil Chemerkin
|
57eb7ab913
|
Merge branch 'AW-47-duplicateSubscriptionPlans' into 'develop'
AW-47-duplicateSubscriptionPlans
See merge request witapp/aura-webapp!108
|
2024-04-25 14:35:22 +00:00 |
|
Денис Катаев
|
0920d84843
|
AW-47-duplicateSubscriptionPlans
|
2024-04-25 14:35:22 +00:00 |
|
Денис Катаев
|
b51fc34b7f
|
AW-46-changePaymentForm
|
2024-04-25 14:35:13 +00:00 |
|
Денис Катаев
|
38e1779cf6
|
AW-45-deletePayPal
|
2024-04-24 14:53:38 +00:00 |
|
Денис Катаев
|
b5ab8415ac
|
AW-42-UTMParameters
|
2024-04-22 22:46:11 +00:00 |
|
Денис Катаев
|
f7af37c861
|
AW-41-addFreeTrial
|
2024-04-22 22:20:54 +00:00 |
|
Денис Катаев
|
b5aabf16cc
|
AW-22-deleteChargebee
|
2024-04-19 16:30:40 +00:00 |
|
Денис Катаев
|
74d76a17e2
|
AW-28-displayPaymentErrors
|
2024-04-18 21:54:57 +00:00 |
|
Денис Катаев
|
d590d157f3
|
AW-6-changeCameraSize-cameraButton
|
2024-04-18 19:56:00 +00:00 |
|
Daniil Chemerkin
|
daec6325b6
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/components/App/index.tsx
# src/components/BirthdayPage/index.tsx
# src/components/pages/BirthPlacePage/index.tsx
# src/routes.ts
|
2024-04-17 23:29:42 +00:00 |
|
|
|
e1e506312c
|
fix short path
|
2024-04-18 00:10:16 +04:00 |
|
|
|
11c3091269
|
fix ShortPathOutlet
|
2024-04-16 23:51:28 +04:00 |
|
|
|
782dd0fb51
|
fix always reload payment page
|
2024-04-16 22:49:07 +04:00 |
|
Daniil Chemerkin
|
c9b737a660
|
Develop
|
2024-04-16 17:51:32 +00:00 |
|
|
|
578c7486d0
|
fix build
|
2024-04-16 21:15:57 +04:00 |
|
Daniil Chemerkin
|
f1254d9c2e
|
Develop
|
2024-04-16 16:58:07 +00:00 |
|
Денис Катаев
|
1ec7135014
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/components/App/index.tsx
# src/components/pages/AdditionalPurchases/pages/AddConsultation/index.tsx
# src/components/pages/AdditionalPurchases/pages/AddReport/index.tsx
# src/components/pages/AdditionalPurchases/pages/UnlimitedReadings/index.tsx
# src/components/pages/Gender/index.tsx
# src/components/pages/PaymentWithEmailPage/index.tsx
# src/routes.ts
# src/services/singlePayment/index.ts
|
2024-04-16 06:18:30 +00:00 |
|
|
|
200541f74e
|
fix path bug
|
2024-04-15 22:55:00 +04:00 |
|
|
|
ca758e2dfa
|
remove request to hint and remove upload from device
|
2024-04-15 21:33:16 +04:00 |
|