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

Gold standard, again! #2314

Merged
merged 149 commits into from
Dec 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
bfe9103
dot plots lesson (#2229)
retabak Oct 24, 2024
6ffdc45
dot plots draft, second half of lesson (#2229)
retabak Oct 25, 2024
d087e82
rename misnamed lesson (#2229)
retabak Oct 25, 2024
da70d1b
Merge branch 'master' into gold-standard
Nov 4, 2024
9ea5a13
measures of center (#2229)
retabak Nov 5, 2024
41d15c7
boxplot launch (#2198)
retabak Nov 5, 2024
11d7f2e
add scaffolding to box plot and histogram matching activity (#2260)
retabak Nov 5, 2024
be389d5
box plot minor adjustments (#2198)
retabak Nov 6, 2024
d0abf73
position letters in the top-left, relative to the lettering table @re…
Nov 6, 2024
6c200a0
minor fixes to measures of center
retabak Nov 6, 2024
dd5f0c9
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Nov 6, 2024
cc33e1a
fix merge conflict
retabak Nov 6, 2024
b5372bf
add pages folder
retabak Nov 8, 2024
19fc959
dot plots & variability lesson (#2259)
retabak Nov 8, 2024
58b7e0c
small mode(s) fix (see #2280)
flannery-denny Nov 10, 2024
c23efa1
update authoring files.
flannery-denny Nov 11, 2024
75aa1b8
create citations.json
retabak Nov 12, 2024
99aef18
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Nov 12, 2024
bee7e7f
update misconceptions.json (#2283)
retabak Nov 12, 2024
dcd52a1
variability json files update (#2259)
retabak Nov 13, 2024
51d2f3d
update objectives + dot plots lesson (#2259)
retabak Nov 15, 2024
a13c43a
update objectives (#2259)
retabak Nov 15, 2024
396d89e
fix objectives
retabak Nov 15, 2024
7b75209
expand directives in text field of objective files' JSON #2287
ds26gte Nov 17, 2024
69c0166
update objectives + dot plots (#2259)
retabak Nov 18, 2024
38585eb
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Nov 18, 2024
585a656
variability updates
retabak Nov 18, 2024
cdde795
make new variability lesson
retabak Nov 18, 2024
71962f4
rename dot plots lesson
retabak Nov 18, 2024
359d89a
rename variability two ways
retabak Nov 18, 2024
cb7be12
fix json error
retabak Nov 19, 2024
4a3d865
- Added directive @citation #2282
ds26gte Nov 20, 2024
f05aac0
add parentheses to in-text citations, and style the cursor to aid in …
Nov 20, 2024
d02fd13
move parentheses to CSS (#2282)
Nov 20, 2024
09e8ef7
fix broken json
retabak Nov 20, 2024
884f7d1
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Nov 20, 2024
d327a04
make json valid
retabak Nov 20, 2024
bad22ff
Have @citataion take 2nd arg for user-supplied in-text #2282
ds26gte Nov 20, 2024
173bc6c
@citation shdnt add parens -- leave decision to author #2282
ds26gte Nov 20, 2024
7f7efcd
moving around lesson pieces and images
retabak Nov 20, 2024
0642524
more moving and fixing stuff
retabak Nov 20, 2024
f892e0c
[lib] make @retabak happy (#2282)
Nov 20, 2024
91fe6fc
delete outliers wkst from histograms lesson
retabak Nov 20, 2024
74f1dc2
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Nov 20, 2024
0f56335
visualizing shape of data (#2261)
retabak Nov 22, 2024
156f032
variability updates (#2290)
retabak Nov 25, 2024
7ff5499
fix merge conflict
retabak Nov 25, 2024
c21e699
histograms updates (#2260)
retabak Nov 25, 2024
7ef5263
histogram updates
retabak Nov 26, 2024
283dacc
data science json
retabak Nov 26, 2024
1e7cf90
fix json file to be valid
retabak Nov 26, 2024
b163ea1
fix workbook-pages.txt
retabak Nov 26, 2024
6dbeb61
more histogram updates
retabak Nov 26, 2024
454b5c7
delete pages that were moved to a different lesson
retabak Nov 26, 2024
f52bc82
rename lesson
retabak Dec 2, 2024
dc8cb06
update citations
retabak Dec 2, 2024
6a63a8a
rename histograms 2
retabak Dec 2, 2024
c07679a
update names + related changes
retabak Dec 2, 2024
8f267aa
lots of work on histograms lessons
retabak Dec 2, 2024
0906bd0
histograms-interpret
retabak Dec 2, 2024
09ab926
histograms-interpret updates
retabak Dec 2, 2024
4c06bd5
rename visualizing lesson
retabak Dec 2, 2024
579fae6
add imgaes for histo card sort
retabak Dec 3, 2024
c38b610
reformat card sort
retabak Dec 3, 2024
7afc8a7
add images for dot plot + histo matching
retabak Dec 4, 2024
f57bd11
fix weird fiename issue
Dec 4, 2024
d8de441
add png to image file names
retabak Dec 4, 2024
d8e4283
fix merge conflict
retabak Dec 4, 2024
59632db
final (for now) revisions to dot plots lesson
retabak Dec 5, 2024
ab31278
getting close to finishing variability lesson!
retabak Dec 5, 2024
e2ea836
images for variability worksheet
retabak Dec 6, 2024
66215f9
variability lesson updates
retabak Dec 6, 2024
301b69a
rename two worksheets
retabak Dec 6, 2024
09ec426
variability last changes
retabak Dec 9, 2024
1e92851
histograms-visualize final changes
retabak Dec 9, 2024
1bfe71e
lots more little changes, added solutions
retabak Dec 10, 2024
222dd2f
merge from master, with conflicts fixed
Dec 10, 2024
91e4336
more MOC revisions and histograms-moc revisions
retabak Dec 10, 2024
ed21ab4
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Dec 10, 2024
5338559
resize images on histograms-moc
retabak Dec 10, 2024
33696db
delete histograms lesson
retabak Dec 10, 2024
079e205
delete old histograms-moc page in MOC lesson
retabak Dec 10, 2024
0ab86fd
flannery's MOC suggestions
retabak Dec 10, 2024
417a931
new worksheet for flannery
retabak Dec 11, 2024
79425ce
new image of buildings, improved
retabak Dec 11, 2024
b576b55
update workbook listing
retabak Dec 11, 2024
027143c
flannery's feedback
retabak Dec 11, 2024
dfb235b
update css style please @schanzer!
retabak Dec 11, 2024
fd7e442
flannery feedback
retabak Dec 11, 2024
1c80800
flannery feedback, split 1 page into 2
retabak Dec 11, 2024
8630d1d
finalizing flannery's feedback
retabak Dec 11, 2024
14e6114
fix formatting in dot-plots
Dec 11, 2024
ae50d73
Merge branch 'master' into gold-standard
Dec 11, 2024
96ccb76
Merge branch 'master' into gold-standard
Dec 12, 2024
2b4dcd1
Merge branch 'master' into gold-standard
flannery-denny Dec 12, 2024
ae1c9ee
update interpreting dot plots page (see #2314)
flannery-denny Dec 12, 2024
d4d494d
small change see #2314)
flannery-denny Dec 12, 2024
97b69f5
more dot plots updates (see #2314)
flannery-denny Dec 12, 2024
87235ad
Merge branch 'master' into gold-standard
flannery-denny Dec 12, 2024
4c0129e
Merge branch 'master' into gold-standard
Dec 13, 2024
e3528d6
better formatting for overlong page warnings
Dec 13, 2024
927646c
updates to variabiliy (see #2314)
flannery-denny Dec 13, 2024
a873477
remove unlikeability (see #2314)
flannery-denny Dec 13, 2024
18cca62
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
flannery-denny Dec 13, 2024
ffbd45c
update workbook page (see #2314)
flannery-denny Dec 13, 2024
641bca9
custom CSS rules
Dec 13, 2024
c9397de
small change to variability two ways spacing (see #2314)
flannery-denny Dec 13, 2024
2223117
resolve merge
flannery-denny Dec 13, 2024
81803f8
Update animal weight variability (see #2314)
flannery-denny Dec 17, 2024
ae9e9e5
revisions suggested by flannery
retabak Dec 17, 2024
be5504b
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Dec 17, 2024
d02c686
rename objective
flannery-denny Dec 17, 2024
b5ceeb7
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
flannery-denny Dec 17, 2024
baa1d34
change lesson section name (see #2314)
flannery-denny Dec 17, 2024
3af6c1b
refer to the page sections rather than question numbers in the lesson…
flannery-denny Dec 17, 2024
3921088
add central tendency to glossary (see #2316, #2314)
flannery-denny Dec 17, 2024
2cdc3d1
merge from master and fix conflicts (w/@flannery-denny)
Dec 17, 2024
78638de
adjust workbook page list (see #2314)
flannery-denny Dec 17, 2024
c1a95fe
data sets to dataset
flannery-denny Dec 17, 2024
84bcfec
improve making histograms (see #2314)
flannery-denny Dec 17, 2024
a42a4d8
adjust directions to refer to sections of page (see #2314)
flannery-denny Dec 17, 2024
660a075
fix typo
flannery-denny Dec 17, 2024
628c952
escape the ellipsis literal to prevent asciidoc from replacing it wit…
Dec 17, 2024
1a403a6
remove section-specific @duration{..} from all lessons
Dec 17, 2024
f248409
Merge branch 'master' into gold-standard
Dec 17, 2024
47ddf14
merge fixes from master
Dec 17, 2024
3b15d1f
measures-of-center data cycle should not require filters
Dec 18, 2024
54b83e3
merge fix
Dec 18, 2024
de05939
check out weird formatting @schanzer
retabak Dec 18, 2024
6de4423
merge fix
Dec 18, 2024
3cd72d3
experiment to improve FillVerticalSpace mimicry of asciidoc tables
Dec 18, 2024
83297a4
Merge branch 'master' into gold-standard
Dec 18, 2024
32206c8
Merge branch 'master' into gold-standard
Dec 18, 2024
5ad43b7
include missing desmos assessment link (see #2314)
flannery-denny Dec 18, 2024
5a66bff
flannery feedback
retabak Dec 18, 2024
ef40347
revisions for flannery
retabak Dec 18, 2024
7de9296
histogram visualize updates (see #2314)
flannery-denny Dec 19, 2024
876a0f3
bin size updates (See #2314)
flannery-denny Dec 19, 2024
975efa9
update histograms variablity page (see #2314)
flannery-denny Dec 19, 2024
07d2879
fix 2-page warnings
retabak Dec 19, 2024
b901309
respond to flannery feedback
retabak Dec 19, 2024
e3b0b24
more small updates
retabak Dec 19, 2024
4746426
add preparation sectino re: chart paper activity
retabak Dec 19, 2024
0deee6f
resolve merge (see #2314)
flannery-denny Dec 19, 2024
4223668
add histogram problem to lesson for flannery
retabak Dec 19, 2024
05c4f07
Merge branch 'gold-standard' of github.com:bootstrapworld/curriculum …
retabak Dec 19, 2024
964c31f
actually fix json error!
retabak Dec 19, 2024
1ab04df
address warnings
flannery-denny Dec 19, 2024
78a5e93
address more warnings
flannery-denny Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename dot plots lesson
retabak committed Nov 18, 2024
commit 71962f4488bbccf92022ec308a7cd14ce88143a1
File renamed without changes.