-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into features/member
# Conflicts: # src/test/java/org/guzzing/studayserver/domain/academy/service/AcademyServiceTest.java
- Loading branch information
Showing
88 changed files
with
12,837 additions
and
320 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
root project 'studayserver'/resources/main/static/docs/index.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| html { | ||
| box-sizing: border-box; | ||
| overflow: -moz-scrollbars-vertical; | ||
| overflow-y: scroll; | ||
| box-sizing: border-box; | ||
| overflow: -moz-scrollbars-vertical; | ||
| overflow-y: scroll; | ||
| } | ||
|
|
||
| *, | ||
| *:before, | ||
| *:after { | ||
| box-sizing: inherit; | ||
| box-sizing: inherit; | ||
| } | ||
|
|
||
| body { | ||
| margin: 0; | ||
| background: #fafafa; | ||
| margin: 0; | ||
| background: #fafafa; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 17 additions & 17 deletions
34
root project 'studayserver'/resources/main/static/docs/swagger-initializer.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| window.onload = function() { | ||
| //<editor-fold desc="Changeable Configuration Block"> | ||
| window.onload = function () { | ||
| //<editor-fold desc="Changeable Configuration Block"> | ||
|
|
||
| // the following lines will be replaced by docker/configurator, when it runs in a docker-container | ||
| window.ui = SwaggerUIBundle({ | ||
| url: "https://petstore.swagger.io/v2/swagger.json", | ||
| dom_id: '#swagger-ui', | ||
| deepLinking: true, | ||
| presets: [ | ||
| SwaggerUIBundle.presets.apis, | ||
| SwaggerUIStandalonePreset | ||
| ], | ||
| plugins: [ | ||
| SwaggerUIBundle.plugins.DownloadUrl | ||
| ], | ||
| layout: "StandaloneLayout" | ||
| }); | ||
| // the following lines will be replaced by docker/configurator, when it runs in a docker-container | ||
| window.ui = SwaggerUIBundle({ | ||
| url: "https://petstore.swagger.io/v2/swagger.json", | ||
| dom_id: '#swagger-ui', | ||
| deepLinking: true, | ||
| presets: [ | ||
| SwaggerUIBundle.presets.apis, | ||
| SwaggerUIStandalonePreset | ||
| ], | ||
| plugins: [ | ||
| SwaggerUIBundle.plugins.DownloadUrl | ||
| ], | ||
| layout: "StandaloneLayout" | ||
| }); | ||
|
|
||
| //</editor-fold> | ||
| //</editor-fold> | ||
| }; |
30 changes: 15 additions & 15 deletions
30
root project 'studayserver'/resources/main/static/docs/swagger-spec.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| window.swaggerSpec={ | ||
| "openapi" : "3.0.1", | ||
| "info" : { | ||
| "title" : "restdocs-swagger API Documentation", | ||
| "description" : "Spring REST Docs with SwaggerUI.", | ||
| "version" : "0.0.1" | ||
| }, | ||
| "servers" : [ { | ||
| "url" : "http://localhost:8080" | ||
| } ], | ||
| "tags" : [ ], | ||
| "paths" : { }, | ||
| "components" : { | ||
| "schemas" : { } | ||
| } | ||
| window.swaggerSpec = { | ||
| "openapi": "3.0.1", | ||
| "info": { | ||
| "title": "restdocs-swagger API Documentation", | ||
| "description": "Spring REST Docs with SwaggerUI.", | ||
| "version": "0.0.1" | ||
| }, | ||
| "servers": [{ | ||
| "url": "http://localhost:8080" | ||
| }], | ||
| "tags": [], | ||
| "paths": {}, | ||
| "components": { | ||
| "schemas": {} | ||
| } | ||
| } |
11,092 changes: 11,090 additions & 2 deletions
11,092
root project 'studayserver'/resources/main/static/docs/swagger-ui.css
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.