Daniil Chemerkin
|
805376d490
|
Merge branch 'fix/palmistry' into 'develop'
fix path bug
See merge request witapp/aura-webapp!86
|
2024-04-15 18:56:45 +00:00 |
|
|
|
200541f74e
|
fix path bug
|
2024-04-15 22:55:00 +04:00 |
|
Daniil Chemerkin
|
d1febf9612
|
Merge branch 'fix/palmistry' into 'develop'
remove request to hint and remove upload from device
See merge request witapp/aura-webapp!84
|
2024-04-15 17:38:05 +00:00 |
|
|
|
ca758e2dfa
|
remove request to hint and remove upload from device
|
2024-04-15 21:33:16 +04:00 |
|
Daniil Chemerkin
|
0f0301cc3d
|
Merge branch 'fix/chat-short-path' into 'develop'
fix: force parameter
See merge request witapp/aura-webapp!83
|
2024-04-15 17:09:02 +00:00 |
|
|
|
d0bbb296b7
|
fix: force parameter
|
2024-04-15 20:39:13 +04:00 |
|
Daniil Chemerkin
|
1704df4cc8
|
Merge branch 'preview/palmistry' into 'develop'
add lines drawing
See merge request witapp/aura-webapp!82
|
2024-04-15 15:49:08 +00:00 |
|
|
|
95628ba2cf
|
add lines drawing
|
2024-04-15 19:36:18 +04:00 |
|
Daniil Chemerkin
|
c9efadde06
|
Merge branch 'epe-short-path' into 'develop'
Epe short path
See merge request witapp/aura-webapp!81
|
2024-04-12 22:52:44 +00:00 |
|
Денис Катаев
|
e9afdd802d
|
Epe short path
|
2024-04-12 22:52:44 +00:00 |
|
Daniil Chemerkin
|
79966d3b4e
|
Merge branch 'epe-short-path' into 'develop'
Epe short path
See merge request witapp/aura-webapp!80
|
2024-04-11 15:54:10 +00:00 |
|
Денис Катаев
|
1095ab5d29
|
Epe short path
|
2024-04-11 15:54:10 +00:00 |
|
Daniil Chemerkin
|
132489fb8c
|
Merge branch 'epe-short-path' into 'develop'
add jwtToken to epe short path
See merge request witapp/aura-webapp!79
|
2024-04-09 20:36:46 +00:00 |
|
|
|
1ecd01b518
|
add jwtToken to epe short path
|
2024-04-10 00:32:29 +04:00 |
|
Daniil Chemerkin
|
d40cc37f76
|
Merge branch 'preview/advisor-short-path' into 'develop'
Preview/advisor short path
See merge request witapp/aura-webapp!78
|
2024-04-09 19:19:05 +00:00 |
|
Денис Катаев
|
4667e066e0
|
Preview/advisor short path
|
2024-04-09 19:19:05 +00:00 |
|
Daniil Chemerkin
|
ffa489aed9
|
Merge branch 'fix/single-payment' into 'develop'
add error handling to epe path
See merge request witapp/aura-webapp!76
|
2024-04-09 16:53:43 +00:00 |
|
Денис Катаев
|
9ce8bed22b
|
add error handling to epe path
|
2024-04-09 16:53:43 +00:00 |
|
Daniil Chemerkin
|
10c567e169
|
Merge branch 'preview/advisor-short-path' into 'develop'
add short path for advisor chat
See merge request witapp/aura-webapp!77
|
2024-04-09 16:46:50 +00:00 |
|
Денис Катаев
|
ef239432d5
|
add short path for advisor chat
|
2024-04-09 16:46:50 +00:00 |
|
Daniil Chemerkin
|
d381440556
|
Merge branch 'preview/advisors' into 'develop'
Preview/advisors
See merge request witapp/aura-webapp!75
|
2024-04-06 20:40:38 +00:00 |
|
Денис Катаев
|
73380e0883
|
Preview/advisors
|
2024-04-06 20:40:38 +00:00 |
|
Daniil Chemerkin
|
a3b215d6e3
|
Merge branch 'fix/apiHost' into 'develop'
change api host
See merge request witapp/aura-webapp!73
|
2024-04-05 19:59:15 +00:00 |
|
Daniil Chemerkin
|
261417649d
|
Merge branch 'fix/single-payment' into 'develop'
add key of product
See merge request witapp/aura-webapp!72
|
2024-04-05 19:59:02 +00:00 |
|
|
|
fbd99cf3c9
|
change api host
|
2024-04-05 23:56:05 +04:00 |
|
|
|
e2a230af88
|
add key of product
|
2024-04-05 18:42:11 +04:00 |
|
Денис Катаев
|
c2c1f5a31c
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/api/api.ts
# src/api/resources/SinglePayment.ts
# src/components/App/index.tsx
# src/components/pages/Gender/index.tsx
# src/components/pages/PaymentWithEmailPage/index.tsx
# src/routes.ts
|
2024-04-03 16:49:00 +00:00 |
|
Daniil Chemerkin
|
70c21140d6
|
Merge branch 'preview/additional-purchases' into 'develop'
Preview/additional purchases
See merge request witapp/aura-webapp!69
|
2024-04-03 11:17:58 +00:00 |
|
Денис Катаев
|
f088690aa5
|
Preview/additional purchases
|
2024-04-03 11:17:58 +00:00 |
|
Daniil Chemerkin
|
a033e4c542
|
Merge branch 'revert-44cd94b8' into 'develop'
Revert "Merge branch 'preview/additional-purchases' into 'develop'"
See merge request witapp/aura-webapp!68
|
2024-04-03 00:03:25 +00:00 |
|
Daniil Chemerkin
|
6f01a0abea
|
Revert "Merge branch 'preview/additional-purchases' into 'develop'"
|
2024-04-03 00:03:25 +00:00 |
|
Daniil Chemerkin
|
44cd94b866
|
Merge branch 'preview/additional-purchases' into 'develop'
feat: add payment, add test page with background video
See merge request witapp/aura-webapp!67
|
2024-04-02 23:53:44 +00:00 |
|
Денис Катаев
|
abf1deee48
|
feat: add payment, add test page with background video
|
2024-04-02 23:53:44 +00:00 |
|
Daniil Chemerkin
|
9a97167e49
|
Merge branch 'preview/email-pay-email' into 'develop'
Revert "fix: remove double image key and update filter of subscription plans"
See merge request witapp/aura-webapp!66
|
2024-04-02 23:46:48 +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
|
a365a9eb40
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!65
|
2024-04-02 22:03:16 +00:00 |
|
Daniil Chemerkin
|
000f28190b
|
Develop
|
2024-04-02 22:03:16 +00:00 |
|
Денис Катаев
|
87a80598b0
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/components/App/index.tsx
# src/components/palmistry/discount-screen/discount-screen.css
# src/components/palmistry/discount-screen/discount-screen.tsx
# src/components/palmistry/payment-screen/payment-screen.tsx
# src/components/palmistry/premium-bundle-screen/premium-bundle-screen.css
# src/components/palmistry/premium-bundle-screen/premium-bundle-screen.tsx
# src/components/palmistry/step-email/step-email.tsx
# src/components/palmistry/step-paywall/step-paywall.tsx
# src/components/palmistry/steps-manager/steps-manager.tsx
# src/routes.ts
|
2024-04-02 22:02:02 +00:00 |
|
Victor Ershov
|
ba8da9a188
|
Merge branch 'preview/email-pay-email' into 'develop'
Revert "fix: remove double image key and update filter of subscription plans"
See merge request witapp/aura-webapp!64
|
2024-03-27 19:20:25 +00:00 |
|
Денис Катаев
|
4a14459cf0
|
Revert "fix: remove double image key and update filter of subscription plans"
|
2024-03-27 19:20:25 +00:00 |
|
Victor Ershov
|
882dbc4303
|
Merge branch 'preview/advisors' into 'develop'
Preview/advisors
See merge request witapp/aura-webapp!63
|
2024-03-27 18:49:59 +00:00 |
|
Денис Катаев
|
238160d610
|
Preview/advisors
|
2024-03-27 18:49:58 +00:00 |
|
Victor Ershov
|
40c9809225
|
Merge branch 'palmistry-discount-page' into 'develop'
Palmistry discount page
See merge request witapp/aura-webapp!62
|
2024-03-25 23:09:07 +00:00 |
|
Евгений Пономарев
|
14dcd3b057
|
Palmistry discount page
|
2024-03-25 23:09:06 +00:00 |
|
Victor Ershov
|
ba080d3d4e
|
Merge branch 'bugfix/merge-conflict' into 'develop'
fix: merge conflict
See merge request witapp/aura-webapp!61
|
2024-03-24 21:34:52 +00:00 |
|
|
|
2b5ebed85e
|
fix: merge conflict
|
2024-03-25 01:32:46 +04:00 |
|
Victor Ershov
|
258398f852
|
Merge branch 'palmistry-discount-page' into 'develop'
Payment on palmistry/discount page
See merge request witapp/aura-webapp!59
|
2024-03-24 21:14:13 +00:00 |
|
Евгений Пономарев
|
974453cb74
|
Payment on palmistry/discount page
|
2024-03-24 21:14:13 +00:00 |
|
Victor Ershov
|
d22157cde1
|
Merge branch 'preview/email-pay-email' into 'develop'
Revert "fix: remove double image key and update filter of subscription plans"
See merge request witapp/aura-webapp!60
|
2024-03-24 21:01:16 +00:00 |
|
Денис Катаев
|
6fbc1c3a21
|
Revert "fix: remove double image key and update filter of subscription plans"
|
2024-03-24 21:01:16 +00:00 |
|
