Commit Graph

810 Commits

Author SHA1 Message Date
Денис Катаев
e200667823 AW-105-palmistry-points-edits 2024-06-17 22:17:26 +00:00
Daniil Chemerkin
524de968e6 Merge branch 'AW-105-palmistry-points' into 'develop'
AW-105-palmistry-points

See merge request witapp/aura-webapp!183
2024-06-17 21:34:26 +00:00
Денис Катаев
d38ee696d1 AW-105-palmistry-points 2024-06-17 21:34:26 +00:00
Daniil Chemerkin
6a965cd1ef Merge branch 'AW-111-auth-bug' into 'develop'
AW-111-auth-bug

See merge request witapp/aura-webapp!182
2024-06-17 21:34:17 +00:00
Денис Катаев
7a77e3f059 AW-111-auth-bug 2024-06-17 21:34:17 +00:00
Daniil Chemerkin
16acee2d09 Merge branch 'revert-ee65a4ac' into 'develop'
Revert "Merge branch 'AW-103-lottie' into 'develop'"

See merge request witapp/aura-webapp!184
2024-06-17 21:34:02 +00:00
Daniil Chemerkin
5d92220adc Revert "Merge branch 'AW-103-lottie' into 'develop'" 2024-06-17 21:34:01 +00:00
Daniil Chemerkin
ee65a4aceb Merge branch 'AW-103-lottie' into 'develop'
AW-103-lottie

See merge request witapp/aura-webapp!180
2024-06-16 23:11:48 +00:00
Денис Катаев
27e989d784 AW-103-lottie 2024-06-16 23:11:48 +00:00
Daniil Chemerkin
498ccdddea Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!181
2024-06-16 22:51:39 +00:00
Daniil Chemerkin
ab9250f5c3 Develop 2024-06-16 22:51:39 +00:00
Daniil Chemerkin
8d4b4870b9 Merge branch 'AW-112-google-pay-bug' into 'develop'
AW-112-google-pay-bug

See merge request witapp/aura-webapp!179
2024-06-16 17:58:36 +00:00
Денис Катаев
f3a60806ed AW-112-google-pay-bug 2024-06-16 17:58:36 +00:00
42c4350f29 Merge branch 'main' of https://gitlab.com/witapp/aura-webapp into develop 2024-06-15 01:59:46 +04:00
Daniil Chemerkin
bb8d8073e3 Merge branch 'hotfix/returnUrlError' into 'main'
change "" to ``

See merge request witapp/aura-webapp!177
2024-06-14 21:46:56 +00:00
dev.daminik00
b318eaf7bc change "" to `` 2024-06-14 23:46:11 +02:00
Daniil Chemerkin
536bfb2920 Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!176
2024-06-13 00:59:26 +00:00
Daniil Chemerkin
bafd8cda00 Develop 2024-06-13 00:59:26 +00:00
Daniil Chemerkin
f9e141d66a Merge branch 'AW-104-express-checkout-edits' into 'develop'
AW-104-express-checkout-edits

See merge request witapp/aura-webapp!175
2024-06-13 00:43:32 +00:00
Денис Катаев
90ad1b8a16 AW-104-express-checkout-edits 2024-06-13 00:43:32 +00:00
Daniil Chemerkin
2fb3606989 Merge branch 'AW-86-underline-links' into 'develop'
AW-86-underline-links

See merge request witapp/aura-webapp!174
2024-06-13 00:01:54 +00:00
Денис Катаев
9affc8a43b AW-86-underline-links 2024-06-13 00:01:54 +00:00
Daniil Chemerkin
243fb9e2b1 Merge branch 'AW-104-express-checkout' into 'develop'
AW-104-express-checkout

See merge request witapp/aura-webapp!173
2024-06-12 23:15:41 +00:00
Денис Катаев
d8da6d9de6 AW-104-express-checkout 2024-06-12 23:15:41 +00:00
Daniil Chemerkin
fb00697993 Merge branch 'AW-104-stripe-button' into 'develop'
AW-104-stripe-button

See merge request witapp/aura-webapp!172
2024-06-11 19:23:06 +00:00
Денис Катаев
5fdaa06f85 AW-104-stripe-button 2024-06-11 19:23:06 +00:00
Daniil Chemerkin
cacd28b395 Merge branch 'AW-86-policyMark' into 'develop'
AW-86-policyMark

See merge request witapp/aura-webapp!165
2024-06-11 17:40:00 +00:00
Денис Катаев
cdbf5924a6 AW-86-policyMark 2024-06-11 17:40:00 +00:00
Daniil Chemerkin
486ba905ca Merge branch 'AW-110' into 'develop'
remove hint and swap email and name inputs

See merge request witapp/aura-webapp!171
2024-06-11 17:35:38 +00:00
Daniil Chemerkin
761c5b48d9 Merge branch 'AW-109' into 'develop'
remove I Am

See merge request witapp/aura-webapp!170
2024-06-11 17:35:13 +00:00
dev.daminik00
321ed604e6 remove hint and swap email and name inputs 2024-06-11 19:34:20 +02:00
dev.daminik00
f5ef3eeb1e remove I Am 2024-06-11 19:27:56 +02:00
Daniil Chemerkin
97ea46efd8 Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!169
2024-06-06 23:15:43 +00:00
Daniil Chemerkin
306204f126 Develop 2024-06-06 23:15:42 +00: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
1253b152f2 Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!164
2024-06-03 18:45:02 +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
180ad2c814 Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!161
2024-06-02 00:53:11 +00:00
Daniil Chemerkin
9d53f82c48 Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!160
2024-06-02 00:52:43 +00:00
Daniil Chemerkin
8981107e3c Develop 2024-06-02 00:52:43 +00:00
Daniil Chemerkin
5c442dd2ec Merge branch 'develop' into 'main'
Develop

See merge request witapp/aura-webapp!159
2024-06-02 00:52:16 +00:00
Daniil Chemerkin
373acac8b6 Develop 2024-06-02 00:52:16 +00:00