Commit Graph
39 Commits
Author SHA1 Message Date
Bossanyi Tibor 0a6654003c Merge branch 'tibor' into 'master'
Tibor

See merge request bossanyit/aitrainer_server!8
2020-05-12 14:36:18 +00:00
Bossanyi Tibor ff31c7c132 Merge branch 'master' into 'tibor'
# Conflicts resolved
#   .gitlab-ci.yml
2020-05-12 14:34:55 +00:00
Bossanyi Tibor d942ab7c88 Update .gitlab-ci.yml 2020-05-12 13:42:12 +00:00
Bossanyi Tibor a5e560f78e Update .gitlab-ci.yml delete old table name exercise_types 2020-05-12 13:33:48 +00:00
Bossanyi Tibor afa3042e7c Update .gitlab-ci.yml table names 2020-05-12 13:23:54 +00:00
Bossanyi Tibor e76c65babe Merge branch 'zalan' into 'master'
Test for ExerciseType (Error)

See merge request bossanyit/aitrainer_server!6
2020-05-12 12:36:02 +00:00
Bossanyi TiborandBossanyi Tibor 7c23ec7fa4 Exercise Data class, repo, controller 2020-05-11 16:42:52 +02:00
Bossanyi Tibor 6bfbdd2b59 Merge branch 'zalan' into 'master'
Zalan

See merge request bossanyit/aitrainer_server!5
2020-05-10 11:54:55 +00:00
Bossanyi Tibor 192905be71 Update .gitlab-ci.yml 2020-05-10 08:28:34 +00:00
Bossanyi Tibor 2392f56d59 Update .gitlab-ci.yml 2020-05-10 08:16:06 +00:00
Bossanyi Tibor fe550f013b Update .gitlab-ci.yml 2020-05-10 08:11:42 +00:00
Bossanyi Tibor 698dc60116 Update .gitlab-ci.yml 2020-05-10 08:02:35 +00:00
Bossanyi Tibor 9448231aae Update .gitlab-ci.yml 2020-05-10 06:49:58 +00:00
Bossanyi Tibor f92cd5f8a2 Update .gitlab-ci.yml 2020-05-10 06:48:01 +00:00
Bossanyi Tibor 128cb3537a Update .gitlab-ci.yml 2020-05-10 06:45:17 +00:00
Bossanyi Tibor 677f04fd49 gitlab-ci.yml state prepare for mysql 2020-05-10 06:24:04 +00:00
Bossanyi Tibor 9079c2b509 Update .gitlab-ci.yml 2020-05-08 18:50:34 +00:00
Bossanyi Tibor b069ea4d66 .gitlab-ci.yml mysql test 2020-05-08 13:49:32 +00:00
Bossanyi Tibor da68faefa0 Update .gitlab-ci.yml 2020-05-08 10:40:52 +00:00
Bossanyi Tibor 8c7e94aa5a Update .gitlab-ci.yml 2020-05-08 09:48:25 +00:00
Bossanyi Tibor 41b3407fd3 Update .gitlab-ci.yml 2020-05-08 09:46:06 +00:00
Bossanyi Tibor 55f6778389 gitlab-ci 2020-05-08 09:44:19 +00:00
Bossanyi Tibor 14bd4664ee .gitlab-ci.yml docker 2020-05-08 08:17:37 +00:00
Bossanyi Tibor 8d7fa13c01 .gitlab-ci.yml services 2020-05-08 08:06:15 +00:00
Bossanyi Tibor 8688f08b81 .gitlab-ci.yml openjdk 2020-05-08 08:02:37 +00:00
Bossanyi Tibor db97d427f6 fix .gitlab-ci.yml 2020-05-08 07:39:13 +00:00
Bossanyi Tibor cc3581f8a0 fix .gitlab-ci.yml 2020-05-08 07:17:35 +00:00
Bossanyi Tibor 46ebf0cfa1 fix .gitlab-ci.yml java home 2020-05-07 20:20:52 +00:00
Bossanyi Tibor bc15721ea4 fix .gitlab-ci.yml 2020-05-07 20:18:38 +00:00
Bossanyi Tibor a7584abeaf fix .gitlab-ci.yml 2020-05-07 20:17:30 +00:00
Bossanyi Tibor b9678f4c87 fix in .gitlab-ci.yml 2020-05-07 20:06:17 +00:00
Bossanyi Tibor 6e75560155 .gitlab-ci.yml fix 2020-05-07 19:57:03 +00:00
Bossanyi Tibor ac06df11e3 Merge branch 'bossanyit-master-patch-91588' into 'master'
.gitlab-ci.yml add mysql, java_home

See merge request bossanyit/aitrainer_server!4
2020-05-07 13:31:37 +00:00
Bossanyi Tibor 1deb4d8f21 .gitlab-ci.yml add mysql, java_home 2020-05-07 13:30:20 +00:00
Bossanyi Tibor 054e896f70 add CI gitlab-ci.yml 2020-05-05 17:22:10 +00:00
Bossanyi Tibor 1ab733f72f Merge branch 'review' into 'master'
Update readme according to the API milestone

See merge request bossanyit/aitrainer_server!3
2020-05-03 21:10:20 +00:00
Bossanyi Tibor 66be44a93f Update readme according to the API milestone 2020-05-03 21:04:03 +00:00
Bossanyi Tibor f6e273643c add readme 2020-05-03 12:14:55 +00:00
Bossanyi Tibor 6c4abfe8bf Deleted .vscode/launch.json 2020-05-03 12:14:02 +00:00