bossanyit/workouttest_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247 Commits 1 Branch 0 Tags 938 KiB
f5a2918463
Commit Graph

247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tibor Bossanyi (Freelancer)
b0ab1b4f77 API 1.0.47 Customer.trial 2021-08-06 18:16:17 +02: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
Bossanyi Tibor
4fcdf02221 API 1.0.46 TrainingPlanDay 2021-06-21 20:15:56 +02: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
Bossanyi Tibor
36c5bcbc49 API 1.0.45 ExerciseType buddy_warning 2021-06-17 23:30:15 +02: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
Bossanyi Tibor
2e7a0a9021 API 1.0.44 TrainingPlan active 2021-06-07 15:26:48 +02: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
Bossanyi Tibor
a1cec1f7b5 API 1.0.43 split_tests source 2021-06-04 14:55:31 +02: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
Bossanyi Tibor
115936c4af API 1.0.42 exercises.training_plan_details_id 2021-05-25 15:38:26 +02: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
Bossanyi Tibor
3028a45fa7 API 1.0.41+2 customer_training_plan details fix 2021-05-20 15:21:35 +02: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
Bossanyi Tibor
d02f6bd1f7 API 1.0.41 customer_training_plan details, exercises 2021-05-20 15:02:48 +02: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
Bossanyi Tibor
aeb62acaa3 API 1.0.40 split_tests, training_plan.treeId 2021-05-18 22:46:01 +02: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
Bossanyi Tibor
ac6256bebc API 1.0.39 internal_name in exercise_tree, training_plan 2021-05-17 21:29:13 +02: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
Bossanyi Tibor
af4264d018 API 1.0.39 FAQ sort 2021-05-14 11:12:41 +02: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
Bossanyi Tibor
7d78aa38fb API 1.0.37+2 SSL, password encryption, TrainingPlanTranslation 2021-05-12 20:46:10 +02: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
Bossanyi Tibor
a38c244d79 API 1.0.37 faq, training plans 2021-05-10 16:54:20 +02: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
Bossanyi Tibor
bd468c9135 API 1.0.36 description table 2021-05-04 07:52:55 +02: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
Bossanyi Tibor
e7c9cdc153 API 1.0.35+2 tutorial_step condition as JSON 2021-04-30 23:00:13 +02: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
Bossanyi Tibor
8269e8b4a0 API 1.0.35 tutorial_step direction, branch 2021-04-29 08:05:42 +02: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
Bossanyi Tibor
c1e5cde43f API 1.0.34+2 registration with email fix 2021-04-28 15:20:59 +02: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
Bossanyi Tibor
03b3766459 API 1.0.34 tutorials action 2021-04-27 08:19:05 +02: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
Bossanyi Tibor
08218d5214 API 1.0.33 tutorials condition, parent step 2021-04-26 08:38:39 +02: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
Bossanyi Tibor
9e331aacc3 API 1.0.32 tutorials 2021-04-24 14:46:34 +02: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
Bossanyi Tibor
a5f6dc1bd8 API 1.0.31 sports 2021-04-20 09:28:43 +02: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
Bossanyi Tibor
d71fb9e6d5 API 1.0.30+3 Customer properties must not be changed 2021-04-14 23:25:35 +02: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
Bossanyi Tibor
d42cef0778 API 1.0.30+2 CustomerActivity, Sort ExercisePlanTemplateDetail.sort 2021-04-14 22:50:49 +02: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
Bossanyi Tibor
f1aee3904f API 1.0.30 CustomerActivity, Sort ExercisePlanTemplateDetail.sort 2021-04-14 21:54:09 +02: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