Commit Graph

2115 Commits

Author SHA1 Message Date
Clinton Alexander
2bc8f8414d Merged in clint-contractsrename (pull request #446)
Renamed contracts project to finance to better reflect the purpose of the project.
2016-11-04 15:18:19 +00:00
Patrick Kuo
9a4dcd9b58 Merged in pat-explorer-doc (pull request #440)
Explorer Doc
2016-11-04 13:45:15 +00:00
Patrick Kuo
6525de7e17 Explorer Doc 2016-11-04 13:41:21 +00:00
Clinton Alexander
70cf57f736 Added correct modules.xml for the finance project. 2016-11-04 13:38:46 +00:00
Clinton Alexander
8882b77b1b Fixed quasar scanning. 2016-11-04 13:35:25 +00:00
Clinton Alexander
7e198e7cf3 Renamed contracts project to finance to better reflect the purpose of the project. 2016-11-04 13:35:25 +00:00
Patrick Kuo
7d465999d6 Merged in pat-explorer-move (pull request #443)
move explorer to tools folder
2016-11-04 11:44:16 +00:00
Clinton Alexander
d937a5805e Merged in clint-gradleinstallfix (pull request #439)
Gradle install now installs all packages to maven local
2016-11-04 11:39:28 +00:00
Andras Slemmer
8ee07e229f Merged in aslemmer-gitignore-cleanup (pull request #445)
.gitignore: Use negative pattern for build/, remove some unused lines
2016-11-04 11:25:52 +00:00
Patrick Kuo
e29f281cfd Changed / to : to align with gradle include directive. 2016-11-04 11:20:02 +00:00
Andras Slemmer
14304d098f .gitignore: Use negative pattern for build/, remove some unused lines 2016-11-04 11:13:57 +00:00
Clinton Alexander
02bbcd307d Fixing build by removing dependency on quasar scan. 2016-11-04 11:01:02 +00:00
Clinton Alexander
3c5cece3ea Fixed publishToMavenLocal that was broken by a removed plugin include. 2016-11-04 10:51:54 +00:00
Clinton Alexander
04ad438a51 Merged in clint-quasarfix (pull request #436)
Fixed an error message when running gradle build.
2016-11-04 10:42:04 +00:00
Clinton Alexander
02fa457156 Added another rule to the gitignore to ignore the distributions folder. 2016-11-04 10:41:19 +00:00
Clinton Alexander
d899e0a3fc Removed redundant configurations in light of the demos being split out. 2016-11-04 10:41:19 +00:00
Clinton Alexander
30f7eadcd1 Renamed publishToMavenLocal to install in run configs. 2016-11-04 10:37:38 +00:00
Rick Parker
4b1d971137 Merged in parkri-fix-pending-messages-table-name (pull request #426)
Pending redelivery table name prefix added in line with other tables.
2016-11-04 10:34:17 +00:00
rick.parker
143e3a063f Pending redelivery table name prefix added in line with other tables.
No longer delete all pending messages from the database and move into memory before putting back into the database again, which is vulnerable to failure.  Now we delete individual pending messages on successful redelivery.
2016-11-04 10:22:14 +00:00
Mike Hearn
226b624004 Tech white paper: Oracles and tearoffs, encumbrances, contract constraints, assets and obligations, deterministic JVM 2016-11-04 11:07:47 +01:00
Patrick Kuo
3cd8562b3b move explorer to tools folder 2016-11-03 17:28:38 +00:00
Patrick Kuo
0e59ac4581 Merged pat-explorer-ui-work into master 2016-11-03 16:17:23 +00:00
Clinton Alexander
59a86c364b Documentation now refers devs to use install over publishToMavenLocal 2016-11-03 15:58:46 +00:00
Clinton Alexander
55e3dceb8f gradle install now works for corda. 2016-11-03 15:57:50 +00:00
Patrick Kuo
1d8569303e Add test1 user to the demo node start up 2016-11-03 15:52:08 +00:00
Patrick Kuo
99e3e5d754 Add test1 user to the demo node start up 2016-11-03 15:48:56 +00:00
Clinton Alexander
3705c90be2 Merged in clint-vegacore (pull request #430)
Added core changes and docs required for simm valuation demo.
2016-11-03 13:44:38 +00:00
Patrick Kuo
7f8608c981 Changing UI layout 2016-11-03 11:39:24 +00:00
Clinton Alexander
cf4b91d7c7 Removed redundant file. 2016-11-03 11:03:54 +00:00
Clinton Alexander
acaa9f82a5 Rewrote some documentation about the simm demo. Moved a util function to the main utils file. 2016-11-03 11:03:54 +00:00
Clinton Alexander
1a892886ac Added instructions for running simm valuation demo. 2016-11-03 11:01:36 +00:00
Richard Green
26b3c0173d Fixing grammar 2016-11-03 11:01:36 +00:00
Clinton Alexander
ca2a37915d Review fixes for docs. 2016-11-03 11:01:36 +00:00
Clinton Alexander
73a2215747 Added core changes and docs required for simm valuation demo. 2016-11-03 11:01:36 +00:00
Shams Asari
6d39b71bf9 Simple RPC access control, with a demo control on the cash RPCs 2016-11-03 10:46:25 +00:00
Clinton Alexander
a7dfb43c63 Merged in clint-publishrunconfig (pull request #437)
Added publish to maven local run config and added publish to the install run configuration.
2016-11-03 10:04:25 +00:00
Clinton Alexander
54dfced4ab Added publish to maven local run config and added publish to the install run configuration. 2016-11-03 09:54:41 +00:00
Jose Coll
908772d85a Remove rogue empty file that sneaked into last commit. 2016-11-02 15:05:42 +00:00
Jose Coll
678b006438 Merged in colljos-vault-transaction-notes (pull request #419)
Vault transaction notes (COR-451)
2016-11-02 15:01:51 +00:00
Jose Coll
1d25d23b73 Merge from master 2016-11-02 14:20:51 +00:00
Jose Coll
6deaf2c12c Merged in colljos-vault-code-clean-up-refactor (pull request #435)
Colljos vault code clean up refactor
2016-11-02 14:01:24 +00:00
Jose Coll
3410671694 Merge branch 'master' into colljos-vault-code-clean-up-refactor 2016-11-02 13:51:49 +00:00
Clinton Alexander
3b0f173984 Merged in clint-cordformdeps (pull request #424)
Cordapps now correctly resolve dependencies.
2016-11-02 11:26:12 +00:00
Clinton Alexander
18bd53711f Fixed spelling of CorDapp. 2016-11-02 11:23:31 +00:00
Clinton Alexander
69dcd45660 CorDapp dependencies must now be fully qualified maven dependency names. 2016-11-02 11:22:52 +00:00
Jose Coll
012dc9ec10 Merge branch 'master' into colljos-vault-code-clean-up-refactor 2016-11-02 11:20:21 +00:00
Jose Coll
a38b363e9d Fixed subtle bug in Cash Spending when processing for same Issuer with multiple refs. 2016-11-02 11:15:09 +00:00
Clinton Alexander
29e203315b Cordapps now correctly resolve dependencies. 2016-11-02 11:12:31 +00:00
Clinton Alexander
ad81ecf2f9 Merged in clint-todocleanup (pull request #432)
Removed unused files, cleaned up build scripts.
2016-11-02 11:06:10 +00:00
Rick Parker
847257c250 Merged in parkri-speed-up-integration-tests (pull request #434)
Speed up JDBCHashMapTestSuite by 3min on my laptop by avoiding Exposed table existence checks each time a map/table is created by re-using the map/sets across tests (after clear()-ing to reset their state).
2016-11-02 11:02:54 +00:00