Денис Катаев
|
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 |
|
Daniil Chemerkin
|
2f22a8f98a
|
Merge branch 'AW-46-changePaymentForm' into 'develop'
AW-46-changePaymentForm
See merge request witapp/aura-webapp!107
|
2024-04-25 14:35:13 +00:00 |
|
Денис Катаев
|
b51fc34b7f
|
AW-46-changePaymentForm
|
2024-04-25 14:35:13 +00:00 |
|
Daniil Chemerkin
|
04254c4a83
|
Merge branch 'AW-45-deletePayPal' into 'develop'
AW-45-deletePayPal
See merge request witapp/aura-webapp!106
|
2024-04-24 14:53:38 +00:00 |
|
Денис Катаев
|
38e1779cf6
|
AW-45-deletePayPal
|
2024-04-24 14:53:38 +00:00 |
|
Daniil Chemerkin
|
73d34b7bfd
|
Merge branch 'AW-42-UTMParameters' into 'develop'
AW-42-UTMParameters
See merge request witapp/aura-webapp!104
|
2024-04-22 22:46:11 +00:00 |
|
Денис Катаев
|
b5ab8415ac
|
AW-42-UTMParameters
|
2024-04-22 22:46:11 +00:00 |
|
Daniil Chemerkin
|
c9487bb2db
|
Merge branch 'AW-41-addFreeTrial' into 'develop'
AW-41-addFreeTrial
See merge request witapp/aura-webapp!103
|
2024-04-22 22:20:54 +00:00 |
|
Денис Катаев
|
f7af37c861
|
AW-41-addFreeTrial
|
2024-04-22 22:20:54 +00:00 |
|
Daniil Chemerkin
|
056b6c4f65
|
Merge branch 'AW-31-addEnvVariables' into 'develop'
AW-31-addEnvVariables
See merge request witapp/aura-webapp!102
|
2024-04-22 17:35:23 +00:00 |
|
Денис Катаев
|
fc21cc90b0
|
AW-31-addEnvVariables
|
2024-04-22 17:35:23 +00:00 |
|
Daniil Chemerkin
|
5d7737144c
|
Merge branch 'AW-22-deleteChargebee' into 'develop'
AW-22-deleteChargebee
See merge request witapp/aura-webapp!101
|
2024-04-19 16:30:40 +00:00 |
|
Денис Катаев
|
b5aabf16cc
|
AW-22-deleteChargebee
|
2024-04-19 16:30:40 +00:00 |
|
Daniil Chemerkin
|
d77a21efc0
|
Merge branch 'AW-28-displayPaymentErrors' into 'develop'
AW-28-displayPaymentErrors
See merge request witapp/aura-webapp!100
|
2024-04-18 21:54:57 +00:00 |
|
Денис Катаев
|
74d76a17e2
|
AW-28-displayPaymentErrors
|
2024-04-18 21:54:57 +00:00 |
|
Daniil Chemerkin
|
79ebe25a18
|
Merge branch 'AW-6-changeCameraSize-cameraButton' into 'develop'
AW-6-changeCameraSize-cameraButton
See merge request witapp/aura-webapp!98
|
2024-04-18 19:56:00 +00:00 |
|
Денис Катаев
|
d590d157f3
|
AW-6-changeCameraSize-cameraButton
|
2024-04-18 19:56:00 +00:00 |
|
Daniil Chemerkin
|
33d78b75a3
|
Merge branch 'feature/AW-33' into 'develop'
AW-33
See merge request witapp/aura-webapp!97
|
2024-04-18 16:31:59 +00:00 |
|
Денис Катаев
|
37f826c109
|
AW-33
|
2024-04-18 16:31:58 +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 |
|
Daniil Chemerkin
|
9383060a7c
|
Merge branch 'fix/short-path' into 'develop'
fix short path
See merge request witapp/aura-webapp!92
|
2024-04-17 20:21:42 +00:00 |
|
|
|
e1e506312c
|
fix short path
|
2024-04-18 00:10:16 +04:00 |
|
Daniil Chemerkin
|
a8ed4f59b9
|
Merge branch 'fix/advisorChartShortPath' into 'develop'
fix ShortPathOutlet
See merge request witapp/aura-webapp!91
|
2024-04-16 19:53:09 +00:00 |
|
|
|
11c3091269
|
fix ShortPathOutlet
|
2024-04-16 23:51:28 +04:00 |
|
Daniil Chemerkin
|
fc607acbb4
|
Merge branch 'fix/advisorChatShortPath' into 'develop'
fix always reload payment page
See merge request witapp/aura-webapp!90
|
2024-04-16 18:53:57 +00:00 |
|
|
|
782dd0fb51
|
fix always reload payment page
|
2024-04-16 22:49:07 +04:00 |
|
Daniil Chemerkin
|
95dee0b868
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!89
|
2024-04-16 17:51:32 +00:00 |
|
Daniil Chemerkin
|
c9b737a660
|
Develop
|
2024-04-16 17:51:32 +00:00 |
|
Daniil Chemerkin
|
5647a51669
|
Merge branch 'fix/build' into 'develop'
fix build
See merge request witapp/aura-webapp!88
|
2024-04-16 17:17:36 +00:00 |
|
|
|
578c7486d0
|
fix build
|
2024-04-16 21:15:57 +04:00 |
|
Daniil Chemerkin
|
63e9dd74ec
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!87
|
2024-04-16 16:58:07 +00:00 |
|
Daniil Chemerkin
|
f1254d9c2e
|
Develop
|
2024-04-16 16:58:07 +00:00 |
|
Денис Катаев
|
1ec7135014
|
Merge branch 'main' into 'develop'
# Conflicts:
# src/components/App/index.tsx
# src/components/pages/AdditionalPurchases/pages/AddConsultation/index.tsx
# src/components/pages/AdditionalPurchases/pages/AddReport/index.tsx
# src/components/pages/AdditionalPurchases/pages/UnlimitedReadings/index.tsx
# src/components/pages/Gender/index.tsx
# src/components/pages/PaymentWithEmailPage/index.tsx
# src/routes.ts
# src/services/singlePayment/index.ts
|
2024-04-16 06:18:30 +00:00 |
|
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 |
|
