Commit Graph

268 Commits

Author SHA1 Message Date
Денис Катаев
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
Денис Катаев
e1fdd45ecd develop-genderDataSeparation 2024-05-14 20:44:53 +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
Daniil Chemerkin
b7c35f824d Merge branch 'AW-69-additional-purchases' into 'develop'
AW-69-additional-purchases

See merge request witapp/aura-webapp!121
2024-05-06 19:48:45 +00:00
Денис Катаев
f3abf257db AW-69-additional-purchases 2024-05-06 19:48:45 +00:00
Денис Катаев
f22bd2cbea AW-68-userIdYandexMetric 2024-05-06 19:48:29 +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
Денис Катаев
fc21cc90b0 AW-31-addEnvVariables 2024-04-22 17:35:23 +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