Commit Graph

2810 Commits

Author SHA1 Message Date
Andrius Dagys
ad5d6f5cd4 DistributedImmutableMapTest: enable copycat client connection retry to avoid race conditions 2016-12-01 13:21:25 +00:00
Andrius Dagys
cef2c906ab Minor transaction verification logic refactoring 2016-12-01 12:07:37 +00:00
Joel Dudley
3a52a3aa66 Merge pull request #11 from corda/jvmNameUtils
Adds a JvmName annotation to Utils.kt for better java interop.
2016-12-01 11:49:29 +00:00
Joel Dudley
110864f19a Adds a JvmName annotation to Utils.kt for better java interop. 2016-12-01 11:31:03 +00:00
Andrius Dagys
053dd9a1fe Merge pull request #5 from corda/composite-key-serializer 2016-12-01 10:17:40 +00:00
Matthew Nesbit
a976045675 Merge pull request #9 from corda/mnesbit-gradle-no-install-builds
Change gradle to not need an install step before build
2016-11-30 17:12:19 +00:00
Matthew Nesbit
03c4968b4a Merge pull request #4 from corda/mnesbit-fix-sandbox-unit-test-cleanup
Fix file cleanup of sandbox unit tests on Windows machines.
2016-11-30 17:11:25 +00:00
Andrius Dagys
ea04ebe311 Added a TODO to follow Crypto-conditions spec 2016-11-30 17:07:39 +00:00
Matthew Nesbit
e54a304e2e Depend upon an internal artifact, rather than a maven local published artifact when building the corda fatjar. 2016-11-30 16:16:51 +00:00
Matthew Nesbit
8f47d393ca Fix file cleanup of sandbox unit tests on Windows machines.
Use try with resources to close stream after file copy.
2016-11-30 16:13:40 +00:00
Clinton
e873347892 Merge pull request #8 from corda/clint-javahomefix
Fix an error in runnodes when running on Linux
2016-11-30 16:06:15 +00:00
Clinton Alexander
73fafa60f0 Bumped to the newest version of the gradle plugins. 2016-11-30 15:45:04 +00:00
Clinton Alexander
1f88d0fa76 Updated plugin versions. 2016-11-30 15:44:09 +00:00
Clinton Alexander
74ea6ab0df Fixed runnodes when JAVA_HOME is not set. 2016-11-30 15:43:27 +00:00
Mike Hearn
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
Mike Hearn
d500bf8f50 Address review comments. 2016-11-30 15:11:35 +00:00
Mike Hearn
7b40be8361 Run the IntelliJ reformatter across the Kotlin code. Did not reformat JS/web code. 2016-11-30 14:40:34 +00:00
Andrius Dagys
acaeca5814 Added a custom CompositeKey serializer for a more compact serialized form 2016-11-30 14:18:18 +00:00
Roger Willis
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
Roger Willis
e219eb53e8 Merge pull request #1 from BitcoinErrorLog/patch-1
Updates for grammar
2016-11-30 10:50:53 +00:00
Bitcoin Error Log
16c3bdf2b0 Updates for grammar
Bullets items that aren't sentences don't need periods. Missing hyphens.
2016-11-30 05:45:59 -05:00
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