|
|
e2a230af88
|
add key of product
|
2024-04-05 18:42:11 +04:00 |
|
Daniil Chemerkin
|
665269c55f
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!70
|
2024-04-03 16:49:24 +00:00 |
|
Daniil Chemerkin
|
2ee80ee89f
|
Develop
|
2024-04-03 16:49:24 +00:00 |
|
Денис Катаев
|
c2c1f5a31c
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/api/api.ts
# src/api/resources/SinglePayment.ts
# src/components/App/index.tsx
# src/components/pages/Gender/index.tsx
# src/components/pages/PaymentWithEmailPage/index.tsx
# src/routes.ts
|
2024-04-03 16:49:00 +00:00 |
|
Daniil Chemerkin
|
70c21140d6
|
Merge branch 'preview/additional-purchases' into 'develop'
Preview/additional purchases
See merge request witapp/aura-webapp!69
|
2024-04-03 11:17:58 +00:00 |
|
Денис Катаев
|
f088690aa5
|
Preview/additional purchases
|
2024-04-03 11:17:58 +00:00 |
|
Daniil Chemerkin
|
a033e4c542
|
Merge branch 'revert-44cd94b8' into 'develop'
Revert "Merge branch 'preview/additional-purchases' into 'develop'"
See merge request witapp/aura-webapp!68
|
2024-04-03 00:03:25 +00:00 |
|
Daniil Chemerkin
|
6f01a0abea
|
Revert "Merge branch 'preview/additional-purchases' into 'develop'"
|
2024-04-03 00:03:25 +00:00 |
|
Daniil Chemerkin
|
44cd94b866
|
Merge branch 'preview/additional-purchases' into 'develop'
feat: add payment, add test page with background video
See merge request witapp/aura-webapp!67
|
2024-04-02 23:53:44 +00:00 |
|
Денис Катаев
|
abf1deee48
|
feat: add payment, add test page with background video
|
2024-04-02 23:53:44 +00:00 |
|
Daniil Chemerkin
|
9a97167e49
|
Merge branch 'preview/email-pay-email' into 'develop'
Revert "fix: remove double image key and update filter of subscription plans"
See merge request witapp/aura-webapp!66
|
2024-04-02 23:46:48 +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
|
a365a9eb40
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!65
|
2024-04-02 22:03:16 +00:00 |
|
Daniil Chemerkin
|
000f28190b
|
Develop
|
2024-04-02 22:03:16 +00:00 |
|
Денис Катаев
|
87a80598b0
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/components/App/index.tsx
# src/components/palmistry/discount-screen/discount-screen.css
# src/components/palmistry/discount-screen/discount-screen.tsx
# src/components/palmistry/payment-screen/payment-screen.tsx
# src/components/palmistry/premium-bundle-screen/premium-bundle-screen.css
# src/components/palmistry/premium-bundle-screen/premium-bundle-screen.tsx
# src/components/palmistry/step-email/step-email.tsx
# src/components/palmistry/step-paywall/step-paywall.tsx
# src/components/palmistry/steps-manager/steps-manager.tsx
# src/routes.ts
|
2024-04-02 22:02:02 +00:00 |
|
Victor Ershov
|
ba8da9a188
|
Merge branch 'preview/email-pay-email' into 'develop'
Revert "fix: remove double image key and update filter of subscription plans"
See merge request witapp/aura-webapp!64
|
2024-03-27 19:20:25 +00:00 |
|
Денис Катаев
|
4a14459cf0
|
Revert "fix: remove double image key and update filter of subscription plans"
|
2024-03-27 19:20:25 +00:00 |
|
Victor Ershov
|
882dbc4303
|
Merge branch 'preview/advisors' into 'develop'
Preview/advisors
See merge request witapp/aura-webapp!63
|
2024-03-27 18:49:59 +00:00 |
|
Денис Катаев
|
238160d610
|
Preview/advisors
|
2024-03-27 18:49:58 +00:00 |
|
Victor Ershov
|
40c9809225
|
Merge branch 'palmistry-discount-page' into 'develop'
Palmistry discount page
See merge request witapp/aura-webapp!62
|
2024-03-25 23:09:07 +00:00 |
|
Евгений Пономарев
|
14dcd3b057
|
Palmistry discount page
|
2024-03-25 23:09:06 +00:00 |
|
Victor Ershov
|
ba080d3d4e
|
Merge branch 'bugfix/merge-conflict' into 'develop'
fix: merge conflict
See merge request witapp/aura-webapp!61
|
2024-03-24 21:34:52 +00:00 |
|
|
|
2b5ebed85e
|
fix: merge conflict
|
2024-03-25 01:32:46 +04:00 |
|
Victor Ershov
|
258398f852
|
Merge branch 'palmistry-discount-page' into 'develop'
Payment on palmistry/discount page
See merge request witapp/aura-webapp!59
|
2024-03-24 21:14:13 +00:00 |
|
Евгений Пономарев
|
974453cb74
|
Payment on palmistry/discount page
|
2024-03-24 21:14:13 +00:00 |
|
Victor Ershov
|
d22157cde1
|
Merge branch 'preview/email-pay-email' into 'develop'
Revert "fix: remove double image key and update filter of subscription plans"
See merge request witapp/aura-webapp!60
|
2024-03-24 21:01:16 +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 |
|
Victor Ershov
|
247d408867
|
Merge branch 'develop' into 'main'
Palmistry
See merge request witapp/aura-webapp!54
|
2024-03-22 00:28:03 +00:00 |
|
Евгений Пономарев
|
21de1c6322
|
Palmistry
|
2024-03-22 00:28:03 +00:00 |
|
Victor Ershov
|
fa952a75e8
|
Merge branch 'hotfix/discount-text' into 'develop'
fix: text on discount page
See merge request witapp/aura-webapp!55
|
2024-03-21 23:03:46 +00:00 |
|
Victor Ershov
|
4ec60bcb8d
|
Merge branch 'hotfix/discount-text' into 'main'
fix: text on discount page
See merge request witapp/aura-webapp!56
|
2024-03-21 23:03:32 +00:00 |
|
|
|
3c944745ba
|
fix: text on discount page
|
2024-03-22 02:26:14 +04:00 |
|
Evgenij Ponomarev
|
99ace176e4
|
Add new screens in palmistry
|
2024-03-20 00:59:03 +03:00 |
|
Evgenij Ponomarev
|
d6022cd880
|
Update birthdate in store
|
2024-03-12 03:02:50 +07:00 |
|
Evgenij Ponomarev
|
544f26f019
|
Redirect to home if subscribed
|
2024-03-12 02:28:51 +07:00 |
|
Evgenij Ponomarev
|
c72e1e9e39
|
Improve work with subscription plans
|
2024-03-12 01:10:58 +07:00 |
|
Evgenij Ponomarev
|
28bf5f4778
|
Fix photo modal
|
2024-03-11 03:14:04 +07:00 |
|
Evgenij Ponomarev
|
b547d0d51d
|
Fix payment page
|
2024-03-11 02:44:19 +07:00 |
|
Evgenij Ponomarev
|
40adddb432
|
Fix build errors
|
2024-03-11 02:19:05 +07:00 |
|
Evgenij Ponomarev
|
ee47242834
|
Fix hasNoHeader function
|
2024-03-11 02:08:20 +07:00 |
|
Evgenij Ponomarev
|
3af1919ef7
|
Complete palmistry transition
|
2024-03-11 02:08:19 +07:00 |
|
Victor Ershov
|
d11a52a9aa
|
Merge branch 'preview/additional-purchases' into 'main'
Preview/additional purchases
See merge request witapp/aura-webapp!51
|
2024-03-10 18:30:49 +00:00 |
|
Денис Катаев
|
866f798117
|
Preview/additional purchases
|
2024-03-10 18:30:49 +00:00 |
|
Victor Ershov
|
bd995211c5
|
Merge branch 'preview/discount-pages' into 'main'
Preview/discount pages
See merge request witapp/aura-webapp!50
|
2024-02-29 15:44:41 +00:00 |
|
Денис Катаев
|
3aee33898c
|
Preview/discount pages
|
2024-02-29 15:44:41 +00:00 |
|
Victor Ershov
|
238f6dc261
|
Merge branch 'preview/discount-pages' into 'main'
Preview/discount pages
See merge request witapp/aura-webapp!49
|
2024-02-28 19:18:23 +00:00 |
|
Денис Катаев
|
733561a56c
|
Preview/discount pages
|
2024-02-28 19:18:22 +00:00 |
|
