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

207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bossanyi Tibor
41b10c4268 V1.0.24+2 CustomerProperty actual into the app-package 2021-02-06 15:16:06 +01: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
Bossanyi Tibor
c7d5831df9 API 1.0.24 new version nr build_gradle 
ExerciseAbility, AppPackage, AppCustomerPackage, Tracking
 2021-02-05 07:31:48 +01:00
Bossanyi Tibor
0ab6d5142e API 1.0.24 ExerciseAbility, AppPackage, AppCustomerPackage, Tracking 2021-02-05 07:29:39 +01: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
Bossanyi Tibor
6808720577 API 1.0.23 ExerciseTree parent_id delete, kotlin, spring boot 2.4 2021-01-29 22:08:29 +01: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
Bossanyi Tibor
be5551fbca API 1.0.22 Product app_version, sort, product_set 2020-12-27 07:58:53 +01: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
Bossanyi Tibor
d1cd8c1ffa API1.0.21 Product, price_ios, price_android 2020-12-23 21:07:46 +01: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
Bossanyi Tibor
d331f660cd API 1.0.19 ExerciseResult 2020-12-12 11:29:06 +01: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
Bossanyi Tibor
64114a82ba API 1.0.18 ExerciseTreeParents with controller 2020-12-04 23:20:11 +01: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
Bossanyi Tibor
293379d6fd API 1.0.18 Tree Parents 2020-12-03 18:39:59 +01:00