bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261 Commits 1 Branch 0 Tags
4d7bd9b5aa6df66040fc95ca0f585e1dce2fc5a6
Commit Graph
85 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bossányi Tibor 81c488d70c Merge branch 'tibor' into 'master' 
Customer.findByEmail

See merge request bossanyit/aitrainer_server!20
 2020-10-26 06:33:23 +00:00
Bossányi Tibor 5258570f44 Merge branch 'tibor' into 'master' 
Customer.firebaseUid

See merge request bossanyit/aitrainer_server!19
 2020-10-25 11:14:49 +00:00
Bossányi Tibor 0a5028020e Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!18
 2020-10-17 13:58:51 +00:00
Bossányi Tibor bab94238e9 Merge branch 'tibor' into 'master' 
exercise_plan_detail_id in exercises

See merge request bossanyit/aitrainer_server!17
 2020-09-14 21:33:10 +00:00
Bossányi Tibor e5011f32ff Merge branch 'tibor' into 'master' 
ExercisePlan, ExercisePlanDetail - no OneToMany connection, Delete operation

See merge request bossanyit/aitrainer_server!16
 2020-09-10 05:16:35 +00:00
Bossányi Tibor 479a5f07f6 Merge branch 'tibor' into 'master' 
ExercisePlan, Detail Update, Delete

See merge request bossanyit/aitrainer_server!15
 2020-09-09 05:27:05 +00:00
Bossányi Tibor 665974a793 Merge branch 'tibor' into 'master' 
API: ExercisePlan, ExercisePlanDetail

See merge request bossanyit/aitrainer_server!14
 2020-09-06 09:23:58 +00:00
Bossányi Tibor ad2784814c Merge branch 'tibor' into 'master' 
Customer: trainer, trainerId

See merge request bossanyit/aitrainer_server!13
 2020-09-04 14:08:08 +00:00
Bossányi Tibor 3f3d0668f1 Merge branch 'tibor' into 'master' 
introducing prod-test environment

See merge request bossanyit/aitrainer_server!12
 2020-09-02 12:52:39 +00:00
Bossányi Tibor 71c6be54bd Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!11
 2020-08-19 06:34:47 +00:00
Bossányi Tibor 5c625bc9a1 Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!10
 2020-08-02 15:47:24 +00:00
Bossányi Tibor f34c7e6f3d Merge branch 'tibor' into 'master' 
ExerciseType extension with Images and Translations

See merge request bossanyit/aitrainer_server!9
 2020-08-01 14:25:52 +00:00
Bossányi Tibor 3bf886b222 Merge branch 'tibor' into 'master' 
customer - password nullable

See merge request bossanyit/aitrainer_server!8
 2020-07-06 22:51:00 +00:00
Bossányi Tibor 8f86b5c145 Merge branch 'tibor' into 'master' 
updateCustomer fix

See merge request bossanyit/aitrainer_server!7
 2020-07-06 22:38:12 +00:00
Bossányi Tibor 31b33d85bc Merge branch 'tibor' into 'master' 
1.0.4: customer fields extensions, tests

See merge request bossanyit/aitrainer_server!6
 2020-07-05 11:51:35 +00:00
Bossányi Tibor ac969f16b3 Merge branch 'tibor' into 'master' 
exercise model extension and exercise_type test fix

See merge request bossanyit/aitrainer_server!5
 2020-07-03 08:29:41 +00:00
Bossányi Tibor 81530230c6 Merge branch 'tibor' into 'master' 
exercise_type field extensions, tests

See merge request bossanyit/aitrainer_server!4
 2020-07-03 08:13:20 +00:00
Bossányi Tibor 0f4630a7b0 Merge branch 'tibor' into 'master' 
login as POST

See merge request bossanyit/aitrainer_server!3
 2020-06-12 16:51:50 +00:00
Bossányi Tibor e3e02a5bef Merge branch 'tibor' into 'master' 
authenticaction, registration, login fix

See merge request bossanyit/aitrainer_server!2
 2020-06-10 15:28:02 +00:00
Bossányi Tibor 6b558a0173 Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!1
 2020-06-10 14:31:49 +00:00
Bossányi Tibor 19cb0ee797 Add new file 2020-06-10 14:27:41 +00:00