Skip to content

/ cs-unplugged

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

Image Representation Topic #1225

Merged
merged 28 commits into from Sep 2, 2019
Merged

Image Representation Topic #1225

merged 28 commits into from Sep 2, 2019
+313 −1

Conversation

@caitlind
Copy link
Contributor

caitlind commented Jul 22, 2019

Adds the new Image Representation topic.
Includes:

  • Unit Plan
  • Lesson 1, Colour by numbers, for ages 5-7 and 8-10 students
caitlind added 17 commits Jun 6, 2019
@caitlind
Set up basic folders, markdown files, and yaml configuration files fo…
Loading status checks…
c5fd9af 
…r the Image Representation topic. Added the Image Representation topic to structure.yaml
@caitlind
Added a temporary icon for image representation.
Loading status checks…
18c9313
@caitlind
Added general headings for image-rep unit plan and lesson 1. Began ad…
bc6d500 
…ding content to these.Added note about completing the binary numbers lesson first to the ima-rep introduction
@caitlind
Adding content to the image-rep unit plan and lesson 1
Loading status checks…
d25fbb1
@caitlind
Added content to image-rep unit plan and lesson 1
e7c68bf
@caitlind
Added images for image-rep lesson 1
Loading status checks…
706917a
@caitlind
Add classroom resources and resource notes panel
Loading status checks…
788a71f
@caitlind
Added lesson reflection to colour by numbers lesson
Loading status checks…
d5488fa
@caitlind
Writing Digital Technologies sections in image rep unit plan
5f3a361
@caitlind
Added real world implications section, and added compress to glossary
Loading status checks…
7a93ddd
@caitlind
Working on lesson 1
Loading status checks…
4089036
@caitlind
Adding content to lesson 1
ca16fcd
@caitlind
Working on lesson 1 content
Loading status checks…
6078990
@caitlind
Added three new 1 page image options to the pixel painter interactive
Loading status checks…
082e14a
@caitlind
Adding to lesson 1 and editing unit plan
Loading status checks…
be78bbe
@caitlind
Small content changes
Loading status checks…
5b37174
@caitlind
Unit plan and lesson 1 for ages 5-7 and 8-10 completed and ready for …
Loading status checks…
6f3197d 
…author review. Lesson content requires issue #1220 to be merged, otherwise it is innacurate where the pixel painter instructions are given.
@caitlind caitlind requested a review from timbellnz Jul 22, 2019
@JackMorganNZ JackMorganNZ self-requested a review Jul 22, 2019
@JackMorganNZ
JackMorganNZ requested changes Jul 22, 2019
View changes
Copy link
Member

JackMorganNZ left a comment

Great to see some new content. Various queries throughout, I didn't check the content of the PR (that's for @timbellnz), and it would be great to get @eAlasdair to review the content also (he's amazing with grammar/structure).

Also is csunplugged/static/img/topics/a_in_binary_code.png used anywhere?
csunplugged/topics/content/en/glossary/pixel.md Outdated Show resolved Hide resolved
...s/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Outdated Show resolved Hide resolved
...s/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Outdated Show resolved Hide resolved
...s/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Show resolved Hide resolved
csunplugged/topics/content/en/glossary/compress.md Outdated Show resolved Hide resolved
@caitlind caitlind requested a review from eAlasdair Jul 22, 2019
caitlind added 6 commits Jul 22, 2019
@caitlind
Sentences each moved to a new line in the .md files. No longer used i…
Loading status checks…
3e0c18f 
…mage removed from img/topics
@caitlind
Removed double newlines
Loading status checks…
cb2fec0
@caitlind
Merge branch 'develop' into content/image-rep
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
398ff29
@caitlind
Classroom resources moved to sidebar in the 'Colour by numbers' lesson
6f480a8
@caitlind
Merge branch 'content/image-rep' of https://github.com/uccser/cs-unpl…
Loading status checks…
c32f72f 
…ugged into content/image-rep
@caitlind
Changed the definition of 'compress' to one of 'compression'. Altered…
Loading status checks…
d95756a 
… wording to clarify the meaning
@eAlasdair
eAlasdair reviewed Jul 23, 2019
View changes
Copy link
Member

eAlasdair left a comment

As requested, I've looked through the PR for content/grammar/spelling. Because I don't know the project it's much harder to say one way is definitely correct over the other - so I'm leaving all of this as comments rather than requesting changes. Feel free to ignore anything that would be inconsistent, but otherwise, really good work! The explanations themselves are really easy to understand
csunplugged/topics/content/en/glossary/compress.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/glossary/compress.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/glossary/pixel.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/image-representation.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/image-representation.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/image-representation.md Outdated Show resolved Hide resolved
...s/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/unit-plan.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/unit-plan.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/unit-plan.md Outdated Show resolved Hide resolved
caitlind added 5 commits Jul 23, 2019
@caitlind
Grammar and spelling corrections. Removed printers from the definitio…
Loading status checks…
ad4754c 
…n of pixel
@caitlind
Grammar and spelling changes. Update to compression definition
Loading status checks…
9af9a2b
@caitlind
Replaced the 'a' character used for illustrating pixels in lesson 1 w…
Loading status checks…
6a4f99f 
…ith a 'C' character
@caitlind
Updated images of pixelated letters. Grammar changes
Loading status checks…
49a8575
@caitlind
Incorporated Tims edits
Loading status checks…
50792b7
@caitlind caitlind removed the request for review from timbellnz Jul 25, 2019
@eAlasdair
eAlasdair approved these changes Sep 2, 2019
View changes
Copy link
Member

eAlasdair left a comment

👍
@JackMorganNZ
JackMorganNZ approved these changes Sep 2, 2019
View changes
@caitlind caitlind merged commit 16f12af into develop Sep 2, 2019
5 checks passed
5 checks passed
codecov/patch Coverage not affected when comparing 2d1238d...50792b7
Details
codecov/project 100% remains the same compared to 2d1238d
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
pyup.io/safety-ci No dependencies with known security vulnerabilities.
Details
@JackMorganNZ JackMorganNZ deleted the content/image-rep branch Dec 16, 2019
@JackMorganNZ JackMorganNZ mentioned this pull request Dec 19, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JackMorganNZ JackMorganNZ

@eAlasdair eAlasdair

Assignees
No one assigned
Labels
author content: topics/unit plans/lessons
Milestone
No milestone
3 participants
@caitlind @JackMorganNZ @eAlasdair
You can’t perform that action at this time.