|
|
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 |
|
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 |
|
Денис Катаев
|
90ad1b8a16
|
AW-104-express-checkout-edits
|
2024-06-13 00:43:32 +00:00 |
|
Денис Катаев
|
9affc8a43b
|
AW-86-underline-links
|
2024-06-13 00:01:54 +00:00 |
|
Денис Катаев
|
d8da6d9de6
|
AW-104-express-checkout
|
2024-06-12 23:15:41 +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 |
|
dev.daminik00
|
321ed604e6
|
remove hint and swap email and name inputs
|
2024-06-11 19:34:20 +02: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 |
|
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 |
|
Денис Катаев
|
b51fc34b7f
|
AW-46-changePaymentForm
|
2024-04-25 14:35:13 +00:00 |
|
Денис Катаев
|
38e1779cf6
|
AW-45-deletePayPal
|
2024-04-24 14:53:38 +00:00 |
|
Денис Катаев
|
f7af37c861
|
AW-41-addFreeTrial
|
2024-04-22 22:20:54 +00:00 |
|
Денис Катаев
|
74d76a17e2
|
AW-28-displayPaymentErrors
|
2024-04-18 21:54:57 +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 |
|
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 |
|
Денис Катаев
|
e9afdd802d
|
Epe short path
|
2024-04-12 22:52:44 +00:00 |
|
|
|
1ecd01b518
|
add jwtToken to epe short path
|
2024-04-10 00:32:29 +04:00 |
|
Денис Катаев
|
4667e066e0
|
Preview/advisor short path
|
2024-04-09 19:19:05 +00:00 |
|
Денис Катаев
|
ef239432d5
|
add short path for advisor chat
|
2024-04-09 16:46:50 +00:00 |
|
Денис Катаев
|
73380e0883
|
Preview/advisors
|
2024-04-06 20:40:38 +00:00 |
|
|
|
e2a230af88
|
add key of product
|
2024-04-05 18:42:11 +04:00 |
|
Daniil Chemerkin
|
2ee80ee89f
|
Develop
|
2024-04-03 16:49:24 +00:00 |
|
Денис Катаев
|
f088690aa5
|
Preview/additional purchases
|
2024-04-03 11:17:58 +00:00 |
|
Daniil Chemerkin
|
6f01a0abea
|
Revert "Merge branch 'preview/additional-purchases' into 'develop'"
|
2024-04-03 00:03:25 +00:00 |
|
Денис Катаев
|
abf1deee48
|
feat: add payment, add test page with background video
|
2024-04-02 23:53:44 +00:00 |
|
Денис Катаев
|
078ccc920e
|
Revert "fix: remove double image key and update filter of subscription plans"
|
2024-04-02 23:46:48 +00:00 |
|
Daniil Chemerkin
|
000f28190b
|
Develop
|
2024-04-02 22:03:16 +00:00 |
|
Денис Катаев
|
4a14459cf0
|
Revert "fix: remove double image key and update filter of subscription plans"
|
2024-03-27 19:20:25 +00:00 |
|
Денис Катаев
|
238160d610
|
Preview/advisors
|
2024-03-27 18:49:58 +00:00 |
|
|
|
2b5ebed85e
|
fix: merge conflict
|
2024-03-25 01:32:46 +04:00 |
|
Евгений Пономарев
|
974453cb74
|
Payment on palmistry/discount page
|
2024-03-24 21:14:13 +00:00 |
|
Денис Катаев
|
6fbc1c3a21
|
Revert "fix: remove double image key and update filter of subscription plans"
|
2024-03-24 21:01:16 +00:00 |
|
Victor Ershov
|
5bd1896465
|
Merge branch 'hotfix/subPlans' into 'develop'
fix: remove double image key, filter subscription plans
See merge request witapp/aura-webapp!58
|
2024-03-22 19:59:11 +00:00 |
|
Victor Ershov
|
4c03ec7b61
|
Merge branch 'hotfix/subPlans' into 'main'
fix: remove double image key, filter subscription plans
See merge request witapp/aura-webapp!57
|
2024-03-22 19:58:52 +00:00 |
|
|
|
4deed550cd
|
fix: remove double image key, filter subscription plans
|
2024-03-22 23:45:25 +04:00 |
|
|
|
3c944745ba
|
fix: text on discount page
|
2024-03-22 02:26:14 +04:00 |
|
Денис Катаев
|
866f798117
|
Preview/additional purchases
|
2024-03-10 18:30:49 +00:00 |
|
Денис Катаев
|
3aee33898c
|
Preview/discount pages
|
2024-02-29 15:44:41 +00:00 |
|
Денис Катаев
|
733561a56c
|
Preview/discount pages
|
2024-02-28 19:18:22 +00:00 |
|
Денис Катаев
|
737cda9770
|
Preview/discount pages
|
2024-02-24 01:29:01 +00:00 |
|
Денис Катаев
|
23e674ca78
|
Preview/discount pages
|
2024-02-21 21:15:03 +00:00 |
|
Денис Катаев
|
ca220dfdf7
|
Preview/discount pages
|
2024-02-21 06:24:50 +00:00 |
|
Денис Катаев
|
e99343a17d
|
Preview/discount pages
|
2024-02-19 07:00:07 +00:00 |
|
Денис Катаев
|
08b4113c09
|
Preview/discount pages
|
2024-02-18 16:54:33 +00:00 |
|
Денис Катаев
|
ee71102bad
|
Preview/discount pages
|
2024-02-14 06:42:15 +00:00 |
|
Денис Катаев
|
a6ea20283d
|
Preview/discount pages
|
2024-02-13 22:23:12 +00:00 |
|
Денис Катаев
|
fae4569c4f
|
Preview/discount pages
|
2024-02-11 05:44:06 +00:00 |
|
Денис Катаев
|
1ccc5aa835
|
Preview/discount pages
|
2024-02-10 02:30:02 +00:00 |
|
Денис Катаев
|
88f971e88c
|
feat: add yandex metric, smartlook manage
|
2024-02-07 22:43:54 +00:00 |
|
Денис Катаев
|
6aa8db35d4
|
feat: add information with partner on trial payment page
|
2024-02-07 18:04:49 +00:00 |
|
Денис Катаев
|
2ab0e08918
|
fix: days of trial period
|
2024-02-04 17:53:55 +00:00 |
|
Денис Катаев
|
ce1e853f68
|
feat: some edits
|
2024-02-04 01:09:49 +00:00 |
|
Денис Катаев
|
2d6144f0fb
|
feat: some edits
|
2024-01-31 18:49:27 +00:00 |
|
Денис Катаев
|
415d9c4d7b
|
feat: add and change pages after questionnaire path
|
2024-01-30 17:59:31 +00:00 |
|
Денис Катаев
|
037e1078ec
|
feat: questionnaire
|
2024-01-23 00:15:05 +00:00 |
|
Денис Катаев
|
3c381c9ab9
|
Questionnaire
|
2024-01-16 23:32:02 +00:00 |
|
Денис Катаев
|
37833a888f
|
Questionnaire
|
2023-12-31 00:33:55 +00:00 |
|
|
|
2a59a7e597
|
feat: add EnergyVampirism, MoonPhaseTracker, NameHoroscope, PredictionMoon, Thermal, WallpapersZodiacSign,
|
2023-11-26 02:48:31 +04:00 |
|
|
|
bb815df7f7
|
fix: fix build
|
2023-11-24 05:27:58 +04:00 |
|
|
|
16d79d3f3a
|
feat: add besties horoscope result page
|
2023-11-24 05:25:42 +04:00 |
|
|
|
0f6f8f7e72
|
feat: add magic ball page and home button, add besties horoscope slider
|
2023-11-23 06:05:52 +04:00 |
|
