search

hyperledger-archives / education

Hyperledger training material
https://wiki.hyperledger.org/display/LMDWG
Apache License 2.0
372 stars 360 forks source link

Add edX content for Iroha chapter (#48) #71

Closed nathalie-ckc closed 6 years ago

nathalie-ckc commented 6 years ago

Added contents from edX Course Chapter 5.

Based on feedback for another chapter, didn't include the "Some rights reserved" on videos and did add CC By 4.0 to the non-logo diagrams.

RocketChat logo was huge, so had to use img width constraint.

Signed-off-by: nathalie-ckc nathalie.ckc.123@gmail.com

tkuhrt commented 6 years ago

Since the Github and Rocket.Chat images will be used for multiple chapters, can we move these to the images subdirectory?

tkuhrt commented 6 years ago

Nathalie, these changes look good. There are a few issues with the repository, where people have committed things directly to the repo without appropriate DCOs. Until we get that resolved, I will hold off on merging the changes.

ghost commented 6 years ago

If the DCO exclusion involves any of my commits, I will look into this tomorrow.

nathalie-ckc commented 6 years ago

Updated my fork to remove the non-maintainer committed commits to match fixed import-edx-content (be9ab02) and re-based and force pushed back to my origin. That seems to have fixed my PR branch as well to just be mine on top of be9ab02.

ryjones commented 6 years ago

LGTM

tkuhrt commented 6 years ago

Resolves Issue #48