dev.daminik00
|
f5ef3eeb1e
|
remove I Am
|
2024-06-11 19:27:56 +02:00 |
|
Daniil Chemerkin
|
b08dbc61e9
|
Merge branch 'AW-102-default-product' into 'develop'
AW-102-default-product
See merge request witapp/aura-webapp!168
|
2024-06-06 22:58:04 +00:00 |
|
Денис Катаев
|
4f3b19579c
|
AW-102-default-product
|
2024-06-06 22:58:04 +00:00 |
|
Daniil Chemerkin
|
a5f143cc81
|
Merge branch 'AW-43-palmistry-loader-after-photo' into 'develop'
AW-43-palmistry-loader-after-photo
See merge request witapp/aura-webapp!167
|
2024-06-06 22:00:59 +00:00 |
|
Денис Катаев
|
865283edca
|
AW-43-palmistry-loader-after-photo
|
2024-06-06 22:00:59 +00:00 |
|
Daniil Chemerkin
|
98e1b9a534
|
Merge branch 'AW-102-trial-choice-palmistry' into 'develop'
AW-102-trial-choice-palmistry
See merge request witapp/aura-webapp!166
|
2024-06-06 22:00:45 +00:00 |
|
Денис Катаев
|
d58a435ff4
|
AW-102-trial-choice-palmistry
|
2024-06-06 22:00:45 +00: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 |
|
Daniil Chemerkin
|
cc40042ea4
|
Merge branch 'AW-98-parameters-new-payment' into 'develop'
AW-98-parameters-new-payment
See merge request witapp/aura-webapp!162
|
2024-06-03 16:59:41 +00:00 |
|
Денис Катаев
|
7b25d989a4
|
AW-98-parameters-new-payment
|
2024-06-03 16:59:41 +00:00 |
|
Daniil Chemerkin
|
6de439ac7b
|
Merge branch 'AW-92-trial-payment-page-v1' into 'develop'
AW-92-trial-payment-page-v1
See merge request witapp/aura-webapp!157
|
2024-06-02 00:06:12 +00:00 |
|
Денис Катаев
|
ea4ed6e4d6
|
AW-92-trial-payment-page-v1
|
2024-06-02 00:06:12 +00:00 |
|
Daniil Chemerkin
|
7fcbb3e051
|
Merge branch 'AW-91-bug-video-background' into 'develop'
AW-91-bug-video-background
See merge request witapp/aura-webapp!156
|
2024-06-01 23:44:29 +00:00 |
|
Денис Катаев
|
3c271ab42c
|
AW-91-bug-video-background
|
2024-06-01 23:44:29 +00:00 |
|
Daniil Chemerkin
|
4488e7ad07
|
Merge branch 'AW-90-bug-payment-discount-page' into 'develop'
AW-90-bug-payment-discount-page
See merge request witapp/aura-webapp!155
|
2024-06-01 23:28:46 +00:00 |
|
Денис Катаев
|
8a601b03c1
|
AW-90-bug-payment-discount-page
|
2024-06-01 23:28:46 +00:00 |
|
Daniil Chemerkin
|
8dac39a275
|
Merge branch 'edits' into 'develop'
edits
See merge request witapp/aura-webapp!153
|
2024-06-01 22:39:58 +00:00 |
|
Денис Катаев
|
9c3c5b14d3
|
edits
|
2024-06-01 22:39:58 +00:00 |
|
dev.daminik00
|
3441e9caa3
|
update images
|
2024-06-01 02:31:29 +02: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 |
|
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 |
|
