artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,544 Commits 64 Branches 3 Tags 68 MiB
revert-411-develop
Commit Graph

2544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Redfern
540b5e65a1 Revert "Add 2.2 getCounterparties #407" 2017-02-22 14:27:24 +01:00
Simon Redfern
0384b3c8a2 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-22 14:24:17 +01:00
Simon Redfern
0db9f26c43 TODO on 200 getPermissionForUserForBankAccount 2017-02-22 14:24:11 +01:00
Simon Redfern
70dfe9991a Merge pull request #411 from hongwei1/develop 
Add 2.2 getCounterparties #407 (WIP?)
 2017-02-22 14:22:07 +01:00
hongwei1
14b0e38816 Add 2.2 getCounterparties #407 2017-02-22 14:00:24 +01:00
Simon Redfern
a8668d8a4f Comment on COUNTERPARTY 2017-02-22 13:48:50 +01:00
Petar Bozin
ddc9a90860 Merge remote branch 'origin/develop' into develop 2017-02-22 12:45:23 +01:00
Petar Bozin
be0fb4f631 Fixed checking for incorrect number of arguments in main() 2017-02-22 12:45:06 +01:00
Simon Redfern
f07f5edb17 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-22 12:05:08 +01:00
Simon Redfern
b117de91bb Adding start of 2.2.0 getCounterpartiesForAccount 2017-02-22 12:04:53 +01:00
Petar Bozin
10cd53c08a Added clause: if counterpartyProvider != OBP do not pull BankAccount from kafka 2017-02-22 11:58:02 +01:00
Simon Redfern
a42cfbc080 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-22 11:43:05 +01:00
Petar Bozin
7e34fbdd88 Temp fix for removed com.fasterxml.jackson.core:jackson-databind:jar:2.9.0-SNAPSHOT 2017-02-22 10:36:33 +01:00
Simon Redfern
4b81a4e26a Adding charge_policy to SEPA Transaction Request and adding separate Resource Doc for SEPA 2017-02-21 19:24:40 +01:00
Simon Redfern
1c9f2ce184 Merge pull request #409 from hongwei1/develop 
Option to run Mapped table access on a remote machine separated by Akka #154 - Counterparties (WIP)
 2017-02-21 19:22:45 +01:00
hongwei1
c8e731c34b Option to run Mapped table access on a remote machine separated by Akka #154 2017-02-21 16:54:29 +01:00
hongwei1
d57c6640e5 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-21 16:50:34 +01:00
Simon Redfern
7a3efef86b Merge pull request #408 from marko-md/develop 
Separation by Akka WIP
 2017-02-21 16:41:12 +01:00
hongwei1
ff17bfbcb8 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-21 15:29:04 +01:00
Marko Milic
019ba8c500 resourceId renamed to resourceUserId 2017-02-21 15:11:42 +01:00
Marko Milic
fb8e176b1c Merge remote branch 'upstream/develop' into develop 2017-02-21 14:53:24 +01:00
Marko Milic
8de1622610 Changed ports in akka configs, added option standalone when running as remotedata server - bug fixed 2017-02-21 14:50:56 +01:00
Marko Milic
22bccb8e2e Merge remote branch 'upstream/develop' into develop 2017-02-21 12:46:11 +01:00
Marko Milic
b5e1b4a7ce apiId renamed to resourceId 2017-02-21 12:45:29 +01:00
hongwei1
7dd8e1a8f5 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-21 12:39:52 +01:00
hongwei1
7a385d7781 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-21 12:36:38 +01:00
hongwei1
6e7764f3fb rename customerPostJSON-->counterpartyPostJSON 2017-02-21 12:36:32 +01:00
Simon Redfern
5861f93c80 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-21 12:28:02 +01:00
Simon Redfern
14e5e8b07b canCreateCounterparty -> canAddCounterparty to be consistent will all other Add permissions in Views 2017-02-21 12:27:56 +01:00
Marko Milic
1efb612c9a Option to split the Mapped tables code into a separate scala project separated by Akka #154 - ResourceUser separeted - isue fixed - in progress 2017-02-21 11:59:27 +01:00
Petar Bozin
2ce52ca344 Changed ports in akka configs, added option "standalone" when running as remotedata server 2017-02-21 11:48:55 +01:00
Simon Redfern
dde439bd38 Starting to adding Charge policy for COUNTERPARTY Transaction Request for #399. Adding explicit COUNTERPARTY TR Recourse Doc 2017-02-21 11:31:34 +01:00
Marko Milic
d482d3aef9 Option to split the Mapped tables code into a separate scala project separated by Akka #154 - ResourceUser separeted - in progress 2017-02-21 08:44:31 +01:00
Marko Milic
96a65c0118 Merge remote branch 'upstream/develop' into develop 2017-02-21 08:27:46 +01:00
Simon Redfern
dda8608e80 user related keys in validateChallengeAnswer KafkaMappedConnector and removing TODOs 2017-02-20 21:17:30 +01:00
Petar Bozin
94b06f1615 Merge remote branch 'origin/develop' into develop 
Conflicts:
	src/main/scala/code/bankconnectors/KafkaMappedConnector.scala
 2017-02-20 20:00:37 +01:00
Petar Bozin
9f23271e2e Updated KafkaMappedConnector, changed value of "userId" to userId, and added "username" field 2017-02-20 19:58:09 +01:00
Simon Redfern
d9e632d000 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-20 18:41:40 +01:00
Simon Redfern
cc8fdb5eba Comments in KafkaMappedConnector 2017-02-20 18:41:27 +01:00
Simon Redfern
978395099e Merge pull request #404 from hongwei1/develop 
Modify Kafka Connector so that Counterparties can optionally be read …
 2017-02-20 16:54:24 +01:00
Marko Milic
56add2f7ab Option to split the Mapped tables code into a separate scala project separated by Akka #154 - ResourceUser separeted - in progress 2017-02-20 16:47:18 +01:00
hongwei1
0fdcd7ae61 Modify Kafka Connector so that Counterparties can optionally be read from OBP or Kafka # 397 2017-02-20 15:40:41 +01:00
Marko Milic
6e6b2b1f82 Merge remote branch 'upstream/develop' into develop 2017-02-20 14:24:12 +01:00
Marko Milic
6749d3fff2 Option to split the Mapped tables code into a separate scala project separated by Akka #154 - get rid of implicit foreign key references - in progress 2017-02-20 14:13:18 +01:00
Simon Redfern
ba425c6942 Merge pull request #403 from hongwei1/develop 
OBP-API-265 Validate urls that can be used for redirect #265 And also #224 #390 #388
 2017-02-20 13:20:11 +01:00
hongwei1
4822dae917 Validate urls that can be used for redirect #265 --tweaking 2017-02-20 13:12:22 +01:00
Simon Redfern
013f7f7cc9 Merge branch 'develop' of https://github.com/OpenBankProject/OBP-API into develop 2017-02-20 12:56:44 +01:00
Simon Redfern
f22a634b26 Added TODO 2017-02-20 12:56:39 +01:00
hongwei1
fa9b8ff5df added the "transactionType" -> "AC" to Kafka 2017-02-20 12:50:15 +01:00
hongwei1
eaf085ed95 post challenge must check if transaction has already been created from transaciton_id / challenge_id #390 2017-02-20 12:43:50 +01:00