Commit Graph

4290 Commits

Author SHA1 Message Date
Tobias Woelk
ee74779fe5 Merge remote-tracking branch 'UPSTREAM/develop' into develop 2018-02-21 10:40:51 +01:00
Simon Redfern
a6977c68ff Merge branch 'develop' of github.com:OpenBankProject/OBP-API into develop 2018-02-20 22:36:08 +01:00
Simon Redfern
8e3519028d Adding /api/glossary 2018-02-20 22:35:45 +01:00
Simon Redfern
5fd6bee0d5
Merge pull request #930 from hongwei1/develop
fixed the Swagger endpoints
2018-02-20 10:32:21 +01:00
hongwei1
7019d59d29 fixed the swagger endpoint-- added explicit value for empty json string 2018-02-20 09:31:11 +01:00
hongwei1
6a23afa42e fixed the swagger endpoint 2018-02-20 08:25:09 +01:00
Simon Redfern
9a19868ab3
Merge pull request #929 from tawoe/develop
update kafka setup scripts to existing kafka download
2018-02-19 15:11:36 +01:00
Simon Redfern
fa1df8f0da
Merge pull request #928 from hongwei1/develop
#927 separate public and private accounts for accounts endpoints
2018-02-19 11:51:21 +01:00
Marko Milić
f0f417ab69
Updated relase notes about Encryption/Decryption of props file 2018-02-19 11:37:54 +01:00
Marko Milić
1efb7dbdb0
Added props file Encoding/Decoding procedure. 2018-02-19 11:23:32 +01:00
Tobias Woelk
0cdef0a0e9 Merge remote-tracking branch 'UPSTREAM/develop' into develop 2018-02-19 10:33:33 +01:00
hongwei1
a3ef74920d added some comments 2018-02-19 09:37:19 +01:00
hongwei1
53f074c922 #927 fixed the failed tests, fixed the wrong inheritance. 2018-02-18 12:51:37 +01:00
hongwei1
11bbdc045d #927 fixed the failed tests, no public accounts for all getAccounts endpoints. 2018-02-18 12:49:08 +01:00
hongwei1
64aa4ddb31 #927 separate public and private accounts for accounts endpoints 2018-02-18 11:32:37 +01:00
hongwei1
f187e18265 Merge remote-tracking branch 'Official/develop' into develop 2018-02-18 08:39:41 +01:00
Marko Milić
1367fa1cdf
Merge pull request #926 from constantine2nd/develop
Added Nimbus library - JWT with RSA Encryption
2018-02-17 21:17:08 +01:00
constantine2nd
d90bbd5357 JWT with RSA Encryption added to response 2018-02-17 21:01:20 +01:00
constantine2nd
4349f574ae Added Nimbus library - JWT with RSA Encryption 2018-02-17 16:26:19 +01:00
constantine2nd
8db623bb9e Added Nimbus library - JWT with RSA Encryption 2018-02-17 15:54:53 +01:00
Simon Redfern
67eedb3a87
Merge pull request #922 from moule3053/develop
Add script to insert fx rates from a json file
2018-02-16 15:09:56 +01:00
Simon Redfern
c21799b4ae
Merge pull request #925 from constantine2nd/develop
getPropsValue - added base64 Encode/Decode
2018-02-16 15:07:20 +01:00
constantine2nd
00d5c869bd Props.getLong replaced with APIUtil.getPropsAsLongValue 2018-02-16 10:23:44 +01:00
constantine2nd
ddeaba1eba Props.getInt replaced with APIUtil.getPropsAsIntValue 2018-02-16 10:07:36 +01:00
constantine2nd
c598ec0e97 Props.getBool replaced with APIUtil.getPropsAsBoolValue 2018-02-16 09:53:09 +01:00
moule3053
769e1dd58c Remove unnecessary lines 2018-02-16 09:26:57 +01:00
hongwei1
44ac14f32d #920 step2 refactor addPermissions method 2018-02-16 08:00:49 +01:00
constantine2nd
d4fe3754b6 Enter the Password for the SSL Certificate Stores via console 2018-02-15 18:17:30 +01:00
constantine2nd
61a2a987d4 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-15 17:14:29 +01:00
constantine2nd
b69a8dc888 Introdued function getDecryptedPropsValue - added base64 Encode/Decode 2018-02-15 16:27:05 +01:00
Simon Redfern
2d0ed7de6f
Merge pull request #921 from hongwei1/develop
#920 step1 code clean, remove the duplicate method in views
2018-02-15 13:48:12 +01:00
Simon Redfern
a7d0c37d15
Merge pull request #924 from constantine2nd/develop
Encrypted props value
2018-02-15 13:41:40 +01:00
constantine2nd
110d98b03a Renamed function - getDecryptedPropsValue -> getPropsValue 2018-02-15 12:37:18 +01:00
constantine2nd
d8d5e39b7c Introdued function getDecryptedPropsValue - added log in case of an error 2018-02-15 12:06:24 +01:00
constantine2nd
d6a295bdfc Applied function getDecryptedPropsValue in case of props db.url and db.password 2018-02-15 11:54:11 +01:00
constantine2nd
c80b3993ff Introdued function getDecryptedPropsValue 2018-02-15 11:51:02 +01:00
moule3053
2c0e37a4f2 Add script to insert fx rates from a json file 2018-02-15 11:00:54 +01:00
hongwei1
25112211ee #920 step1 code clean, remove the duplicate method in views 2018-02-15 10:00:34 +01:00
constantine2nd
925caa19b2 Factored out and tweaked a message 2018-02-12 16:33:41 +01:00
Simon Redfern
cd694b3416
Merge pull request #919 from hongwei1/develop
#724 added getFirehoseTransactions
2018-02-12 04:53:27 -05:00
Simon Redfern
75c0d33b96
Merge pull request #918 from constantine2nd/develop
Removed unnecessary vals from for comprehensions
2018-02-12 04:51:18 -05:00
constantine2nd
509c1bcf74 Endpoint getCurrentFxRate tweaked 2018-02-09 14:12:46 +01:00
constantine2nd
50a9943744 Removed unnecessary vals from for comprehensions 2018-02-09 13:38:28 +01:00
hongwei1
899304e33c #724 added getFirehoseTransactions 2018-02-09 10:04:57 +01:00
constantine2nd
3397699318 Removed unnecessary vals from for comprehensions 2018-02-09 09:45:24 +01:00
constantine2nd
2fff5005e2 Removed unnecessary vals from for comprehensions 2018-02-09 09:19:00 +01:00
Simon Redfern
7643230213
Merge pull request #917 from constantine2nd/develop
Endpoint createFx implemented in mapper mode
2018-02-08 11:50:03 -05:00
constantine2nd
ecb7d89d93 Endpoint createFx implemented in mapper mode 2018-02-08 17:10:34 +01:00
Simon Redfern
e84ae84a9e
Merge pull request #916 from constantine2nd/develop
Endpoint getCurrentFxRate fixed
2018-02-08 09:24:30 -05:00
constantine2nd
3ccc27f2d7 Endpoint getCurrentFxRate fixed 2018-02-08 15:20:58 +01:00