Daniil Chemerkin
|
63cd2e5798
|
Develop
|
2024-05-14 22:59:10 +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
|
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 |
|
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 |
|
Daniil Chemerkin
|
50a051320a
|
Develop
|
2024-04-25 20:20:11 +00:00 |
|
Daniil Chemerkin
|
062bea2f7f
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!109
|
2024-04-25 14:35:49 +00:00 |
|
Daniil Chemerkin
|
00f09813bc
|
Develop
|
2024-04-25 14:35:49 +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 |
|
dev.daminik00
|
90973219b3
|
merge
|
2024-04-23 01:44:41 +02: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
|
979b4406c1
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!99
|
2024-04-18 21:30:01 +00:00 |
|
Daniil Chemerkin
|
8bf0d5312f
|
Develop
|
2024-04-18 21:30:01 +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 |
|
dev.daminik00
|
c3c9ec9bae
|
merge
|
2024-04-18 01:44:26 +02:00 |
|
Daniil Chemerkin
|
2e161419ca
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!96
|
2024-04-17 23:32:05 +00:00 |
|
Daniil Chemerkin
|
cace7a41f5
|
Develop
|
2024-04-17 23:32:05 +00:00 |
|
Daniil Chemerkin
|
bc37d34c87
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!95
|
2024-04-17 23:31:33 +00:00 |
|
Daniil Chemerkin
|
fab0130ac8
|
Develop
|
2024-04-17 23:31:33 +00:00 |
|
Daniil Chemerkin
|
28e996c5fc
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!94
|
2024-04-17 23:31:02 +00:00 |
|
Daniil Chemerkin
|
d45f3a301f
|
Develop
|
2024-04-17 23:31:02 +00:00 |
|
Daniil Chemerkin
|
f14dbb5b13
|
Merge branch 'develop' into 'main'
Develop
See merge request witapp/aura-webapp!93
|
2024-04-17 23:29:56 +00:00 |
|
Daniil Chemerkin
|
06d85aedfd
|
Develop
|
2024-04-17 23:29:56 +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 |
|