Commit Graph

303 Commits

Author SHA1 Message Date
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
Bossanyi Tibor
9d8949130f deploy stage files 2020-05-12 21:29:05 +02:00
Bossanyi Tibor
8ccc7209ff Update .gitlab-ci.yml, drop tables 2020-05-12 14:48:05 +00:00
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
17183bda07 Exercise.getAllByCustomerId fix, HTTP test 2020-05-12 16:14:52 +02: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
5a4dda676b db fix, ExerciseTypeTest fix 2020-05-12 14:47:46 +02: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
ZalanBoss
530fe5ad89 Test for ExerciseType (Error) 2020-05-12 14:32:21 +02:00
Bossanyi Tibor
28e5873aa8 db fix 2020-05-12 14:07:56 +02:00
Bossanyi Tibor
85ce06d4c7 java Integer to kotlin.int
API 0.0.3
2020-05-11 21:42:01 +02:00
Bossanyi Tibor
a6627a31e7 Exercise repo, getAllByCustomerId, unit test (+code inspection) 2020-05-11 21:26:44 +02:00
Bossanyi 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
ZalanBoss
9a8402d634 exercise type readme changes 2020-05-10 13:46:26 +02:00
ZalanBoss
99598420da Exercise Type Classes 2020-05-10 13:39:14 +02:00
Bossanyi Tibor
7055f2927f install.sql not necessary 2020-05-10 11:57:37 +02:00
Bossanyi Tibor
7239d4de14 deploy dir for ci 2020-05-10 11:52:41 +02:00
Bossanyi Tibor
3a78c5b2f9 use database 2020-05-10 11:40:55 +02:00
Bossanyi Tibor
0c5016bcef data/dib dir 2020-05-10 11:38:41 +02:00
Bossanyi Tibor
7f81a5f218 install.sql script for ci 2020-05-10 11:33:53 +02:00
Bossanyi Tibor
4e552ee645 install.sql for ci 2020-05-10 11:32:49 +02:00
Bossanyi Tibor
92760f86d6 mysql user update for ci 2020-05-10 11:22:37 +02:00
Bossanyi Tibor
ec58b93497 show tables for ci 2020-05-10 11:16:02 +02:00