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.

Sign up for GitHub

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

Jump to bottom

merge Alliance style 2022 #3

Open
wants to merge 553 commits into
base: gh-pages
Choose a base branch
from
Open

merge Alliance style 2022 #3

wants to merge 553 commits into from

Conversation

ostueker
Copy link
Member

This includes:

  • Alliance style
  • MathJax
  • Mermaid diagrams
  • Instructor view

Have a look at the "Author Guide" under Extras for more details

fmichonneau and others added 30 commits August 24, 2018 14:19
@fmichonneau
include base_path where needed
3a82dee
@katrinleinweber @fmichonneau
Reflect Apple's rebranding
2c90f2b 
See apple.com/macos
@fmichonneau
install remotes instead of failing if package not available
5c34d89
@fmichonneau
use quietly to avoid spurrious warnings
4100934
@tkphd @fmichonneau
spelling corrections using en_US dictionary
71ace0f
@fmichonneau
use github metadata to identify branch to use when editing files
feeb525
@fmichonneau
refactor to avoid errors when rendering locally
d32a598
@fmichonneau
edit comment
1ce8540
@brownsarahm
Merge branch 'gh-pages' into gh-pages
48b6ab3
@maxim-belkin @fmichonneau
Remove gh-variables from links.md
a9553db
@sdruskat
Fix carpentries/workshop-template#540
52f53e0
@rgaiacs
Merge pull request #359 from sdruskat/gh-pages
1f3c60f 
Fix carpentries/workshop-template#540
@katrinleinweber
Nudge contributors to specify episodes unambigously
f40a947 
See swcarpentry/r-novice-inflammation#401 > 3.
@raynamharris
mejore -> mejora
9b3d46a
@maxim-belkin
aio.md: fix indentation and variable declaration
c40e552
@ErinBecker
Merge pull request #366 from katrinleinweber/patch-3
a8fde65 
ISSUE_TEMPLATE.md: Nudge contributors to specify episodes unambigously
@rgaiacs
Merge pull request #368 from maxim-belkin/aio-fixes
9242afd 
aio.md: fix indentation and variable declaration
@maxim-belkin
links.md: Update link to Library Carpentry lessons
e67e9ab 
Pull Request: carpentries/styles#374
@rgaiacs
Merge pull request #13 from raynamharris/patch-3
a7566a9 
Update navbar.html
@fmichonneau
Add LC to instruction material section
55c136c
@fmichonneau
Add lc to conditions, comments, text
8871a8e
@fmichonneau
add cp as template option
cb4e249
@fmichonneau
Update to LC inclusive language
72c72b2
@fmichonneau
Include LC, Lesson Program date, update language
3018b07
@fmichonneau
Add LC condition
28599ae
@fmichonneau
Add Carpentries, LC site, issues
348a402
@fmichonneau
Update to inclusive language - roles
93a8400
@maxim-belkin
links.md: lesson-specific links
269bfb5
@maxim-belkin @fmichonneau
CONTRIBUTING.md: remove repetitive text
8a4dfc8
@fmichonneau
add meta tag for carpentry type
487c4b8
maxim-belkin and others added 28 commits March 18, 2021 17:17
@maxim-belkin
Makefile: silence Docker commands
39a32f6
@zkamvar
Merge pull request #561 from maxim-belkin/silence-docker-commands
588f2af 
Makefile: silence Docker commands
@fmichonneau
use Ruby's official GH Actions
ed77eda
@maxim-belkin
Makefile: use SHELL to call bin/knit_lesson.sh
b46187f
@maxim-belkin
Makefile: fix up PHONY targets
b1ca20a
@maxim-belkin
Fix GitHub actions for lessons in Rmarkdown
943c8d9 
Specifically, set CRAN repository to https://cran.rstudio.com
@zkamvar
Merge pull request #565 from maxim-belkin/attempt-to-fix-r-on-windows
13d218a 
Fix GitHub actions for lessons in Rmarkdown
@zkamvar
Merge pull request #563 from maxim-belkin/phony-targets
625c55e 
Makefile: fix up PHONY targets
@tobyhodges
Merge branch 'gh-pages' into image-with-shadow-class
d6c86ba
@tobyhodges
apply single shadow to image class
4df32a8
@tobyhodges
use grey shadow instead of transparent black
93dfc15
@tobyhodges
expand image-with-shadow selection
4b20368
@maxim-belkin
Merge pull request carpentries/styles#514
d0c90ee 
add class for images with a drop shadow
@maxim-belkin
Makefile: don't fail when Python isn't found
5a010ab
@maxim-belkin
Merge pull request carpentries/styles#566
50fd61f 
Makefile: don't fail when Python isn't found
@maxim-belkin
bin/dependencies.R: handle 'no packages were specified' error
1bad008 
Fixes the following issue:

```
$ make site
lib paths: /Library/Frameworks/R.framework/Versions/3.5/Resources/library
Error in install.packages(missing_pkgs, lib = lib, repos = repos) :
  no packages were specified
Calls: install_required_packages -> install.packages
Execution halted
make: *** [install-rmd-deps] Error 1
```
@zkamvar
Merge pull request #567 from maxim-belkin/no-missing-dependencies
4b3d44a 
bin/dependencies.R: handle 'no packages were specified' error
@ostueker
Merge remote-tracking branch 'upstream/gh-pages' into test_merge
0e139d7
@cgeroux
Fixed some warnings about syntax in liquid
660aa2f 
I got warnings about "|" in a logical expression in the liquid templating language. Looking up the syntax it appears they like to use "or" instead. Repleacing "|" with "or" seems to have resolved the warnings.
@ostueker
add support for Mermaid Graphs
3ce8d05
@ostueker
redo the favicons following the other Carpentries
5c5417e
@ostueker
add 'molmodsim' as primary alias for carpentry: 'bst'
be85156
@ostueker
update authors guide
6a8a210
@cgeroux
Added Fortran to list of known languages
ebe5c95
@ostueker
add Alliance branding
4788ea8
@ostueker
small improvements to LICENSE.md
902cf24
@ostueker
add instructor view
b9aa4f9
@ostueker
Merge updated style with Alliance branding 2022
04689d2
@ostueker ostueker changed the title Alliance style merge Alliance style 2022 Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.