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

329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bossanyi Tibor
b1dc434e96 API 1.0.29 Evaluation 2021-04-03 15:50:16 +02: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
Bossanyi Tibor
4d9f2307aa API 1.0.28+2 ExercisePlan type 2021-03-25 21:00:17 +01: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
Bossanyi Tibor
2bb531afcd API1.0.28 ExerciseTree description 2021-03-10 21:14:51 +01: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
Bossanyi Tibor
d2d7948a49 API 1.0.27 TreeParents.sort, Tracking.event_value is TEXT 2021-03-07 12:55:19 +01: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
Bossanyi Tibor
5b876d84bb API 1.0.26 ExercisePlanTemplate 2021-02-23 22:55:19 +01: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
Bossanyi Tibor
7ddb724ccc API 1.0.25+2 customer.dateAdd dateChange 2021-02-19 17:56:42 +01: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
Bossanyi Tibor
59d09ed115 API 1.0.25 update CustomerProperty 2021-02-15 18:04:22 +01: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
Bossanyi Tibor
bd0a078640 API 1.0.24 Tracking.eventValue String 2021-02-07 13:07:42 +01: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
Bossanyi Tibor
bbf5b57a86 API 1.0.24+3 ExerciseType all into the AppPackage 2021-02-06 17:43:57 +01:00