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

Chore/styles #19

Merged
merged 70 commits into from
Apr 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
d1403e2
Merge pull request #1 from swcarpentry/gh-pages
ErinBecker Jan 30, 2018
c4b156f
translate CONDUCT.md
ErinBecker Feb 5, 2018
21c21ee
translate LICENSE.md
ErinBecker Feb 5, 2018
5726351
translate files
ErinBecker Feb 5, 2018
b7ba4cf
translate files
ErinBecker Feb 5, 2018
d5c0e67
translate files
ErinBecker Feb 5, 2018
0e7cafe
translate files
ErinBecker Feb 5, 2018
ad5b5b7
translate files
ErinBecker Feb 5, 2018
3b82499
translate files
ErinBecker Feb 5, 2018
feceb36
don't translate organization names
ErinBecker Feb 13, 2018
d09f7c1
Update CONDUCT.md
orchid00 Feb 20, 2018
85864b8
updated license
orchid00 Feb 20, 2018
a2b5962
Merge pull request #3 from orchid00/patch-2
ErinBecker Feb 20, 2018
6e6f4f3
Merge pull request #2 from orchid00/patch-1
ErinBecker Feb 20, 2018
418d8e0
[fix #1] bring in latest changes
fmichonneau Feb 23, 2018
84943b9
Merge pull request #2 from fmichonneau/latest-style
fmichonneau Feb 23, 2018
b2090c6
fix link referrence
fmichonneau Mar 13, 2018
f2e82c2
r reproducible
Mar 24, 2018
1d97bf2
r reproducible
Mar 24, 2018
28a7a10
r reproducible
Mar 24, 2018
4ff89a1
Merge pull request #5 from raynamharris/gh-pages
fmichonneau Mar 25, 2018
29bafe0
translate overview and teaching
Apr 4, 2018
a2f3222
change finish for Final
orchid00 Apr 11, 2018
cde1b63
Update schedule.html
PaoPrieto Apr 12, 2018
bcc8763
translate 'finish' to 'final
raynamharris Apr 13, 2018
1bc9da5
translate 'cite' to 'cita'
raynamharris Apr 13, 2018
d597cc2
Merge pull request #9 from raynamharris/patch-1
fmichonneau Apr 13, 2018
e48f14b
Merge pull request #10 from raynamharris/patch-2
fmichonneau Apr 13, 2018
1282bdf
Merge pull request #8 from PaoPrieto/patch-1
fmichonneau Apr 13, 2018
b708d2e
Merge pull request #7 from orchid00/patch-1
fmichonneau Apr 13, 2018
569f761
Merge pull request #6 from raynamharris/gh-pages
fmichonneau Apr 13, 2018
711dc0b
merge styles v9.5.2
fmichonneau Jun 19, 2018
555226b
Merge pull request #12 from carpentries/update-styles-v9.5.2
fmichonneau Jun 20, 2018
6745809
Update navbar.html
raynamharris Jul 6, 2018
9b3d46a
mejore -> mejora
raynamharris Nov 15, 2018
a7566a9
Merge pull request #13 from raynamharris/patch-3
rgaiacs Dec 3, 2018
53e9913
add default repository to install_required_packages() (#509)
zkamvar Oct 19, 2020
2c6b97e
Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages
fmichonneau Oct 20, 2020
11db6b0
add warning blockquote
fmichonneau Oct 7, 2020
f5940d9
Revert "Merge branch 'gh-pages' of github.com:carpentries/styles into…
fmichonneau Oct 20, 2020
efa2cc9
add warning code block
fmichonneau Oct 20, 2020
207d649
update expected reference filename (#508)
tobyhodges Oct 21, 2020
5b906e7
lesson.scss: no borders around unrecognized code (#510)
maxim-belkin Oct 22, 2020
462be1e
bump ruby version (as specified in github-pages v209)
fmichonneau Oct 28, 2020
941da2b
drop patch version, fix at v1
fmichonneau Oct 28, 2020
c97dc12
removing contractions from CONTRIBUTING (#512)
ChristinaLK Nov 2, 2020
209797f
_config.yml: mention Carpentries Incubator
maxim-belkin Nov 5, 2020
c4b6e23
Matlab -> MATLAB
tobyhodges Nov 9, 2020
00a1b93
Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages
klieret Nov 9, 2020
9fd93e4
Include curriculum banner by default
klieret Nov 9, 2020
ca16e0b
set CRAN url if default is "@CRAN@"
zkamvar Dec 2, 2020
32ab0d1
Fix Ruby style
maxim-belkin Nov 24, 2020
fdb264a
accept any base filename for Rmd episodes
tobyhodges Dec 8, 2020
ce79a4b
run R-based lessons in forks
zkamvar Dec 7, 2020
423bf57
add control structure
zkamvar Dec 7, 2020
d8f93f0
404 page for better learner experience
maxim-belkin Nov 24, 2020
2b523bc
lesson.scss: wildcard selectors for code blocks
maxim-belkin Nov 20, 2020
b3361a4
Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages
klieret Dec 16, 2020
a9ee294
Ignore .jekyll-metadata
klieret Dec 17, 2020
0c2a924
Set up to use allcontributors bot
klieret Dec 18, 2020
446f21c
Add allcontributors to readme
klieret Dec 18, 2020
6c1c161
Fix wrong location of authors include
klieret Dec 18, 2020
e1ba321
Add header to authors listing
klieret Dec 18, 2020
c6bb9e6
Update repo names
klieret Dec 18, 2020
a3ff7a8
Merge remote-tracking branch 'styles/gh-pages' into chore/styles
henryiii Dec 18, 2020
ecb6fa1
fix: update CI
henryiii Dec 18, 2020
39d2e36
fix: sync with master style
henryiii Dec 18, 2020
c64f8c8
fix: use TBA for now
henryiii Apr 12, 2021
2fabe25
ci: install boost from apt
henryiii Apr 12, 2021
bca5fb5
fix: support a couple of extra blockquote types
henryiii Apr 12, 2021
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
14 changes: 14 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"files": [
"README.md",
"_includes/authors.html"
],
"projectName": "test-module",
"projectOwner": "hsf-training",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true,
"contributors": [
],
"contributorsPerLine": 7
}
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,23 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.0
- uses: pre-commit/action@v2.0.2

test:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: jwlawson/actions-setup-cmake@v1.3
- uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: 3.14.6

- name: Install boost
run: |
sudo apt-get update
sudo apt-get install -y libboost-dev

- name: 00-intro
run: |
cp _includes/code/00-intro/CMakeLists.txt code/00-intro
Expand All @@ -41,7 +46,7 @@ jobs:

- name: 03-structure
run: |
cmake -S code/03-structure -B build-03-structure -DBOOST_ROOT=$BOOST_ROOT_1_72_0
cmake -S code/03-structure -B build-03-structure
cmake --build build-03-structure
./build-03-structure/apps/app
./build-03-structure/tests/testlib
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
check-template:
name: ${{ matrix.lesson-name }} (${{ matrix.os-name }})
if: github.repository == 'carpentries/styles'
if: github.repository == 'hsf-training/hsf-styles'
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand All @@ -33,9 +33,9 @@ jobs:
RSPM: 'https://packagemanager.rstudio.com/cran/__linux__/bionic/latest'
steps:
- name: Set up Ruby
uses: actions/setup-ruby@main
uses: actions/setup-ruby@v1
with:
ruby-version: '2.7.1'
ruby-version: '2.7'

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ on:
pull_request: []
jobs:
build-website:
if: github.repository != 'carpentries/styles' && (github.repository_owner == 'swcarpentry' || github.repository_owner == 'datacarpentry' || github.repository_owner == 'librarycarpentry' || github.repository_owner == 'carpentries')
if: ${{ !endsWith(github.repository, '/hsf-styles') }}
runs-on: ubuntu-latest
defaults:
run:
shell: bash
steps:
- name: Set up Ruby
uses: actions/setup-ruby@main
uses: actions/setup-ruby@v1
with:
ruby-version: '2.7.1'
ruby-version: '2.7'

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
.ipynb_checkpoints
.sass-cache
.jekyll-cache/
.jekyll-metadata
__pycache__
_site
.Rproj.user
Expand Down
25 changes: 25 additions & 0 deletions 404.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
layout: base
root: .
permalink: 404.html
title: "Page not found"
---

# Oops! We can't find that page.
{: style="text-align: center;"}

> ## Our apologies!
>
> We can't seem to find the page you're looking for.
> Try going back to the <a href="javascript:history.back()">previous page</a> or
> navigate to any other page using the navigation bar above
> {%- if site.kind == "lesson" -%} or the schedule below {%- endif -%}.
> If you got here by clicking on a link in the
> {%- if site.kind == "lesson" -%} lesson {%- else -%} workshop {%- endif -%},
> please report this link to the
> {%- if site.kind == "lesson" -%} lesson developers {%- else -%} workshop organizers {%- endif -%}.
{: .caution}

{% if site.kind == "lesson" %}
{% include syllabus.html %}
{% endif%}
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

# Synchronize with https://pages.github.com/versions
ruby '>=2.5.5'
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ workshop-check :
.PHONY : lesson-check lesson-md lesson-files lesson-fixme install-rmd-deps

# RMarkdown files
RMD_SRC = $(wildcard _episodes_rmd/??-*.Rmd)
RMD_SRC = $(wildcard _episodes_rmd/*.Rmd)
RMD_DST = $(patsubst _episodes_rmd/%.Rmd,_episodes/%.md,$(RMD_SRC))

# Lesson source files in the order they appear in the navigation menu.
Expand All @@ -115,7 +115,7 @@ HTML_DST = \
${DST}/conduct/index.html \
${DST}/setup/index.html \
$(patsubst _episodes/%.md,${DST}/%/index.html,$(sort $(wildcard _episodes/*.md))) \
${DST}/reference/index.html \
${DST}/reference.html \
$(patsubst _extras/%.md,${DST}/%/index.html,$(sort $(wildcard _extras/*.md))) \
${DST}/license/index.html

Expand Down
1 change: 1 addition & 0 deletions _episodes/09-findingpackages.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ hide extra text, or `REQUIRED` to cause a missing package to fail the configure
> ~~~bash
> export CMAKE_PREFIX_PATH=$HOME/software/hdf5-1.12.0:$HOME/software/boost-1.74.0:$CMAKE_PREFIX_PATH
> ~~~
{: .callout}

## FindPackage

Expand Down
3 changes: 1 addition & 2 deletions _extras/about.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
layout: page
title: About
permalink: /about/
---
{% include carpentries.html %}
{% include links.md %}
181 changes: 0 additions & 181 deletions _extras/customization.md

This file was deleted.

Loading