This repository was archived by the owner on Jan 22, 2020. It is now read-only.
Add Chapter 2 contents (#45) #70
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Aug 18, 2018
tkuhrt
reviewed
Aug 20, 2018
|
|
||
| || | ||
| |:--:| | ||
| |*Licensed under [CC By 4.0](https://creativecommons.org/licenses/by/4.0/)*| |
Contributor
There was a problem hiding this comment.
Can we replace this with the source?
Hyperledger Cello (Source: https://www.hyperledger.org/blog/2017/01/17/hyperledger-says-hello-to-cello)
tkuhrt
suggested changes
Aug 20, 2018
Contributor
tkuhrt
left a comment
tkuhrt
left a comment
There was a problem hiding this comment.
One minor change requested. This looks really good, Nathalie. Thanks for your hard work on this. Once the minor change is completed, I will merge this.
tkuhrt
approved these changes
Aug 21, 2018
Contributor
|
Just like the other PR, I am going to hold off on merging this until we get the branch issue resolved. Otherwise, this PR looks good. |
ryjones
force-pushed
the
import-edx-content
branch
from
9b79ea5 to
be9ab02
Compare
Squashing a few commits from edx-issue45 together into a single commit: ==== Populate content from Chapter 2 of edX course. Chapter 2 is Introduction to Hyperledger. ==== Incorporate feedback to PR hyperledger-archives#62 for Issue hyperledger-archives#45 For images, add Licensed under CC By 4.0 with link. For videos with "some rights reserved", remove it. Replace a., b. with 1., 2. to get indented sub-#s. Update Hyperledger Burrow link. Remove source of Hyperledger Cello image because of CC By 4.0. Signed-off-by: nathalie-ckc <nathalie.ckc.123@gmail.com>
Replace CC license line with source of Hyperledger Cello diagram. Signed-off-by: nathalie-ckc <nathalie.ckc.123@gmail.com>
nathalie-ckc
force-pushed
the
edx-issue45-v2
branch
from
3d48f2c to
034def9
Compare
Author
Contributor
|
LGTM |
atc-vince
added a commit
to atc-vince/education
that referenced
this pull request
Sep 1, 2018
Signed-off-by: atc-vince <atchyperledger@gmail.com> Implemented requested revisions from review on Aug 23 Signed-off-by: atc-vince <atchyperledger@gmail.com> Implemented changes from review Add Chapter 2 contents (hyperledger-archives#45) (hyperledger-archives#70) * Add Chapter 2 contents (hyperledger-archives#45) Signed-off-by: nathalie-ckc <nathalie.ckc.123@gmail.com> Add edX content for Iroha chapter (hyperledger-archives#48) (hyperledger-archives#71) * Add edX content for Iroha chapter (hyperledger-archives#48) Added contents from edX Course Chapter 5. Signed-off-by: nathalie-ckc <nathalie.ckc.123@gmail.com> Fixed video links in Chapter 3 Signed-off-by: atc-vince <atchyperledger@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Squashing a few commits from edx-issue45 together into a single commit:
====
Populate content from Chapter 2 of edX course.
Chapter 2 is Introduction to Hyperledger.
====
Incorporate feedback to PR #62 for Issue #45
For images, add Licensed under CC By 4.0 with link.
For videos with "some rights reserved", remove it.
Replace a., b. with 1., 2. to get indented sub-#s.
Update Hyperledger Burrow link.
Remove source of Hyperledger Cello image because of CC By 4.0.
Signed-off-by: nathalie-ckc nathalie.ckc.123@gmail.com