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

STY: Sync Carpentries lesson template #16

Merged
merged 87 commits into from
Jan 28, 2021
Merged
Changes from 1 commit
Commits
Show all changes
87 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
bcb686d
GitHub Actions: check lesson template (#489)
maxim-belkin Aug 14, 2020
61db2b1
fix: tighten definitions of highlighter (#496)
henryiii Aug 19, 2020
33c71b1
add three more common languages (#497)
henryiii Aug 19, 2020
41d0e9a
remove unused code highlight classes (#498)
fmichonneau Aug 20, 2020
c1e8856
Sync styles first (#494)
fmichonneau Aug 22, 2020
99ecdf4
GitHub Actions: website (#488)
maxim-belkin Aug 25, 2020
6639d4b
GitHub Actions: better workflow and job names (#500)
maxim-belkin Aug 25, 2020
a8eee52
GitHub Action: website.yml: don't run in forks (#501)
maxim-belkin Sep 2, 2020
b11ce7f
GH Website action: rename + don't use lesson directory (#504)
maxim-belkin Sep 21, 2020
482c223
lesson.scss: styling for DIVs for embedding Youtube videos (#503)
maxim-belkin Sep 21, 2020
f53be37
update link to discuss mailing list (#507)
tobyhodges Oct 8, 2020
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
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
90c60ff
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
josephmje Dec 14, 2020
3efe669
Ignore .jekyll-metatada
klieret Dec 17, 2020
da99378
Speed up builds of R-based lessons
zkamvar Dec 17, 2020
a60a74a
No need for User Agent string
zkamvar Dec 17, 2020
7fd7d18
permissive checks for pre-alpha lessons
zkamvar Dec 18, 2020
9e641fd
bin/lesson_check.py: allow 'language-*' code blocks (#532)
tobyhodges Dec 21, 2020
acdbd1c
bin/lesson_check.py: allow 'caution' blockquote
maxim-belkin Dec 22, 2020
16e571e
Merge pull request #537 from maxim-belkin/caution-blockquote
zkamvar Dec 22, 2020
3d5f6b5
avoid ansi color characters from being printed
zkamvar Jan 6, 2021
627d1a1
deploy from "website" action
fmichonneau Dec 18, 2020
afb88e2
deploy R-based lessons without using another action
fmichonneau Dec 18, 2020
08e26e6
also delete _site
fmichonneau Dec 18, 2020
70e3484
include @zkamvar suggestions
fmichonneau Jan 6, 2021
951140e
pin ubuntu version to 20.04 (#540)
fmichonneau Jan 8, 2021
2cd3c9c
GitHub Actions: cache required R packages (#534)
fmichonneau Jan 8, 2021
c92e47c
add missing parenthesis
fmichonneau Jan 8, 2021
bfd8c00
Add incubator option for carpentry field. (#542)
tkphd Jan 11, 2021
99cffbd
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
josephmje Jan 14, 2021
740773a
.editorconfig: don't trim trailing spaces in markdown
unode Jan 27, 2021
5bc7724
lesson.scss: HTML block
maxim-belkin Jan 27, 2021
2d21e10
Merge remote-tracking branch 'styles/gh-pages' into sty/sync_styles
josephmje Jan 28, 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
Prev Previous commit
Next Next commit
r reproducible
raynamharris committed Mar 24, 2018
commit f2e82c2f2c3c049b8c2df77b67467859502c2a5f
28 changes: 27 additions & 1 deletion _includes/sc/syllabus.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="row">
<div class="col-md-6">
<h3 id="syllabus-shell">The Unix Shell</h3>
<h3 id="syllabus-shell">La Terminal de Unix</h3>
<ul>
<li>Archivos y directorios</li>
<li>History and tab completion</li>
@@ -10,6 +10,8 @@ <h3 id="syllabus-shell">The Unix Shell</h3>
<li>Encontrar cosas</li>
<li><a href="{{site.swc_pages}}/shell-novice/reference/">Referencia...</a></li>
</ul>

<!--
</div>
<div class="col-md-6">
<h3 id="syllabus-python">Programación en Python</h3>
@@ -24,6 +26,8 @@ <h3 id="syllabus-python">Programación en Python</h3>
<li><a href="{{site.swc_pages}}/python-novice-inflammation/reference/">Referencia...</a></li>
</ul>
</div>
-->

<!--
<div class="col-md-6">
<h3 id="syllabus-r">Programming in R</h3>
@@ -37,6 +41,24 @@ <h3 id="syllabus-r">Programming in R</h3>
</ul>
</div>
-->


<div class="col-md-6">
<h3 id="syllabus-r">https://swcarpentry.github.io/r-novice-gapminder-es/</h3>
<ul>
<li>Gestión de proyectos con RStudio</li>
<li>Explorando Data Frames</li>
<li>Creando gráficas con <code>ggplot</code></li>
<li>Creando y usando funciones</li>
<li>Manipulando dataframes con <code>dplyr</code> y <code>plyr</code></li>
<li>Escribiendo buen software</li>
<li><a href="{{site.swc_pages}}/r-novice-inflammation/reference/">Reference...</a></li>
</ul>
</div>




<!--
<div class="col-md-6">
<h3 id="syllabus-matlab">Programming in MATLAB</h3>
@@ -67,6 +89,7 @@ <h3 id="syllabus-git">Control de versiones con Git</h3>
<li><a href="{{site.swc_pages}}/git-novice/reference/">Referencia...</a></li>
</ul>
</div>

<!--
<div class="col-md-6">
<h3 id="syllabus-sql">Managing Data with SQL</h3>
@@ -83,6 +106,8 @@ <h3 id="syllabus-sql">Managing Data with SQL</h3>
</ul>
</div>
-->

<!--
<div class="col-md-6">
<h3 id="syllabus-r">Open Refine</h3>
<ul>
@@ -94,3 +119,4 @@ <h3 id="syllabus-r">Open Refine</h3>
</ul>
</div>
</div>
-->