Skip to content

Sync upstream: pull in the fully-built lesson catalog (403 commits) - #90

Closed
Wick2009 wants to merge 404 commits into
UGRC-CSA:mainfrom
Wick2009:sync/upstream-2026-09-22
Closed

Wick2009 wants to merge 404 commits into
UGRC-CSA:mainfrom
Wick2009:sync/upstream-2026-09-22

Conversation

@Wick2009

Copy link
Copy Markdown
Collaborator

Summary

  • Catches our fork up to Open-Coding-Society/pages main (403 commits behind → 0 behind).
  • This brings in the fully rebuilt Java lesson catalog for Units 1-4: LxD design-cycle sections, richer College Board + outside-academic references, interactive activities (comparison labs, sort-the-expression, bug-hunt MCQs), Popcorn/Homework Hacks, grading rubrics, and the standard assignment-submission footer — replacing what were mostly blank or minimal stub lessons.
  • One conflict, resolved by taking upstream's version: _projects/lessons/java/notebooks/2025-09-21-2.2.ipynb. The version merged in PR Write 2.2 Boolean Expressions lesson #86/Turn 2.2 Boolean Expressions examples into code-runner exercises #87 was a hand-built draft; upstream's version is the officially-evolved one built to the same template as every other now-complete lesson, so it supersedes ours.

Test plan

  • Reviewed cell counts across all _projects/lessons/java/notebooks/*.ipynb post-merge — nearly all units 1-4 lessons went from stub-level (1-6 cells) to fully built (15-42 cells)
  • Confirmed only one merge conflict, on the 2.2 lesson, and resolved it in favor of upstream's more complete version
  • Validated the resolved file's JSON

Scope note

Per request, this PR targets UGRC-CSA/Pages main only, for Akhil to review on our fork's deployed site — not forwarded to Open-Coding-Society/pages.

🤖 Generated with Claude Code

SpaceGirl13 and others added 30 commits September 18, 2026 10:19
Drops courses.csp.week so the lesson no longer appears as its own
standalone card in the Week 5 overview alongside Python Reference,
SASS Reference, etc. It stays discoverable via the Python Reference
page's own listing (site.categories.Python), and keeps its permalink.

Note: this also removes the two-pane sidebar/progress-bar lesson-player
UI from the lesson's own page, since that UI is driven by the same
courses.csp.week field.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Implement Mr Mortensen's Feedback Rev.2.
Sets microblog: true, matching the same shared component other
lessons (e.g. 3.12 Calling Procedures) already use. No custom code
needed - the panel is gated purely on this front-matter flag in
themes/minima/base.html.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Sets assignment: true, matching 3.14 Libraries (the one sibling
Python lesson with a verified working submission form) - not 3.12
Calling Procedures, which only has the microblog flag and no
submission button at all.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Indira-Viswesh and others added 27 commits September 21, 2026 21:31
Revisions of HW and add submission link
Updated Conditionals to notebook and further changes
Final edits to 3.03 Math Expressions Lesson
# Conflicts:
#	_projects/lessons/java/notebooks/2025-09-21-2.2.ipynb
@Wick2009

Copy link
Copy Markdown
Collaborator Author

Closing — this pulled in all units, but Unit 2 is our team's only scope. Redoing as a Unit-2-only sync.

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.