Commit Graph

2696 Commits

Author SHA1 Message Date
b2d2232e2b Merge pull request #6 from corda/mike-reformat
Run the IntelliJ reformatter across the Kotlin code.
2016-11-30 15:20:13 +00:00
d500bf8f50 Address review comments. 2016-11-30 15:11:35 +00:00
7b40be8361 Run the IntelliJ reformatter across the Kotlin code. Did not reformat JS/web code. 2016-11-30 14:40:34 +00:00
acaeca5814 Added a custom CompositeKey serializer for a more compact serialized form 2016-11-30 14:18:18 +00:00
4a9f5cafc1 Update README.md
Updated the 'getting started' section. It now points people to relevant repos, docs, etc.
2016-11-30 11:26:41 +00:00
e219eb53e8 Merge pull request #1 from BitcoinErrorLog/patch-1
Updates for grammar
2016-11-30 10:50:53 +00:00
16c3bdf2b0 Updates for grammar
Bullets items that aren't sentences don't need periods. Missing hyphens.
2016-11-30 05:45:59 -05:00
6d5fa6ac2f Added link to discourse forum 2016-11-30 10:36:56 +00:00
3928b1fa04 Added Corda logo from corda.net website 2016-11-30 09:30:07 +00:00
5bfff845ab Update README.md
Updated link to LICENCE file.
2016-11-30 09:24:01 +00:00
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
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
f7eafaae19 Regen docsite 2016-11-29 20:49:25 +00:00
1323781a30 Docs: point to M6 docs from master branch warning 2016-11-29 20:49:14 +00:00
737d15de07 Minor: Remove broken image link in README 2016-11-29 20:18:25 +00:00
5ba9e7a396 Start M7 2016-11-29 20:15:24 +00:00
82745bbbc9 Merged in clint-demofixes (pull request #577)
Improvements to SIMM demo
2016-11-29 19:07:18 +00:00
83328c3d23 Docs: minor sidebar fix 2016-11-29 19:03:13 +00:00
b4c0229ccc Regen docsite 2016-11-29 18:44:59 +00:00
c9b4755f55 Docsite: fix a few doc errors 2016-11-29 18:42:23 +00:00
bac2fb3b98 Merged in rog-docsite-tweaks (pull request #587)
Minor docs tweaks:
2016-11-29 18:35:09 +00:00
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
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
109ecffb02 Merged in release-notes-m6 (pull request #580) 2016-11-29 17:47:05 +00:00
9ba02b170b Read the balances off of the vault update. 2016-11-29 17:37:26 +00:00
8f2d026965 M6 release notes 2016-11-29 17:27:25 +00:00
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
d8b5a8298c removed redundant text 2016-11-29 17:20:36 +00:00
010326721c removed redundant text 2016-11-29 17:15:23 +00:00
a1920ddddd removed erroneous space 2016-11-29 16:52:49 +00:00
34ea7f09af Starting new pull request - previous one had conflict errors 2016-11-29 16:52:07 +00:00
cced4fec85 Merged in rg_cli_intellij_gradle_docs (pull request #563)
Adding a CLI / IDE page
2016-11-29 16:33:44 +00:00
c9d6c4d8ee Adding a CLI / IDE page 2016-11-29 16:23:47 +00:00
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
cc2b472947 Corrected version of the gradle plugins for publishing. 2016-11-29 16:16:15 +00:00
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
d92ccb0f80 Added a placeholder for M6 release notes 2016-11-29 16:06:07 +00:00
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
e4ee1b51e6 Docs: warn about IntelliJ issue that causes .idea to be wiped at import time 2016-11-29 15:53:35 +00:00
296d93fbd9 Merged in andrius-change-copyright (pull request #570) 2016-11-29 15:35:18 +00:00
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
55b10644dd Merged in parkri-oracle-docs (pull request #559)
Update and add oracles documentation
2016-11-29 15:12:09 +00:00
c3e8a9eb19 Doc updates for oracles 2016-11-29 15:09:38 +00:00
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
426bae625a Fixed most duplicate dependencies between cordapps and the corda.jar. 2016-11-29 15:00:02 +00:00
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
a636d9e5b8 Changed url to https
Signed-off-by: David Lee <david.lee@r3cev.com>
2016-11-29 14:48:48 +00:00
b73116ff1b Merged in docsite-theme-fix (pull request #578) 2016-11-29 14:48:33 +00:00
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
ee2a60f345 RPC Tutorial: re-instated gradle main class name. 2016-11-29 14:30:22 +00:00