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 |
|
Daniil Chemerkin
|
d7f49476fb
|
Merge branch 'metric-data-gender' into 'develop'
metric-data-gender
See merge request witapp/aura-webapp!148
|
2024-05-31 10:06:18 +00:00 |
|
Денис Катаев
|
e6018dedb4
|
metric-data-gender
|
2024-05-31 10:06:18 +00:00 |
|
Daniil Chemerkin
|
48b2e7f162
|
Merge branch 'hotfix-yandex-metric-loading' into 'main'
hotfix-yandex-metric-loading
See merge request witapp/aura-webapp!146
|
2024-05-28 04:39:03 +00:00 |
|
Денис Катаев
|
fb26f56598
|
hotfix-yandex-metric-loading
|
2024-05-28 04:39:03 +00:00 |
|
Daniil Chemerkin
|
d675effed3
|
Merge branch 'images-zodiacSigns-leo' into 'develop'
images-zodiacSigns-leo
See merge request witapp/aura-webapp!147
|
2024-05-27 22:21:53 +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 |
|
Daniil Chemerkin
|
c99108c449
|
Merge branch 'AW-84-AW-85-defaultContent-loadContent' into 'develop'
AW-84-AW-85-defaultContent-loadContent
See merge request witapp/aura-webapp!144
|
2024-05-27 20:43:33 +00:00 |
|
Денис Катаев
|
3ee9e0fe90
|
AW-84-AW-85-defaultContent-loadContent
|
2024-05-27 20:43:33 +00:00 |
|
Daniil Chemerkin
|
2d4a44459c
|
Merge branch 'hotfix-yandex-metric-2' into 'main'
hotfix-yandex-metric-2
See merge request witapp/aura-webapp!143
|
2024-05-21 11:12:55 +00:00 |
|
Денис Катаев
|
5f8bf9aeb2
|
hotfix-yandex-metric-2
|
2024-05-21 11:12:55 +00:00 |
|
Daniil Chemerkin
|
b3707593c6
|
Merge branch 'AW-79-AW-80-AW-81-newPaymentMethod-Placement' into 'develop'
AW-79-AW-80-AW-81-newPaymentMethod-Placement
See merge request witapp/aura-webapp!139
|
2024-05-20 14:24:54 +00:00 |
|
Денис Катаев
|
ff9fce9483
|
AW-79-AW-80-AW-81-newPaymentMethod-Placement
|
2024-05-20 14:24:53 +00:00 |
|
Daniil Chemerkin
|
80bc309f26
|
Merge branch 'hotfix-returnUrl' into 'main'
hotfix-returnUrl
See merge request witapp/aura-webapp!140
|
2024-05-18 20:14:15 +00:00 |
|
|
|
32534bbb14
|
hotfix-returnUrl
|
2024-05-19 00:07:54 +04:00 |
|
Daniil Chemerkin
|
725b5a9d5b
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!138
|
2024-05-17 16:29:26 +00: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 |
|
Daniil Chemerkin
|
26cce762c3
|
Merge branch 'trello-edits' into 'develop'
trello-edits
See merge request witapp/aura-webapp!137
|
2024-05-16 08:23:04 +00:00 |
|
Денис Катаев
|
e0adecbbc0
|
trello-edits
|
2024-05-16 08:23:03 +00:00 |
|
Daniil Chemerkin
|
bcd2f3ca36
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!135
|
2024-05-14 22:59:10 +00:00 |
|
Daniil Chemerkin
|
63cd2e5798
|
Develop
|
2024-05-14 22:59:10 +00:00 |
|
Daniil Chemerkin
|
6772f10b93
|
Merge branch 'develop-genderDataSeparation' into 'develop'
develop-genderDataSeparation
See merge request witapp/aura-webapp!136
|
2024-05-14 20:44:53 +00:00 |
|
Денис Катаев
|
e1fdd45ecd
|
develop-genderDataSeparation
|
2024-05-14 20:44:53 +00:00 |
|
Daniil Chemerkin
|
3d1a56def7
|
Merge branch 'redesignAB' into 'develop'
redesignAB
See merge request witapp/aura-webapp!134
|
2024-05-14 20:18:56 +00:00 |
|
Daniil Chemerkin
|
e8bec3ceef
|
redesignAB
|
2024-05-14 20:18:56 +00:00 |
|
Daniil Chemerkin
|
20b5206405
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!127
|
2024-05-10 20:09:11 +00:00 |
|
Daniil Chemerkin
|
f36c9a7fc7
|
Develop
|
2024-05-10 20:09:11 +00:00 |
|
Daniil Chemerkin
|
39d844cf24
|
Merge branch 'AW-70-paymentResultPage' into 'develop'
AW-70-paymentResultPage
See merge request witapp/aura-webapp!125
|
2024-05-10 20:05:43 +00:00 |
|
Денис Катаев
|
ac876a67ed
|
AW-70-paymentResultPage
|
2024-05-10 20:05:43 +00:00 |
|
Daniil Chemerkin
|
b650570936
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!123
|
2024-05-06 21:42:06 +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 |
|
Daniil Chemerkin
|
d521532ae2
|
Merge branch 'AW-68-userIdYandexMetric' into 'develop'
AW-68-userIdYandexMetric
See merge request witapp/aura-webapp!120
|
2024-05-06 19:48:29 +00:00 |
|
Денис Катаев
|
f22bd2cbea
|
AW-68-userIdYandexMetric
|
2024-05-06 19:48:29 +00:00 |
|
dev.daminik00
|
f4c78ece2e
|
Merge branch 'develop'
# Conflicts:
# src/components/palmistry/step-subscription-plan/step-subscription-plan.tsx
|
2024-05-05 01:04:57 +02: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 |
|
Daniil Chemerkin
|
2bc043a6ca
|
Merge branch 'AW-51-newAuthentication' into 'develop'
AW-51-newAuthentication
See merge request witapp/aura-webapp!116
|
2024-05-04 20:11:24 +00:00 |
|
Денис Катаев
|
2d7be6a578
|
AW-51-newAuthentication
|
2024-05-04 20:11:24 +00:00 |
|
Daniil Chemerkin
|
4fc74db7b5
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!110
|
2024-04-25 20:20:11 +00:00 |
|
