Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop

Conflicts:
	src/main/webapp/templates-hidden/default.html
This commit is contained in:
Stefan Bethge 2015-10-07 15:07:08 +02:00
commit 08051292ec
3 changed files with 9 additions and 7 deletions

View File

@ -79,11 +79,12 @@ trait APIMethods121 {
"root",
"GET",
"/",
"Returns API version, git commit, hosted by etc.",
"The root of the API",
"""Returns information about:
|
|* API version
|* Hosted by information""",
|* Hosted by information
|* Git Commit""",
emptyObjectJson,
emptyObjectJson)
@ -138,7 +139,7 @@ trait APIMethods121 {
"bankById",
"GET",
"/banks/BANK_ID",
"Returns the bank specified by BANK_ID",
"Get the bank specified by BANK_ID",
"""Returns information about a single bank specified by BANK_ID including:
|
|* Short and full name of bank

View File

@ -282,8 +282,8 @@ Authentication via OAuth *may* be required.""",
"getResourceDocs",
"GET",
"/resource-docs/obp",
"Get the API calls that are documented on this server in OBP format.",
"Returns the documentation about the API endpoints including example body for POST or PUT requests.",
"Get Resource Documentation in OBP format.",
"Returns documentation about the resources on this server including example body for POST or PUT requests.",
emptyObjectJson,
emptyObjectJson
)

View File

@ -113,8 +113,9 @@ Berlin 13359, Germany
<br/>
</div>
<div>
<a href="http://twitter.com/#!/OpenBankProject">Follow us on Twitter</a> |
<a href="https://github.com/OpenBankProject">Sources on Github</a>
<a href="http://twitter.com/#!/OpenBankProject">Twitter</a> |
<a href="https://github.com/OpenBankProject/OBP-API/">Github</a> |
<a href="https://github.com/OpenBankProject/OBP-API/wiki">API Documentation</a>
</div>
</footer>
</div>