Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge kit logistics docs #35

Merged
merged 108 commits into from
Aug 31, 2019
Merged

Conversation

PeterJCLaw
Copy link
Member

@PeterJCLaw PeterJCLaw commented Apr 28, 2019

Fixes #18 by merging from https://git.gitbook.com/srobo-legacy/student-robotics-kit-logistics.git (https://srobo-legacy.gitbooks.io/student-robotics-kit-logistics/)

@richardbarlow there wasn't a license in the original repo, am I ok to use this work under CC-BY-SA 4.0 (as with the rest of your contributions)?

gitbook-bot and others added 30 commits July 4, 2016 10:52
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Auto commit by GitBook Editor
Pipfile Outdated Show resolved Hide resolved
@PeterJCLaw
Copy link
Member Author

@trickeydan @RealOrangeOne thanks for your input. I've updated the dependencies so that it's not pointed at my github any more (though frankly that might actually be a nicer solution given the lack of movement from the upstream; see pugong/mkdocs-mermaid-plugin#5).

I'd like to get this in now, before we start a new SR year in earnest, and we can then iterate on it.

trickeydan
trickeydan previously approved these changes Aug 26, 2019
Copy link
Contributor

@trickeydan trickeydan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that we should get this in before the SR2020 cycle starts.

kierdavis
kierdavis previously approved these changes Aug 26, 2019
docs/kit/logistics/README.md Outdated Show resolved Hide resolved
docs/kit/logistics/asset-tracking.md Show resolved Hide resolved

1. Check all parts are present \(use list provided and notify the local teams coordinator of any missing items\).
2. Place parts into jiffy bags \(do not seal unless specified\):
1. Large white **\[photo of four bags with the parts in front\]:**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do the photos mentioned in this section exist, or are they TODOs?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See the "Return shipping pack instructions" listed in the manifest table above.

Co-Authored-By: Kier Davis <[email protected]>
@PeterJCLaw PeterJCLaw dismissed stale reviews from kierdavis via 2d8e00d August 31, 2019 13:25
---
# Kit Shipping

Part of the Kit Logistics Coordinator's responsibilities cover moving either whole or parts of kits around the UK and the world. This is generally referred to as shipping \(even though it rarely involves ships!\). All movement of kit is managed by the Kit Logistics Coordinator, so please do not ship anything without first speaking to them. You can contact them at: [[email protected]](mailto:[email protected]).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\(even though it rarely involves ships!\)

Is escaping these brackets necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, probably not.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, probably not, will fix.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RealOrangeOne
RealOrangeOne previously approved these changes Aug 31, 2019
Copy link
Member

@RealOrangeOne RealOrangeOne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The content here definitely needs updating, but for the sake of importing historical data, it looks good to me!

PeterJCLaw added a commit that referenced this pull request Aug 31, 2019
This merges the history from
https://git.gitbook.com/srobo-legacy/student-robotics-kit-logistics.git
(https://srobo-legacy.gitbooks.io/student-robotics-kit-logistics/)

This fixes #18.

While the orignial repo doesn't contain a license, Rich confirmed
in #35 (comment)
that he's happy for these contributions to be licensed under
CC-BY-SA 4.0.
@PeterJCLaw PeterJCLaw merged commit 39fd1e3 into srobo:master Aug 31, 2019
@PeterJCLaw PeterJCLaw deleted the merge-kit-logistics-docs branch August 31, 2019 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge in legacy kit-logistic docs
6 participants