Commit Graph

82 Commits

Author SHA1 Message Date
325336e4c3 Merge commit 'adcd0d45dfd5433a70a551c49b5c828f13667606' into christians/os-merge-adcd0d4 2018-09-27 15:03:25 +01:00
8d5f5341e1 Docs: Add instructions for Fedora (#3986)
* Add setup instructions for `Fedora`

* Update `CONTRIBUTORS.md`
2018-09-27 12:05:44 +01:00
4708c62de4 Merge remote-tracking branch 'open/master' into os-merge-20180724
# Conflicts:
#	CONTRIBUTORS.md
#	docs/source/contributing.rst
#	docs/source/corda-configuration-file.rst
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	settings.gradle
2018-07-24 11:33:21 +01:00
b9efbaa228 CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)
* Fix TOC for HTML and PDF (Backport from Enterprise docs)

* Tidy up participate section

* Address review comments
2018-07-24 10:05:57 +01:00
168664f7a8 Merge remote-tracking branch 'open/master' into os-merge-20180722
# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/aws-vm-explore.rst
#	docs/source/azure-vm-explore.rst
#	docs/source/corda-networks-index.rst
#	docs/source/gcp-vm.rst
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
#	finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
#	finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-07-22 23:06:43 +01:00
cad684fbd3 Add Ubuntu environment setup instructions to docs/getting-set-up (#3608)
* remove network simulator references in docs

* Added environment setup instructions for Ubuntu

* Revert "Upstream merge"

This reverts commit db4920fa68, reversing
changes made to 208ac49da0.

* Address review comments
2018-07-20 11:55:32 +01:00
52eb5d76d3 Merge pull request #1272 from corda/parkri-os-merge-20180713-1
OS -> ENT merge
2018-07-13 18:05:29 +01:00
4e81d26985 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1 2018-07-13 13:15:53 +01:00
84d387c034 Fix "getting set up" link (#1270) 2018-07-13 13:09:55 +01:00
98117392db Stray full-stop 2018-07-12 17:52:16 +01:00
21754e4323 Removes reference to Discourse. (#3581) 2018-07-12 17:40:10 +01:00
d8cd83bf4f Removes duplicated instructions for running example CorDapp. (#3579) 2018-07-12 17:34:13 +01:00
12759831fe edit rsync and tar info (#1214)
* edit rsync and tar info

Edit rsync to copy repository into ~/.m2 so it overwrites the existing ~/.m2/repository rather than copy another repository sub-directory. Also, edit info on tar file to reflect that it's actually a tar.gz file and modify tar command to include -xvzf flags.

* Add word, compressed (@guyho)
2018-07-12 08:59:01 +01:00
f7cdf915df Merge remote-tracking branch 'remotes/open/master' into merges/july-10-15-51 2018-07-10 15:51:33 +01:00
fcbab670cf [CORDA-1727]: Document more clearly the supported version of IntelliJ and the IntelliJ Kotlin Plugins. (#3550) 2018-07-10 14:06:20 +01:00
9dd1717f71 [ENT-2241]: Fixed unclear getting set up instructions. (#1241) 2018-07-10 13:23:54 +01:00
2f4642e0fc ENT-1997 - Port doc changes for getting set up from release branch (#1207) 2018-07-05 14:04:01 +01:00
b09368a17a Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45
# Conflicts:
#	docs/source/getting-set-up.rst
#	docs/source/node-database.rst
2018-06-28 09:51:11 +01:00
8c956c004f Removes links to Corda source and templates (#3456) 2018-06-27 15:29:57 +01:00
b0946f0a97 [ENT-1994] Add documentation for operational node upgrades (#1036)
* Add documentation for operational node upgrades

* Add documentation for operational node upgrades

* Address review comments

* Some additional detail added after Richards comments

* Restructure page to make more logical sense
2018-06-25 17:35:11 +01:00
8b3a5432cb Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge 2018-06-23 00:06:11 +01:00
b9eb956c6e ENT-1463, ENT-1903: Document new minimum JDK version. (#3418) 2018-06-22 09:24:13 +01:00
8f225735ae Merge remote-tracking branch 'remotes/open/master' into bugs/os-2018-06-a590d5e 2018-06-11 14:10:57 +01:00
98e58b282c Resolved merge conflicts. 2018-06-11 13:40:38 +01:00
c5d44e3758 [ENT-1997]: Document Corda Enterprise set-up for CorDapp developers. (#950) 2018-06-11 13:28:42 +01:00
8128c7d93f ENT-2017: update ha guide to include warning about SMB 3.0 (#931)
* ENT-2017: update ha guide to include warning about SMB 3.0 and OS incompatibilities

* ENT-2017: address PR comments

* ENT-2017: replace old ha guide references with new ones
2018-06-11 11:06:49 +01:00
238dc477e3 Only 7 terminal windows appear (notary's was removed). (#3328) 2018-06-08 12:15:44 +01:00
4882e2e089 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605 2018-06-05 13:37:35 +01:00
086b9daa6e Updates the setup instructions to be IntelliJ 2018 compatibile. (#3299) 2018-06-05 10:57:29 +01:00
7bf6608c8e Fixes webport numbers based on recent build.gradle changes. (#3298) 2018-06-05 10:15:47 +01:00
61127fe65f Merge remote-tracking branch 'remotes/open/master' into merges/june-05-09-57 2018-06-05 09:58:28 +01:00
d989ae9dcc Stray backtick. 2018-06-04 23:20:26 +01:00
de0c69a888 Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt
#	node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
#	node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/DBTransactionStorageTests.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentStorageTest.kt
#	node/src/test/kotlin/net/corda/node/services/schema/HibernateObserverTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/PersistentUniquenessProviderTests.kt
#	node/src/test/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLogTests.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	node/src/test/kotlin/net/corda/node/utilities/ObservablesTests.kt
#	samples/irs-demo/cordapp/src/test/kotlin/net/corda/irs/api/NodeInterestRatesTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-05-29 17:17:08 +01:00
1c7b44fb3d Instructions for IntelliJ 2018.1 (#3250)
* Instructions for IntelliJ 2018.1

* Addresses review feedback
2018-05-29 16:51:28 +01:00
a5a860c52e First pass doc on the bridge.conf configuration file.
More doc work on bridge

Fixup docs with regard to HA changes discovered during testing

Link to bridge docs and add note about Zookeeper prerequisite.

Doc in progress

Add operating modes to overview doc

Change to BridgeInner from FloatInner

Add diagram to worked configuration section

Fix some typos and comments from PR reviews

Try to tidy up some of the wording.

Add new config properties and change to subsection headers for mode discussion
2018-05-17 08:52:49 +01:00
54e1a7aa7e Docs: fix some broken markup that caused rendering errors and warnings. 2018-05-11 13:02:40 +02:00
22d5967b9e Adds setting the PATH environment variable to the set-up instructions. 2018-04-26 15:50:17 +01:00
a7d0b124d2 Set up instructions no longer rely on Java installer in Mac (defaults to JDK 9). 2018-03-14 13:38:21 +00:00
85071f227a Reflects tutorial changes and CorDapp build docs changes from release-V1. 2017-11-16 15:31:52 +00:00
5bb4601812 Reflects V1.0 changes on Master re: internal samples and identity sync flow API. 2017-10-25 09:29:32 +01:00
0c2289de8c Joel move api docs 2017-10-09 11:32:03 +01:00
0b35a99c5a [CORDA-682]: Claim Jigsaw module names (#1824)
[CORDA-682] Specify Jigsaw module names for all JAR projects.
2017-10-06 15:37:33 +01:00
ef9b54327a Checking out the latest milestone will no longer be required. 2017-10-02 15:01:19 +01:00
4641d3c4dd Moves code sections in tutorials to code files. 2017-10-01 23:33:15 +01:00
246ab26d30 Properly escape backslashes in windows paths (#1556)
* fix some backslashes in the windows paths in the docs


This reverts commit 4532bca580.
2017-09-26 12:54:28 +01:00
54ad89e094 Removes hard-coded M12 references. (#1628) 2017-09-25 15:55:19 +01:00
17f7e39183 Makes set-up instructions clearer. Addresses a zsh-related bug. 2017-09-05 12:33:52 +02:00
e50052aeb1 Update getting-set-up.rst. 2017-08-30 13:20:11 +01:00
55a4264652 Error in folder name 2017-08-14 13:31:15 +01:00
3485827a90 Updates template links to indicate both versions. 2017-07-28 09:13:53 +01:00