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
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
Bossányi Tibor
ac969f16b3 Merge branch 'tibor' into 'master' 
exercise model extension and exercise_type test fix

See merge request bossanyit/aitrainer_server!5
 2020-07-03 08:29:41 +00:00
Bossanyi Tibor
2bd3f2232d exercise model extension and exercise_type test fix 2020-07-03 10:27:57 +02:00
Bossányi Tibor
81530230c6 Merge branch 'tibor' into 'master' 
exercise_type field extensions, tests

See merge request bossanyit/aitrainer_server!4
 2020-07-03 08:13:20 +00:00
Bossanyi Tibor
03af5984be exercise_type field extensions, tests 2020-07-03 10:11:43 +02:00
Bossányi Tibor
0f4630a7b0 Merge branch 'tibor' into 'master' 
login as POST

See merge request bossanyit/aitrainer_server!3
 2020-06-12 16:51:50 +00:00
Bossanyi Tibor
3156edb057 login as POST 2020-06-12 18:50:39 +02:00
Bossányi Tibor
e3e02a5bef Merge branch 'tibor' into 'master' 
authenticaction, registration, login fix

See merge request bossanyit/aitrainer_server!2
 2020-06-10 15:28:02 +00:00
Bossanyi Tibor
077f7e10e6 authenticaction, registration, login fix 2020-06-10 17:26:47 +02:00
Bossányi Tibor
6b558a0173 Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!1
 2020-06-10 14:31:49 +00:00
Bossányi Tibor
19cb0ee797 Add new file 2020-06-10 14:27:41 +00:00
Bossanyi Tibor
c685dfb71c authenticaction, registration, login 2020-06-10 16:19:48 +02:00
Bossanyi Tibor
dba2228939 new conf directory 2020-06-04 07:37:52 +02:00
Bossanyi Tibor
070acf4e47 customer information aspect 2020-06-01 09:49:12 +02:00
Bossanyi Tibor
7ef6f50c3b v0.0.5: db update, API customer_information 
introducing AOP
 2020-06-01 09:26:41 +02:00
Bossanyi Tibor
5c85e28269 Test case add new exercise. 2020-05-24 08:21:40 +02:00
Bossanyi Tibor
2eb5a6ae03 spfl4j logging 2020-05-20 15:36:04 +02:00
Bossanyi Tibor
ff2c16ea7b get Real Customers: fix findByActive + database change 2020-05-16 11:35:46 +02:00
Bossanyi Tibor
b5a8727d60 get Real Customers: fix findByActive 2020-05-16 11:28:51 +02:00
Bossanyi Tibor
c2b2a68ce6 Merge branch 'zalan' into 'master' 
find Real customer api (inconvinence)

See merge request bossanyit/aitrainer_server!12
 2020-05-16 08:57:41 +00:00
ZalanBoss
565680636a find Real customer api (inconvinence) 2020-05-16 10:50:42 +02:00
Bossanyi Tibor
3cf8c447f8 Merge branch 'tibor' into 'master' 
deploy ci fix, fix upload path

See merge request bossanyit/aitrainer_server!11
 2020-05-12 20:25:15 +00:00
Bossanyi Tibor
679694bb47 deploy ci fix, fix upload path 2020-05-12 22:20:11 +02:00
Bossanyi Tibor
4a47106785 Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!10
 2020-05-12 20:09:40 +00:00
Bossanyi Tibor
0eba844cb7 deploy ci fix, chmod +x to deploy.sh 2020-05-12 22:05:25 +02:00
Bossanyi Tibor
0f215b5c23 deploy ci fix, port change to scp 2020-05-12 21:54:35 +02:00
Bossanyi Tibor
58e97691f0 Merge branch 'tibor' into 'master' 
Tibor

See merge request bossanyit/aitrainer_server!9
 2020-05-12 19:46:10 +00:00
Bossanyi Tibor
408d034bab deploy ci fix 2020-05-12 21:39:57 +02:00
Bossanyi Tibor
fa0cf72f50 deploy stage files 2020-05-12 21:32:42 +02:00