Commit 100cc964 authored 5 years ago by Andrey Belousov

Merge branch 'master' into tests

parents 5cd73c2c a56005e2

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

docker-compose.test.yml 10 additions, 1 deletion

docker-compose.test.yml
docker-compose.yml 23 additions, 2 deletions

docker-compose.yml
pom.xml 16 additions, 0 deletions

pom.xml
src/main/kotlin/com/s3ai/corporate_app2/CorporateApp2Application.kt 3 additions, 0 deletions

...otlin/com/s3ai/corporate_app2/CorporateApp2Application.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/CinemasController.kt 7 additions, 4 deletions

.../com/s3ai/corporate_app2/controllers/CinemasController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/SubscribersController.kt 63 additions, 0 deletions

.../s3ai/corporate_app2/controllers/SubscribersController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/TicketsController.kt 6 additions, 3 deletions

.../com/s3ai/corporate_app2/controllers/TicketsController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/UsersController.kt 7 additions, 3 deletions

...in/com/s3ai/corporate_app2/controllers/UsersController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/controllerUtils.kt 38 additions, 19 deletions

...in/com/s3ai/corporate_app2/controllers/controllerUtils.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/CinemaApiController.kt 5 additions, 1 deletion

...ai/corporate_app2/controllers/rest/CinemaApiController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/TicketApiController.kt 7 additions, 1 deletion

...ai/corporate_app2/controllers/rest/TicketApiController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/UserApiController.kt 8 additions, 2 deletions

...s3ai/corporate_app2/controllers/rest/UserApiController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/json/CinemasJsonController.kt 7 additions, 2 deletions

...orate_app2/controllers/rest/json/CinemasJsonController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/json/TicketsJsonController.kt 7 additions, 2 deletions

...orate_app2/controllers/rest/json/TicketsJsonController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/json/UsersJsonController.kt 7 additions, 2 deletions

...rporate_app2/controllers/rest/json/UsersJsonController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/xml/CinemasXmlController.kt 7 additions, 2 deletions

...rporate_app2/controllers/rest/xml/CinemasXmlController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/xml/TicketsXmlController.kt 7 additions, 2 deletions

...rporate_app2/controllers/rest/xml/TicketsXmlController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/xml/UsersXmlController.kt 7 additions, 2 deletions

...corporate_app2/controllers/rest/xml/UsersXmlController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/xslt/CinemasXsltController.kt 13 additions, 4 deletions

...orate_app2/controllers/rest/xslt/CinemasXsltController.kt
src/main/kotlin/com/s3ai/corporate_app2/controllers/rest/xslt/TicketsXsltController.kt 15 additions, 6 deletions

...orate_app2/controllers/rest/xslt/TicketsXsltController.kt

with 263 additions and 58 deletions

Please register or to comment