bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
309 Commits 1 Branch 0 Tags
7fac7ff821345f2f42cebd784cd99ba5efa61ecf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bossanyit 7fac7ff821 Merge pull request 'tibor' (#16) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/16
 2023-04-11 15:56:24 +00:00
Tibor Bossanyi c3bc18fda5 API 1.2.2.1 update password 2023-04-11 17:55:23 +02:00
Tibor Bossanyi 73d189a357 API 1.2.2 fix firebase string, customer login 2023-04-11 16:53:33 +02:00
bossanyit 210ff64c66 Merge pull request 'tibor' (#15) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/15
 2023-03-29 18:43:49 +00:00
Tibor Bossanyi bdbfe1cd48 API 1.2.1+1 CORS 2023-03-29 20:43:04 +02:00
Tibor Bossanyi 020ce1e6f8 API 1.2.1 CORS 2023-03-29 20:40:49 +02:00
bossanyit 7a93cc9baa Merge pull request 'API 1.2+5 open ai chat completion fixes' (#14) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/14
 2023-03-26 10:31:33 +00:00
Tibor Bossanyi 1f8cfe0bba API 1.2+5 open ai chat completion fixes 2023-03-26 12:28:50 +02:00
bossanyit cc643eb844 Merge pull request 'API 1.2+4 open ai chat completion fix' (#13) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/13
 2023-03-13 06:53:35 +00:00
Tibor Bossanyi c2cc98eeb7 API 1.2+4 open ai chat completion fix 2023-03-13 07:52:38 +01:00
bossanyit cbe6502e5e Merge pull request 'API 1.2+3 open ai chat completion' (#12) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/12
 2023-03-12 16:09:06 +00:00
Tibor Bossanyi 26d344777c API 1.2+3 open ai chat completion 2023-03-12 17:06:44 +01:00
bossanyit 571c40f5d9 Merge pull request 'API 1.2+2 open ai fixes' (#11) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/11
 2023-03-09 22:24:15 +00:00
Tibor Bossanyi cae214f87e API 1.2+2 open ai fixes 2023-03-09 23:23:14 +01:00
bossanyit b45e283f7f Merge pull request 'tibor' (#10) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/10
 2023-02-25 11:46:59 +00:00
Tibor Bossanyi e3107147a1 API 1.2+1 DietMeal + fixes 2023-02-25 12:44:05 +01:00
Tibor Bossanyi 8f354803ca Merge remote-tracking branch 'origin/tibor' into tibor 2023-02-10 19:17:51 +01:00
Tibor Bossanyi 68bdfd0e14 API 1.2 update readme 2023-02-10 19:17:35 +01:00
bossanyit 1fec6a854d Merge branch 'master' into tibor 2023-02-10 18:13:33 +00:00
Tibor Bossanyi b33c8cbf7f API 1.2 Diet tables, Open AI API 2023-02-10 19:10:02 +01:00
Tibor Bossanyi 676aa60e2b API 1.1 Dockerfile update openjdk:18 2023-02-05 09:56:50 +01:00
bossanyit 65143895b0 Merge pull request 'API 1.1 WT Club, add customer_membership' (#8) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/8
 2023-02-05 08:38:12 +00:00
Tibor Bossanyi cf3abdaf01 API 1.1 WT Club, add customer_membership 2023-02-05 09:35:17 +01:00
bossanyit 7e96fd929e Merge pull request 'API 1.1 WT Club changes' (#7) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/7
 2023-02-04 17:43:09 +00:00
Tibor Bossanyi 564e749bc2 API 1.1 WT Club changes 2023-02-04 18:41:55 +01:00
bossanyit 51f179d7c1 Merge pull request 'API 1.0.58.1 TrainingPlanDetail intensity' (#6) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/6
 2023-01-19 14:07:54 +00:00
bossanyit 2bc65672de Merge pull request 'API 1.0.58 TrainingPlanDetail intensity' (#5) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/5
 2023-01-16 06:56:35 +00:00
bossanyit 50138515a6 Merge pull request 'API 1.0.57.3 get_user_by_email for deactivated: HTTP not found' (#4) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/4
 2022-11-26 15:35:53 +00:00
bossanyit 938260b4de Merge pull request 'API 1.0.57.2 get_customer package: deactivated customer: not found' (#3) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/3
 2022-11-25 19:34:14 +00:00
bossanyit 22d4e372fc Merge pull request 'API 1.0.57.1 deactivate customer: active = D' (#2) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/2
 2022-11-25 17:40:21 +00:00
bossanyit 0fd8bc7502 Merge pull request 'tibor' (#1) from tibor into master 
Reviewed-on: https://git.workouttest.org/bossanyit/aitrainer_server/pulls/1
 2022-11-25 17:26:41 +00:00
Bossányi Tibor f59ce54c86 Merge branch 'tibor' into 'master' 
API 1.0.56 SSL domain extension to workouttest.org

See merge request bossanyit/aitrainer_server!81
 2022-10-02 13:14:38 +00:00
Bossányi Tibor b569404a28 Merge branch 'tibor' into 'master' 
API 1.0.55 training_plan next, ecto,endo extensions

See merge request bossanyit/aitrainer_server!80
 2022-04-15 09:16:16 +00:00
Bossányi Tibor 22325eae8f Merge branch 'tibor' into 'master' 
API 1.0.54 customer.lang update

See merge request bossanyit/aitrainer_server!79
 2021-11-30 19:32:08 +00:00
Bossányi Tibor 77d7e70338 Merge branch 'tibor' into 'master' 
API 1.0.54 training program

See merge request bossanyit/aitrainer_server!78
 2021-11-11 19:39:47 +00:00
Bossányi Tibor 32bebdc590 Merge branch 'tibor' into 'master' 
API 1.0.53 customer.life_long

See merge request bossanyit/aitrainer_server!77
 2021-11-05 17:56:29 +00:00
Bossányi Tibor 4d7bd9b5aa Merge branch 'tibor' into 'master' 
API 1.0.52 customer.phone

See merge request bossanyit/aitrainer_server!76
 2021-10-05 15:50:04 +00:00
Bossányi Tibor 1a877473e4 Merge branch 'tibor' into 'master' 
API 1.0.51 customer.lang

See merge request bossanyit/aitrainer_server!75
 2021-10-04 15:41:17 +00:00
Bossányi Tibor adf75fd088 Merge branch 'tibor' into 'master' 
API 1.0.50+1 AppText Translations.translation

See merge request bossanyit/aitrainer_server!74
 2021-09-14 05:44:41 +00:00
Bossányi Tibor ff716146ea Merge branch 'tibor' into 'master' 
API 1.0.50 AppText Translations

See merge request bossanyit/aitrainer_server!73
 2021-09-08 14:40:39 +00:00
Bossányi Tibor 7293a9fd5f Merge branch 'tibor' into 'master' 
API 1.0.49 FirebaseRegistrationToken

See merge request bossanyit/aitrainer_server!72
 2021-09-07 15:22:52 +00:00
Bossányi Tibor 495bd39408 Merge branch 'tibor' into 'master' 
API 1.0.48

See merge request bossanyit/aitrainer_server!71
 2021-09-05 12:30:21 +00:00
Bossányi Tibor 7e3be43a03 Merge branch 'tibor' into 'master' 
API 1.0.47 Customer.trialDate

See merge request bossanyit/aitrainer_server!70
 2021-08-09 13:47:04 +00:00
Bossányi Tibor f5a2918463 Merge branch 'tibor' into 'master' 
API 1.0.47 Customer.trial

See merge request bossanyit/aitrainer_server!69
 2021-08-06 16:16:47 +00:00
Bossányi Tibor b588f0aa2f Merge branch 'tibor' into 'master' 
API 1.0.46 TrainingPlanDay

See merge request bossanyit/aitrainer_server!68
 2021-06-21 18:19:33 +00:00
Bossányi Tibor 5be1433abd Merge branch 'tibor' into 'master' 
API 1.0.45 ExerciseType buddy_warning

See merge request bossanyit/aitrainer_server!67
 2021-06-17 21:30:59 +00:00
Bossányi Tibor 689edb2982 Merge branch 'tibor' into 'master' 
API 1.0.44 TrainingPlan active

See merge request bossanyit/aitrainer_server!66
 2021-06-07 13:28:38 +00:00
Bossányi Tibor a5ae05907b Merge branch 'tibor' into 'master' 
API 1.0.43 split_tests source

See merge request bossanyit/aitrainer_server!65
 2021-06-04 12:56:58 +00:00
Bossányi Tibor 5567d79261 Merge branch 'tibor' into 'master' 
API 1.0.42 exercises.training_plan_details_id

See merge request bossanyit/aitrainer_server!64
 2021-05-25 13:39:28 +00:00
Bossányi Tibor 3ba9d28d24 Merge branch 'tibor' into 'master' 
API 1.0.41+2 customer_training_plan details fix

See merge request bossanyit/aitrainer_server!63
 2021-05-20 13:22:10 +00:00
Bossányi Tibor b0a9eb795e Merge branch 'tibor' into 'master' 
API 1.0.41 customer_training_plan details, exercises

See merge request bossanyit/aitrainer_server!62
 2021-05-20 13:03:32 +00:00
Bossányi Tibor b5a0d567ac Merge branch 'tibor' into 'master' 
API 1.0.40 split_tests, training_plan.treeId

See merge request bossanyit/aitrainer_server!61
 2021-05-18 20:46:42 +00:00
Bossányi Tibor 2e0e775b0b Merge branch 'tibor' into 'master' 
API 1.0.39 internal_name in exercise_tree, training_plan

See merge request bossanyit/aitrainer_server!60
 2021-05-17 19:29:45 +00:00
Bossányi Tibor e06367f4df Merge branch 'tibor' into 'master' 
API 1.0.39 FAQ sort

See merge request bossanyit/aitrainer_server!59
 2021-05-14 09:13:31 +00:00
Bossányi Tibor 903827396f Merge branch 'tibor' into 'master' 
API 1.0.37+2 SSL, password encryption, TrainingPlanTranslation

See merge request bossanyit/aitrainer_server!58
 2021-05-12 18:47:28 +00:00
Bossányi Tibor 3798d9f64f Merge branch 'tibor' into 'master' 
API 1.0.37 faq, training plans

See merge request bossanyit/aitrainer_server!57
 2021-05-10 14:58:52 +00:00
Bossányi Tibor 3f737ff00c Merge branch 'tibor' into 'master' 
API 1.0.36 description table

See merge request bossanyit/aitrainer_server!56
 2021-05-04 06:00:22 +00:00
Bossányi Tibor dab780e9fe Merge branch 'tibor' into 'master' 
API 1.0.35+2 tutorial_step condition as JSON

See merge request bossanyit/aitrainer_server!55
 2021-04-30 21:02:55 +00:00
Bossányi Tibor 7d791aa389 Merge branch 'tibor' into 'master' 
API 1.0.35 tutorial_step direction, branch

See merge request bossanyit/aitrainer_server!54
 2021-04-29 06:07:42 +00:00
Bossányi Tibor a148a58346 Merge branch 'tibor' into 'master' 
API 1.0.34+2 registration with email fix

See merge request bossanyit/aitrainer_server!53
 2021-04-28 13:21:46 +00:00
Bossányi Tibor a913356498 Merge branch 'tibor' into 'master' 
API 1.0.34 tutorials action

See merge request bossanyit/aitrainer_server!52
 2021-04-27 06:19:46 +00:00
Bossányi Tibor e337470411 Merge branch 'tibor' into 'master' 
API 1.0.33 tutorials condition, parent step

See merge request bossanyit/aitrainer_server!51
 2021-04-26 06:39:56 +00:00
Bossányi Tibor e7a7538b9d Merge branch 'tibor' into 'master' 
API 1.0.32 tutorials

See merge request bossanyit/aitrainer_server!50
 2021-04-24 12:49:14 +00:00
Bossányi Tibor 937e2e5c12 Merge branch 'tibor' into 'master' 
API 1.0.31 sports

See merge request bossanyit/aitrainer_server!49
 2021-04-20 07:29:39 +00:00
Bossányi Tibor a93a555c1a Merge branch 'tibor' into 'master' 
API 1.0.30+3 Customer properties must not be changed

See merge request bossanyit/aitrainer_server!48
 2021-04-14 21:26:34 +00:00
Bossányi Tibor aecb13078c Merge branch 'tibor' into 'master' 
API 1.0.30+2 CustomerActivity, Sort ExercisePlanTemplateDetail.sort

See merge request bossanyit/aitrainer_server!47
 2021-04-14 21:13:43 +00:00
Bossányi Tibor 85cfb00a2f Merge branch 'tibor' into 'master' 
API 1.0.30 CustomerActivity, Sort ExercisePlanTemplateDetail.sort

See merge request bossanyit/aitrainer_server!46
 2021-04-14 19:56:10 +00:00
Bossányi Tibor fac3545be4 Merge branch 'master' into 'tibor' 
# Conflicts:
#   src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
 2021-04-14 19:55:43 +00:00
Bossányi Tibor 19c8a36c52 Merge branch 'tibor' into 'master' 
API 1.0.29 Evaluation

See merge request bossanyit/aitrainer_server!45
 2021-04-03 14:00:33 +00:00
Bossányi Tibor 368edfe2ab Merge branch 'tibor' into 'master' 
API 1.0.28+2 ExercisePlan type

See merge request bossanyit/aitrainer_server!44
 2021-03-25 20:01:04 +00:00
Bossányi Tibor de53706717 Merge branch 'tibor' into 'master' 
API1.0.28 ExerciseTree description

See merge request bossanyit/aitrainer_server!43
 2021-03-10 20:16:44 +00:00
Bossányi Tibor 4bb4ab50aa Merge branch 'tibor' into 'master' 
API 1.0.27 TreeParents.sort, Tracking.event_value is TEXT

See merge request bossanyit/aitrainer_server!42
 2021-03-07 11:56:25 +00:00
Bossányi Tibor 3ddcfa6c4d Merge branch 'tibor' into 'master' 
API 1.0.26 ExercisePlanTemplate

See merge request bossanyit/aitrainer_server!41
 2021-02-23 21:56:15 +00:00
Bossányi Tibor 51773bc7e2 Merge branch 'tibor' into 'master' 
API 1.0.25+2 customer.dateAdd dateChange

See merge request bossanyit/aitrainer_server!40
 2021-02-19 16:59:54 +00:00
Bossányi Tibor 1a4c5cc494 Merge branch 'master' into 'tibor' 
# Conflicts:
#   src/main/kotlin/com/aitrainer/api/controller/CustomerController.kt
#   src/test/kotlin/com/aitrainer/api/test/CustomerTests.kt
 2021-02-19 16:59:39 +00:00
Bossányi Tibor 93c2735613 Merge branch 'tibor' into 'master' 
API 1.0.25 update CustomerProperty

See merge request bossanyit/aitrainer_server!39
 2021-02-15 17:07:59 +00:00
Bossányi Tibor ed9f165bed Merge branch 'tibor' into 'master' 
API 1.0.24 Tracking.eventValue String

See merge request bossanyit/aitrainer_server!38
 2021-02-07 12:10:02 +00:00
Bossányi Tibor e806b412a7 Merge branch 'tibor' into 'master' 
API 1.0.24+3 ExerciseType all into the AppPackage

See merge request bossanyit/aitrainer_server!37
 2021-02-06 16:44:54 +00:00
Bossányi Tibor 363b647fdb Merge branch 'tibor' into 'master' 
V1.0.24+2 CustomerProperty actual into the app-package

See merge request bossanyit/aitrainer_server!36
 2021-02-06 14:16:50 +00:00
Bossányi Tibor 808a004d5e Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!35
 2021-02-05 06:34:12 +00:00
Bossányi Tibor 91318168c9 Merge branch 'tibor' into 'master' 
API 1.0.23 ExerciseTree parent_id delete, kotlin, spring boot 2.4

See merge request bossanyit/aitrainer_server!34
 2021-01-29 21:10:22 +00:00
bossanyit eab46438c8 API1.0.22+2 dataAllowedPolicy 2021-01-02 14:33:08 +01:00
bossanyit 6f9850ecab API 1.0.22+2 Product.appVersion with CamelLetters 2020-12-27 11:57:03 +01:00
Bossányi Tibor a3dae834d2 Merge branch 'tibor' into 'master' 
API 1.0.22 Product app_version, sort, product_set

See merge request bossanyit/aitrainer_server!33
 2020-12-27 07:00:22 +00:00
Bossányi Tibor 71fdca8732 Merge branch 'tibor' into 'master' 
API1.0.21 Product, price_ios, price_android

See merge request bossanyit/aitrainer_server!32
 2020-12-23 20:09:35 +00:00
bossanyit df19de5103 WT1.0.20 Product - product_id_ios, product_id_android 2020-12-23 13:05:43 +01:00
Bossányi Tibor 785cd3f008 Merge branch 'tibor' into 'master' 
API 1.0.19 ExerciseResult

See merge request bossanyit/aitrainer_server!31
 2020-12-12 10:30:10 +00:00
bossanyit 8711988902 API 1.0.18 ExerciseTypeDevice to ExerciseType 2020-12-06 15:21:47 +01:00
bossanyit 044e999e7d ExerciseTreeParents all 2020-12-05 11:47:12 +01:00
Bossányi Tibor 9485389b9d Merge branch 'tibor' into 'master' 
API 1.0.18 ExerciseTreeParents with controller

See merge request bossanyit/aitrainer_server!30
 2020-12-04 22:21:52 +00:00
Bossányi Tibor 85643603f0 Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!29
 2020-12-03 17:41:28 +00:00
bossanyit 5e75fce2bc API 1.0.16 CustomerExerciseDevice.delete fix 2020-11-28 12:01:52 +01:00
bossanyit d37629ff72 API 1.0.16 CustomerExerciseDeviceTest 2020-11-28 09:37:46 +01:00
Bossányi Tibor 75a1d57302 Merge branch 'tibor' into 'master' 
API 1.0.16 ExerciseDevice.sort, place

See merge request bossanyit/aitrainer_server!27
 2020-11-26 17:38:35 +00:00
Bossányi Tibor 1706ec4a29 Merge branch 'tibor' into 'master' 
API 1.0.15c CustomerExerciseDevice delete

See merge request bossanyit/aitrainer_server!26
 2020-11-25 23:05:32 +00:00
Bossányi Tibor cca6b5a4c9 Merge branch 'tibor' into 'master' 
API 1.0.15b CustomerExerciseDevice standalone

See merge request bossanyit/aitrainer_server!25
 2020-11-23 20:19:41 +00:00
Bossányi Tibor 868bd97840 Merge branch 'tibor' into 'master' 
API 1.0.15 CustomerExerciseDevice

See merge request bossanyit/aitrainer_server!24
 2020-11-23 17:17:18 +00:00
Bossányi Tibor d4bff12a3d Merge branch 'tibor' into 'master' 
API 1.0.14 ExerciseDevice, ExerciseTypeDevice

See merge request bossanyit/aitrainer_server!23
 2020-11-20 14:51:56 +00:00
Bossányi Tibor 08bfbf40b7 Merge branch 'tibor' into 'master' 
Property, CustomerProperty

See merge request bossanyit/aitrainer_server!22
 2020-11-09 21:50:51 +00:00
Bossányi Tibor 0bdc324783 Merge branch 'tibor' into 'master' 
Pruduct, Purchase, Producttest

See merge request bossanyit/aitrainer_server!21
 2020-11-06 06:21:34 +00:00