Skip to content

Sync upstream: pull in Open-Coding-Society/pages main (58 commits) - #85

Merged
Wick2009 merged 59 commits into
UGRC-CSA:mainfrom
Wick2009:sync/upstream-2026-09-17
Sep 18, 2026
Merged

Wick2009 merged 59 commits into
UGRC-CSA:mainfrom
Wick2009:sync/upstream-2026-09-17

Conversation

@Wick2009

Copy link
Copy Markdown
Collaborator

Summary

  • Merges the 58 commits from Open-Coding-Society/pages main that were not yet present on UGRC-CSA/Pages main, catching our fork up to true upstream.
  • No conflicts during merge; includes the reorganized AP CSA lesson notebooks (e.g. _projects/lessons/java/notebooks/2025-09-21-2.1.ipynb and the rest of the unit_01–unit_04 set) plus other upstream CSP/lesson restructuring from this period.

Test plan

  • Merged source/main (Open-Coding-Society/pages) into a branch based on our fork's current main — clean merge, no conflicts
  • Verified _projects/lessons/java/notebooks/2025-09-21-2.1.ipynb and sibling unit_02 lessons are present and intact post-merge
  • Confirmed branch is 0 commits behind true upstream after the merge

🤖 Generated with Claude Code

Arnav210 and others added 30 commits September 14, 2026 12:24
Update Jarvis3000 Capstone Rendering Issues
Adds the Shoreline Community Services card (missing after the page
moved from _posts/capstone/2026-02-09-capstone_home.md to
navigation/capstone.md), pointing at the current post file and logo
asset.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…ne-card-navigation

add Shoreline capstone card to navigation/capstone.md
Rydenb and others added 29 commits September 16, 2026 19:31
Add lessons of booleans and random number generators
Create lesson on libraries and version 3.14 updates
…date/calling-procedures-lesson

Update lesson 3.12: Calling Procedures with modular function practice and code runner tasks
@Wick2009
Wick2009 merged commit e36e0da into UGRC-CSA:main Sep 18, 2026
2 checks passed
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.