Commit Graph

69 Commits

Author SHA1 Message Date
Денис Катаев
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
Денис Катаев
ff9fce9483 AW-79-AW-80-AW-81-newPaymentMethod-Placement 2024-05-20 14:24:53 +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