Commit Graph

3139 Commits

Author SHA1 Message Date
David Lee
6d5fa6ac2f Added link to discourse forum 2016-11-30 10:36:56 +00:00
David Lee
3928b1fa04 Added Corda logo from corda.net website 2016-11-30 09:30:07 +00:00
Roger Willis
5bfff845ab Update README.md
Updated link to LICENCE file.
2016-11-30 09:24:01 +00:00
David Lee
b2fe48aa22 Merged in license-info-2 (pull request #588)
Amended wording of trademark notice per advice from legal counsel.
2016-11-29 21:35:56 +00:00
David Lee
dc2b18cbbb Amended wording of trademark notice per advice from legal counsel.
Signed-off-by: David Lee <david.lee@r3cev.com>
2016-11-29 21:11:09 +00:00
Mike Hearn
f7eafaae19 Regen docsite 2016-11-29 20:49:25 +00:00
Mike Hearn
1323781a30 Docs: point to M6 docs from master branch warning 2016-11-29 20:49:14 +00:00
Mike Hearn
737d15de07 Minor: Remove broken image link in README 2016-11-29 20:18:25 +00:00
Mike Hearn
5ba9e7a396 Start M7 2016-11-29 20:15:24 +00:00
Clinton Alexander
82745bbbc9 Merged in clint-demofixes (pull request #577)
Improvements to SIMM demo
2016-11-29 19:07:18 +00:00
Mike Hearn
83328c3d23 Docs: minor sidebar fix 2016-11-29 19:03:13 +00:00
Mike Hearn
b4c0229ccc Regen docsite 2016-11-29 18:44:59 +00:00
Mike Hearn
c9b4755f55 Docsite: fix a few doc errors 2016-11-29 18:42:23 +00:00
Roger Willis
bac2fb3b98 Merged in rog-docsite-tweaks (pull request #587)
Minor docs tweaks:
2016-11-29 18:35:09 +00:00
RogerWillis
3ecf5b786a Minor docs tweaks:
* Removed "where-to-start" as it was old and will be replaced with the developing CorDapps page.
* Re-arranged the index page.
* Put the getting started fault finding page on the index (it wasn't referenced before).
* Deleted the "building cordapps" page as requested by Mike.
2016-11-29 18:31:28 +00:00
Matthew Nesbit
aa2076f976 Merged in mnesbit-unit-test-fix (pull request #586)
Read the balances off of the vault update.
2016-11-29 17:53:35 +00:00
Andrius Dagys
109ecffb02 Merged in release-notes-m6 (pull request #580) 2016-11-29 17:47:05 +00:00
Matthew Nesbit
9ba02b170b Read the balances off of the vault update. 2016-11-29 17:37:26 +00:00
Andrius Dagys
8f2d026965 M6 release notes 2016-11-29 17:27:25 +00:00
Richard Green
d5ba8a2382 Merged in rg_doc_updates_3a (pull request #582)
Starting new pull request - previous one had conflict errors
2016-11-29 17:21:35 +00:00
Richard Green
d8b5a8298c removed redundant text 2016-11-29 17:20:36 +00:00
Richard Green
010326721c removed redundant text 2016-11-29 17:15:23 +00:00
Richard Green
a1920ddddd removed erroneous space 2016-11-29 16:52:49 +00:00
Richard Green
34ea7f09af Starting new pull request - previous one had conflict errors 2016-11-29 16:52:07 +00:00
Richard Green
cced4fec85 Merged in rg_cli_intellij_gradle_docs (pull request #563)
Adding a CLI / IDE page
2016-11-29 16:33:44 +00:00
Richard Green
c9d6c4d8ee Adding a CLI / IDE page 2016-11-29 16:23:47 +00:00
Clinton Alexander
fb41300ce0 Merged in clint-dupedepsfix (pull request #583)
Fixed most duplicate dependencies between cordapps and the corda.jar.
2016-11-29 16:20:36 +00:00
Clinton Alexander
cc2b472947 Corrected version of the gradle plugins for publishing. 2016-11-29 16:16:15 +00:00
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