Commit Graph

2761 Commits

Author SHA1 Message Date
Mike Hearn
d87e027bd6 Merged in mike-warn-about-ij-bug (pull request #584)
Docs: warn about IntelliJ issue that causes .idea to be wiped at import time
2016-11-29 16:08:17 +00:00
Andrius Dagys
d92ccb0f80 Added a placeholder for M6 release notes 2016-11-29 16:06:07 +00:00
David Lee
28ecea9ad8 Merged in license-info (pull request #562)
Amended LICENSE and added TRADEMARK file per guidance from R3 legal counsel.
2016-11-29 16:00:44 +00:00
Mike Hearn
e4ee1b51e6 Docs: warn about IntelliJ issue that causes .idea to be wiped at import time 2016-11-29 15:53:35 +00:00
Andrius Dagys
296d93fbd9 Merged in andrius-change-copyright (pull request #570) 2016-11-29 15:35:18 +00:00
Matthew Nesbit
df6fc69cc6 Merged in mnesbit-building-transactions (pull request #571)
Created some examples to include in tutorial on building transactions.
2016-11-29 15:15:32 +00:00
Rick Parker
55b10644dd Merged in parkri-oracle-docs (pull request #559)
Update and add oracles documentation
2016-11-29 15:12:09 +00:00
rick.parker
c3e8a9eb19 Doc updates for oracles 2016-11-29 15:09:38 +00:00
Clinton Alexander
dea7b39734 Merged in colljos-docs-rpctutorial (pull request #581)
RPC Tutorial: re-instated gradle main class name.
2016-11-29 15:02:37 +00:00
Clinton Alexander
426bae625a Fixed most duplicate dependencies between cordapps and the corda.jar. 2016-11-29 15:00:02 +00:00
Matthew Nesbit
4a504ca3dc Created some examples to include in tutorial on building transactions.
Complete the transaction building doc with code fragments.

Fix gradle build

Handle PR comments

Put back in missing main class line

Couple of minor improvements from PR
2016-11-29 14:50:20 +00:00
David Lee
a636d9e5b8 Changed url to https
Signed-off-by: David Lee <david.lee@r3cev.com>
2016-11-29 14:48:48 +00:00
Andrius Dagys
b73116ff1b Merged in docsite-theme-fix (pull request #578) 2016-11-29 14:48:33 +00:00
Andrius Dagys
4012d4b136 Docs: added an explanation on how to specify a custom service name. Added a ref for composite keys section. 2016-11-29 14:46:05 +00:00
Jose Coll
ee2a60f345 RPC Tutorial: re-instated gradle main class name. 2016-11-29 14:30:22 +00:00
Clinton Alexander
c3c0b4b25a Added a fix for the duplicat log4j bindings. 2016-11-29 14:18:01 +00:00
Roger Willis
b3e5bede39 Merged in rog-cordapp-tutorial (pull request #490)
First pass on Corda SDK tutorial
2016-11-29 13:47:08 +00:00
RogerWillis
9c9691ae77 Addressed review points. Added a stub file in the getting started section that indicates devs should look at the cordapp tutorial. 2016-11-29 13:45:58 +00:00
Jose Coll
373f332dec Merged in colljos-docs-rpctutorial (pull request #560)
RPC Tutorial doc update
2016-11-29 12:46:02 +00:00
Jose Coll
83d4e71280 Merge branch 'colljos-docs-rpctutorial' of https://bitbucket.org/R3-CEV/r3prototyping into colljos-docs-rpctutorial 2016-11-29 12:41:24 +00:00
Jose Coll
690336b2e0 Incorp feedback from PR review. 2016-11-29 12:38:47 +00:00
Jose Coll
4aae92046d Removed Key Concept docs. 2016-11-29 12:38:47 +00:00
Jose Coll
d8c485aca9 Fixed formatting problems. 2016-11-29 12:38:47 +00:00
Jose Coll
066aacad85 Updated RPC Tutorial docs and gradle file. 2016-11-29 12:38:47 +00:00
Jose Coll
f3f016720d First draft 2016-11-29 12:38:01 +00:00
Jose Coll
4d80d5fc2e Removed Key Concept docs. 2016-11-29 12:38:01 +00:00
Jose Coll
92102e0157 Fixed formatting problems. 2016-11-29 12:38:01 +00:00
Jose Coll
909b4dccad Updated RPC Tutorial docs and gradle file. 2016-11-29 12:37:40 +00:00
Jose Coll
07aeec9f6f First draft 2016-11-29 12:35:41 +00:00
Andrius Dagys
f3e6b7b528 Format docsite css 2016-11-29 12:01:48 +00:00
Katarzyna Streich
0a95928e0c Merged in kstreich-clause-docs (pull request #552)
docs: Add clauses documentation.
2016-11-29 12:01:27 +00:00
Andrius Dagys
869324bfd1 Fixed docsite theme mobile view. Minor tweak to the headers 2016-11-29 12:00:11 +00:00
Katarzyna Streich
e10b199ae1 Add clauses documentation. 2016-11-29 11:53:54 +00:00
Andras Slemmer
ba84ce7358 Merged in aslemmer-integtest-docs (pull request #553)
docs: Add integration test tutorial
2016-11-29 11:47:27 +00:00
Mike Hearn
8aafeabd01 Regen docsite 2016-11-29 11:38:52 +00:00
Mike Hearn
3325985a49 Docsite: minor fixes 2016-11-29 11:37:13 +00:00
Mike Hearn
ac93eb3cd6 Revert "docs: Use find to get all src directories for dokka"
This reverts commit 3a10d504d3.
2016-11-29 11:37:12 +00:00
Andrius Dagys
8e836bc279 Distributed notary: configure Raft client retry to avoid race conditions 2016-11-29 11:07:22 +00:00
Mike Hearn
7776693235 Merged in mike-commit-sandbox-code (pull request #479)
Import JVM sandbox code from r3sandbox repository
2016-11-29 11:04:42 +00:00
Mike Hearn
7aa20dfbe4 Move sandbox code into the experimental module to reflect its status 2016-11-29 10:59:13 +00:00
Mike Hearn
03f3c82e2c Sandbox: make the README clearer about how little review this code has received yet. 2016-11-29 10:59:12 +00:00
Mike Hearn
674e345ba2 Move the sandbox code to net.corda 2016-11-29 10:59:11 +00:00
Mike Hearn
2f02e56893 Import sandbox code developed by Ben Evans with review and contributions from myself. 2016-11-29 10:59:09 +00:00
Mike Hearn
fe5df11b23 Tweak experimental README 2016-11-29 10:30:49 +00:00
Clinton Alexander
531e04235b Disabled options that do not have a valid curve against them to avoid demo entering an invalid state. 2016-11-29 10:15:59 +00:00
Mike Hearn
64e241896e Tech white paper: improve Merkle tree diagrams and rerender 2016-11-29 10:05:32 +00:00
Clinton Alexander
c0a2f0a81f Improved SIMM demo readme and removed references to Vega. 2016-11-29 10:01:36 +00:00
Jose Coll
d4fe796f56 Incorp feedback from PR review. 2016-11-29 09:41:50 +00:00
Andrius Dagys
9aca65bdce Merged in andrius-doc-tweak (pull request #572) 2016-11-29 09:34:42 +00:00
Andrius Dagys
4c6625559f Merged in andrius-dep-cleanup (pull request #569) 2016-11-28 18:28:28 +00:00