Commit Graph

257 Commits

Author SHA1 Message Date
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
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
Bossanyi Tibor
d860d79667 ExercisePlan, Detail Update, Delete 2020-09-09 00:02:49 +02: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
Bossanyi Tibor
f5a6f17ef5 API: ExercisePlan, ExercisePlanDetail 2020-09-06 11:22:58 +02: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
Bossanyi Tibor
2efb3cb18f Customer: trainer, trainerId 2020-09-04 15:58:30 +02: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
Bossanyi Tibor
a341f2cdbe introducing prod-test environment 2020-09-02 14:51:13 +02: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
Bossanyi Tibor
2ee95d1d43 ExerciseType base 2020-08-19 08:25:46 +02:00
Bossanyi Tibor
62be53118b JPA ManyToOne JsonIgnore 2020-08-02 18:31:28 +02: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
Bossanyi Tibor
cec8f5a4a4 ExerciseTreeTranslation fix 2020-08-02 17:45:40 +02:00
Bossanyi Tibor
af32c32a70 ExerciseTree getActiveMenu items 2020-08-02 16:03:51 +02: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
Bossanyi Tibor
1334104944 ExerciseType extension with Images and Translations
DB 1.0.5
2020-08-01 16:24:45 +02: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
Bossanyi Tibor
9dccebfb7d customer - password nullable 2020-07-07 00:49:36 +02: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
Bossanyi Tibor
0054a7d499 updateCustomer fix 2020-07-07 00:25:15 +02: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
Bossanyi Tibor
6f570242e1 1.0.4: customer fields extensions, tests 2020-07-05 13:50:28 +02:00