Commit Graph

329 Commits

Author SHA1 Message Date
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
Bossanyi Tibor
e640f52b36 API 1.0.17 ExerciseTypeAlternative ExerciseDeviceAlternative ExerciseTypeParents 2020-12-03 15:01:38 +01: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
Bossanyi Tibor
4cd5f07c89 API 1.0.16 ExerciseDevice.sort, place 2020-11-26 18:36:54 +01: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
Bossanyi Tibor
059c9c7be2 API 1.0.15c CustomerExerciseDevice delete 2020-11-26 00:04:23 +01: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
Bossanyi Tibor
11c9a6d112 API 1.0.15b CustomerExerciseDevice standalone 2020-11-23 21:18:16 +01: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
Bossanyi Tibor
3a70bcd10f API 1.0.15 CustomerExerciseDevice 2020-11-23 18:15:46 +01: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
Bossanyi Tibor
af2f5be1bf API 1.0.14 ExerciseDevice, ExerciseTypeDevice 2020-11-20 15:50:04 +01: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
Bossanyi Tibor
fd10f40306 Property, CustomerProperty 2020-11-09 22:49:15 +01: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
Bossanyi Tibor
6cf74d2738 Pruduct, Purchase, Producttest 2020-11-06 07:14:41 +01: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
Bossanyi Tibor
83939110af Customer.findByEmail 2020-10-26 07:30:53 +01: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
Bossanyi Tibor
c04f0cbbc4 Customer.firebaseUid 2020-10-25 12:13:30 +01: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
Bossanyi Tibor
e807db3faf exercise delete 2020-10-17 15:57:46 +02:00
Bossanyi Tibor
a95e22d9fb exercise delete 2020-10-17 15:53:51 +02: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
Bossanyi Tibor
3f8eb6ef00 exercise_plan_detail_id in exercises 2020-09-14 23:32:13 +02: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
Bossanyi Tibor
efe7dea584 ExercisePlan, ExercisePlanDetail - no OneToMany connection, Delete operation 2020-09-10 07:15:42 +02:00