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

Reorder and adjust alignment #77

Merged
merged 11 commits into from
Dec 4, 2024
Merged

Conversation

ErinBecker
Copy link
Contributor

This PR represents discussion with @sheraaronhurt following our debrief on Instructor Trainer Training 2024. We've decided to reorder some of the segments to allow for better alignment of related content, add a few more interactive elements, and also add missing questions for some episodes. This PR is a work in progress.

Copy link

github-actions bot commented Oct 31, 2024

Thank you!

Thank you for your pull request 😃

🤖 This automated message can help you check the rendered files in your submission for clarity. If you have any questions, please feel free to open an issue in {sandpaper}.

If you have files that automatically render output (e.g. R Markdown), then you should check for the following:

  • 🎯 correct output
  • 🖼️ correct figures
  • ❓ new warnings
  • ‼️ new errors

Rendered Changes

🔍 Inspect the changes: https://github.com/carpentries/trainer-training/compare/md-outputs..md-outputs-PR-77

The following changes were observed in the rendered markdown documents:

 ..._discussion_questions.md => 01-introductions.md | 65 ++++++++++++----------
 ...iscussion_questions.md => 02-prior-knowledge.md | 13 ++---
 ...ek3_discussion_questions.md => 03-motivation.md |  8 +--
 04-week_4_discussion_questions.md => 04-mastery.md |  9 +--
 ...eek_6_discussion_questions.md => 05-feedback.md | 14 +++--
 05-week_5_discussion_questions.md (gone)           | 62 ---------------------
 06-code-of-conduct.md (new)                        | 62 +++++++++++++++++++++
 ...discussion_questions.md => 07-course-climate.md | 24 ++++----
 ..._7_discussion_questions.md => 08-live-coding.md | 26 +++++----
 ...discussion_questions.md => 09-how-we-operate.md | 19 ++++---
 ...10_discussion_questions.md => 10-conclusions.md | 11 ++--
 checkout.md (new)                                  | 54 ++++++++++++++++++
 config.yaml                                        | 11 +---
 md5sum.txt                                         | 23 ++++----
 14 files changed, 237 insertions(+), 164 deletions(-)
What does this mean?

If you have source files that require output and figures to be generated (e.g. R Markdown), then it is important to make sure the generated figures and output are reproducible.

This output provides a way for you to inspect the output in a diff-friendly manner so that it's easy to see the changes that occur due to new software versions or randomisation.

⏱️ Updated at 2024-11-21 19:44:51 +0000

@ErinBecker ErinBecker marked this pull request as draft October 31, 2024 23:10
github-actions bot pushed a commit that referenced this pull request Oct 31, 2024
github-actions bot pushed a commit that referenced this pull request Nov 7, 2024
@ErinBecker
Copy link
Contributor Author

Closing and reopening to hopefully trigger the new workflows to run.

@ErinBecker ErinBecker closed this Nov 14, 2024
@ErinBecker ErinBecker reopened this Nov 14, 2024
github-actions bot pushed a commit that referenced this pull request Nov 14, 2024
github-actions bot pushed a commit that referenced this pull request Nov 14, 2024
github-actions bot pushed a commit that referenced this pull request Nov 14, 2024
github-actions bot pushed a commit that referenced this pull request Nov 14, 2024
github-actions bot pushed a commit that referenced this pull request Nov 21, 2024
github-actions bot pushed a commit that referenced this pull request Nov 21, 2024
@ErinBecker ErinBecker marked this pull request as ready for review November 21, 2024 19:44
github-actions bot pushed a commit that referenced this pull request Nov 21, 2024
@sheraaronhurt sheraaronhurt merged commit de71aeb into carpentries:main Dec 4, 2024
3 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 4, 2024
Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Dec 4, 2024
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Dec 10, 2024
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Dec 17, 2024
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Dec 24, 2024
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Dec 31, 2024
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Jan 10, 2025
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Jan 21, 2025
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Jan 28, 2025
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Feb 4, 2025
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
github-actions bot pushed a commit that referenced this pull request Feb 11, 2025
Auto-generated via `{sandpaper}`
Source  : 05d5522
Branch  : md-outputs
Author  : GitHub Actions <[email protected]>
Time    : 2024-12-04 15:54:24 +0000
Message : markdown source builds

Auto-generated via `{sandpaper}`
Source  : de71aeb
Branch  : main
Author  : SherAaron Hurt <[email protected]>
Time    : 2024-12-04 15:53:36 +0000
Message : Merge pull request #77 from ErinBecker/reorder-2

Reorder and adjust alignment
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.

2 participants