Raniere Silva [Wed, 11 Apr 2018 10:11:49 +0000 (11:11 +0100)]
Merge pull request #224 from fmichonneau/update-gh-labels
Update repo_check.py with new GitHub labels
François Michonneau [Mon, 9 Apr 2018 20:07:20 +0000 (16:07 -0400)]
update github labels
François Michonneau [Mon, 9 Apr 2018 20:06:44 +0000 (16:06 -0400)]
check hex color using lowercase
Raniere Silva [Thu, 22 Mar 2018 19:21:39 +0000 (19:21 +0000)]
Improve language on CONTRIBUTING file
As @marwahaha said
> "master repository" feels overloaded,
> since typically "master" refers to a branch name.
We are going to use "originating repository".
Raniere Silva [Thu, 22 Mar 2018 19:17:17 +0000 (19:17 +0000)]
Update Trademark
Close #211
Raniere Silva [Thu, 22 Mar 2018 19:13:00 +0000 (19:13 +0000)]
Add swc-releases to _includes/links
Close #217
Raniere Silva [Mon, 19 Mar 2018 09:14:12 +0000 (09:14 +0000)]
Merge pull request #219 from katrinleinweber/patch-2
Fix source of typo #646
Katrin Leinweber [Mon, 19 Mar 2018 07:11:15 +0000 (08:11 +0100)]
Fix source of typo #646
Raniere Silva [Mon, 5 Mar 2018 11:10:12 +0000 (11:10 +0000)]
Merge pull request #214 from katrinleinweber/resolve-DOIs-securely
Link DOIs to preferred resolver
Katrin Leinweber [Sat, 3 Mar 2018 12:01:39 +0000 (13:01 +0100)]
Link DOIs to preferred resolver
Raniere Silva [Wed, 28 Feb 2018 12:10:39 +0000 (12:10 +0000)]
Merge pull request #213 from ErinBecker/update-coc
Remove out-of-date CoC language
Erin Becker [Tue, 27 Feb 2018 23:29:55 +0000 (15:29 -0800)]
Remove out-of-date CoC language
Raniere Silva [Mon, 19 Feb 2018 16:17:53 +0000 (16:17 +0000)]
Merge pull request #203 from swcarpentry/fix-svg
fix svg files
Raniere Silva [Mon, 19 Feb 2018 16:10:30 +0000 (16:10 +0000)]
Fix issue with CSS
Raniere Silva [Fri, 16 Feb 2018 13:42:42 +0000 (13:42 +0000)]
Merge pull request #209 from rgaiacs/gh-pages
Related with lesson-example/pull/172
Andrew Sanchez [Thu, 15 Feb 2018 20:51:04 +0000 (13:51 -0700)]
Requested changes
Raniere Silva [Thu, 15 Feb 2018 10:50:48 +0000 (10:50 +0000)]
Merge pull request #206 from rgaiacs/gh-pages
Fix broken link for Contact
Raniere Silva [Thu, 15 Feb 2018 10:49:12 +0000 (10:49 +0000)]
Fix broken link for Contact
Raniere Silva [Wed, 14 Feb 2018 17:38:20 +0000 (17:38 +0000)]
Merge pull request #205 from rgaiacs/gh-pages
Add current year to copyright of workshop footer
jcoliver [Wed, 10 Jan 2018 18:15:19 +0000 (11:15 -0700)]
Add current year to copyright of workshop footer
Raniere Silva [Wed, 14 Feb 2018 17:31:23 +0000 (17:31 +0000)]
Merge pull request #188 from wclose/update_lesson_initialize
Updated lesson_initialize
Raniere Silva [Wed, 14 Feb 2018 17:29:00 +0000 (17:29 +0000)]
Merge pull request #202 from rgaiacs/gh-pages
Fix CSS to use .language-X class
François Michonneau [Mon, 12 Feb 2018 20:52:11 +0000 (15:52 -0500)]
fix svg files
Raniere Silva [Tue, 30 Jan 2018 13:49:00 +0000 (13:49 +0000)]
Merge pull request #200 from mawds/commentgenerated
Advise users not to edit .md files generated from .Rmd files
David Mawdsley [Tue, 30 Jan 2018 10:08:00 +0000 (10:08 +0000)]
Implement using @naupaka 's suggestions
Raniere Silva [Mon, 29 Jan 2018 11:29:15 +0000 (11:29 +0000)]
Fix CSS to use .language-X class
David Mawdsley [Thu, 25 Jan 2018 09:38:50 +0000 (09:38 +0000)]
Insert comment in YAML header advising not to edit
Raniere Silva [Thu, 21 Dec 2017 10:13:15 +0000 (10:13 +0000)]
Merge pull request #196 from katrinleinweber/patch-1
secure hyperlinks to pre-empt server-side HTTPS redirects
Katrin Leinweber [Wed, 20 Dec 2017 11:50:31 +0000 (12:50 +0100)]
pre-empt server-side redirects
William L. Close [Thu, 7 Dec 2017 02:31:30 +0000 (21:31 -0500)]
Made minor revision to order of information
Reorganized description of process for contributing to clarify/increase readability
William L. Close [Thu, 7 Dec 2017 02:20:27 +0000 (21:20 -0500)]
Made requested revisions to lesson_initialize
Changed the keyword for emailing from 'contact' to 'email' per https://github.com/swcarpentry/styles/issues/178 and changed the description for how to use GitHub to reflect usage of the web interface.
Raniere Silva [Fri, 1 Dec 2017 10:38:52 +0000 (10:38 +0000)]
Fix problem with {% link reference.md %}
Raniere Silva [Fri, 24 Nov 2017 00:14:27 +0000 (00:14 +0000)]
Merge pull request #193 from rgaiacs/gh-pages
Fix bin/lesson_initialize.py
Raniere Silva [Fri, 24 Nov 2017 00:02:07 +0000 (00:02 +0000)]
Fix bin/lesson_initialize.py
If _extras/figures.md exists,
$ ./bin/lesson_initialize.py
will return
Warning: _extras/figures.md already exists.
**Exiting without creating files.**
Raniere Silva [Thu, 23 Nov 2017 08:55:23 +0000 (08:55 +0000)]
Copy _extras/figures.md from lesson example
Raniere Silva [Thu, 23 Nov 2017 08:22:52 +0000 (08:22 +0000)]
Port changes from workshop
Raniere Silva [Thu, 23 Nov 2017 08:20:23 +0000 (08:20 +0000)]
Port changes from workshop
Raniere Silva [Sun, 19 Nov 2017 20:34:48 +0000 (20:34 +0000)]
Rename _includes/lc/syllabys.html to _includes/lc/syllabus.html
Close #150
Raniere Silva [Sun, 19 Nov 2017 20:27:33 +0000 (20:27 +0000)]
Fix usage instruction at bin/workshop_check.py
Close #152.
Raniere Silva [Thu, 16 Nov 2017 22:50:01 +0000 (22:50 +0000)]
Merge pull request #192 from rgaiacs/syntax-highlight
Syntax highlight
Raniere Silva [Thu, 16 Nov 2017 22:38:49 +0000 (22:38 +0000)]
Remove check for all_figures.html now that we are using Javascript
Raniere Silva [Thu, 16 Nov 2017 22:31:07 +0000 (22:31 +0000)]
Fix validation for syntax highlight
Raniere Silva [Thu, 16 Nov 2017 22:16:26 +0000 (22:16 +0000)]
Change bin/chunk-options.R to use .language-r instead of r
naught101 [Thu, 16 Nov 2017 22:46:57 +0000 (22:46 +0000)]
Enable syntax highlighting
Based on https://github.com/swcarpentry/lesson-example/pull/144/files
Raniere Silva [Wed, 15 Nov 2017 18:23:00 +0000 (18:23 +0000)]
Fix broken link
Close https://github.com/swcarpentry/lesson-example/issues/145.
William L. Close [Tue, 7 Nov 2017 21:31:26 +0000 (16:31 -0500)]
Updated lesson_initialize
Clarified instructions for using GitHub to contribute, altered link for [issues] to direct to GitHub page on navigating issues to avoid FIXME issue with link when initializing, removed link to master repo to avoid FIXME issue with link when initializing. These suggestions were based on a pull request initially done elsewhere swcarpentry/shell-novice#639
Raniere Silva [Tue, 7 Nov 2017 16:30:34 +0000 (16:30 +0000)]
Fix root YAML variable in bin/lesson_initialize.py
Close #186
Raniere Silva [Sun, 5 Nov 2017 10:05:53 +0000 (10:05 +0000)]
Fix email as keyword in bin/lesson_check.py
Raniere Silva [Sun, 5 Nov 2017 10:01:05 +0000 (10:01 +0000)]
Merge pull request #185 from rgaiacs/178
Adopt email instead of contact as keyword
Raniere Silva [Sun, 5 Nov 2017 09:59:48 +0000 (09:59 +0000)]
Adopt email instead of contact as keyword
Close #178
Raniere Silva [Sun, 5 Nov 2017 09:31:10 +0000 (09:31 +0000)]
Merge pull request #184 from rgaiacs/styles-js-load-images
Replace extract_figures.py with Javacript
Raniere Silva [Sun, 5 Nov 2017 09:29:51 +0000 (09:29 +0000)]
Replace extract_figures.py with Javacript
Demo at https://github.com/swcarpentry/lesson-example/pull/132/.
Raniere Silva [Sun, 5 Nov 2017 09:00:47 +0000 (09:00 +0000)]
Merge pull request #165 from brandoncurtis/keyboard-keys
add keyboard key style
Raniere Silva [Sun, 5 Nov 2017 08:58:11 +0000 (08:58 +0000)]
Merge pull request #183 from rgaiacs/gh-pages
Fix concept-maps link
Raniere Silva [Sun, 5 Nov 2017 08:57:09 +0000 (08:57 +0000)]
Fix concept-maps link
Close #176
Raniere Silva [Sun, 5 Nov 2017 08:55:47 +0000 (08:55 +0000)]
Merge pull request #182 from rgaiacs/gh-pages
Fix github-importer link
Raniere Silva [Sun, 5 Nov 2017 08:53:46 +0000 (08:53 +0000)]
Fix github-importer link
Close #177
Raniere Silva [Sun, 5 Nov 2017 08:38:21 +0000 (08:38 +0000)]
Merge pull request #181 from rgaiacs/styles-offline
Add "Offline" Capable
Raniere Silva [Sun, 5 Nov 2017 08:36:25 +0000 (08:36 +0000)]
Add "Offline" Capable
This is based on https://github.com/swcarpentry/lesson-example/pull/127/.
Raniere Silva [Wed, 11 Oct 2017 16:21:24 +0000 (17:21 +0100)]
Merge pull request #174 from IanLee1521/fix-episode-nav-wrapping
Fix episode nav wrapping
Ian Lee [Wed, 11 Oct 2017 15:30:17 +0000 (08:30 -0700)]
Pull left / right arrows in episode nav to outside of row
Ian Lee [Wed, 11 Oct 2017 15:29:41 +0000 (08:29 -0700)]
Converted to `col-xs-*` from `col-md-*` classes for navbar div
By doing this, when a page is heavily zoomed in (e.g. 500%) the navbar
icons stay in the same row, rather than breaking onto two different rows.
Raniere Silva [Wed, 6 Sep 2017 07:35:50 +0000 (08:35 +0100)]
Merge pull request #169 from jsta/patch-1
Load methods package
Joseph Stachelek [Tue, 5 Sep 2017 18:21:19 +0000 (14:21 -0400)]
Load methods package
Building `md` from `Rmd` in a script like this will break if the `methods` package is not called and the code includes class object routines. See https://github.com/r-spatial/sf/issues/478
Brandon Curtis [Mon, 28 Aug 2017 18:20:30 +0000 (11:20 -0700)]
use <kbd></kbd> for keyboard keys
SWC uses block inline attribute lists for e.g. code blocks, but I think this HTML tag is much simpler and more understandable than <pre>*Enter*{:.keyboard} ...</pre>
Brandon Curtis [Fri, 18 Aug 2017 05:51:23 +0000 (22:51 -0700)]
add keyboard key style
Raniere Silva [Tue, 8 Aug 2017 10:18:04 +0000 (11:18 +0100)]
Merge pull request #163 from mawds/sortfigs
Output episode figures in correct order
David Mawdsley [Tue, 8 Aug 2017 09:29:39 +0000 (10:29 +0100)]
Sort HTML_DST output
David Mawdsley [Tue, 8 Aug 2017 09:17:50 +0000 (10:17 +0100)]
Sort episodes before producing figures
Raniere Silva [Fri, 14 Jul 2017 10:34:14 +0000 (11:34 +0100)]
Merge pull request #159 from rgaiacs/lc-svg-logo
Add Library Carpentry SVG logo
Raniere Silva [Fri, 14 Jul 2017 10:32:02 +0000 (11:32 +0100)]
Update Library Carpentry logo
Raniere Silva [Thu, 6 Jul 2017 09:42:15 +0000 (10:42 +0100)]
Add Library Carpentry SVG logo
Raniere Silva [Wed, 5 Jul 2017 09:14:48 +0000 (10:14 +0100)]
Merge pull request #158 from rgaiacs/fix-logo-nav
Fix logo at navbar
Raniere Silva [Wed, 5 Jul 2017 09:10:58 +0000 (10:10 +0100)]
Fix logo at navbar
by run
~~~
$ find _includes -type f -exec sed -i "s/page.carpentry/site.carpentry/g" {} \;
$ find _layouts -type f -exec sed -i "s/page.carpentry/site.carpentry/g" {} \;
$ find _extras -type f -exec sed -i "s/page.carpentry/site.carpentry/g" {} \;
$ find _episodes -type f -exec sed -i "s/page.carpentry/site.carpentry/g" {} \;
$ find bin -type f -exec sed -i "s/page.carpentry/site.carpentry/g" {} \;
$ find assets -type f -exec sed -i "s/page.carpentry/site.carpentry/g" {} \;
~~~
Raniere Silva [Wed, 5 Jul 2017 09:00:07 +0000 (10:00 +0100)]
Merge pull request #157 from rgaiacs/155
Unify Library Carpentry logo
Raniere Silva [Wed, 5 Jul 2017 08:58:54 +0000 (09:58 +0100)]
Unify Library Carpentry logo
Close #155
Raniere Silva [Tue, 4 Jul 2017 08:45:55 +0000 (09:45 +0100)]
Merge pull request #156 from jnothman/patch-1
Link LC as for SWC and DC
Joel Nothman [Tue, 4 Jul 2017 05:07:12 +0000 (15:07 +1000)]
Link LC as for SWC and DC
Raniere Silva [Sun, 18 Jun 2017 07:57:19 +0000 (08:57 +0100)]
Handler for collaborative_notes
See https://github.com/swcarpentry/workshop-template/issues/410
Raniere Silva [Wed, 10 May 2017 10:05:10 +0000 (11:05 +0100)]
Revert "Remove CONDUCT.md since it should be generate by bin/lesson_initialize.py"
This reverts commit
1e56203d492a1a13d86756fb5e9d754ed2cae0f8.
Raniere Silva [Sat, 6 May 2017 09:19:56 +0000 (10:19 +0100)]
Fix bug with Python script
Raniere Silva [Sat, 6 May 2017 09:07:40 +0000 (10:07 +0100)]
Remove CONDUCT.md since it should be generate by bin/lesson_initialize.py
Raniere Silva [Sat, 6 May 2017 08:45:55 +0000 (09:45 +0100)]
Remove extra link to Library Carpentry
Raniere Silva [Sat, 6 May 2017 08:26:10 +0000 (09:26 +0100)]
Merge pull request #149 from rgaiacs/styles-print
Add all in one lesson build with Javascript
Raniere Silva [Tue, 2 May 2017 10:41:18 +0000 (11:41 +0100)]
Add all in one lesson build with Javascript
Raniere Silva [Sat, 6 May 2017 08:14:39 +0000 (09:14 +0100)]
Merge pull request #148 from rgaiacs/show-challenges
Make challenges and discussion visibles
Raniere Silva [Sat, 6 May 2017 08:12:36 +0000 (09:12 +0100)]
Make challenges and discussion visibles
This is based on
https://github.com/swcarpentry/instructor-training/pull/437/files and
https://github.com/swcarpentry/instructor-training/pull/439/files,
both write by @ErinBecker.
Raniere Silva [Sat, 6 May 2017 08:04:42 +0000 (09:04 +0100)]
Merge pull request #147 from rgaiacs/update-coc
Updated CONDUCT.md
Raniere Silva [Sat, 6 May 2017 08:03:26 +0000 (09:03 +0100)]
Updated CONDUCT.md
Rebased of https://github.com/swcarpentry/lesson-example/pull/116/.
Thanks to @tracyteal.
Raniere Silva [Sat, 6 May 2017 07:51:00 +0000 (08:51 +0100)]
Merge pull request #143 from ErinBecker/gh-pages
Suggest template language
Raniere Silva [Sat, 6 May 2017 07:50:26 +0000 (08:50 +0100)]
Merge pull request #142 from rgaiacs/styles-library-carpentry
Add Library Carpentry to the workshop template
Raniere Silva [Fri, 5 May 2017 06:59:40 +0000 (07:59 +0100)]
Merge pull request #146 from fmichonneau/check-version-checkpoint
make sure that checkpoint version is 0.4.0 or higher
Francois Michonneau [Thu, 4 May 2017 15:58:52 +0000 (11:58 -0400)]
make sure that checkpoint version is 0.4.0 or higher
Raniere Silva [Tue, 2 May 2017 09:08:20 +0000 (10:08 +0100)]
Merge pull request #145 from fmichonneau/fix-checkpoint
fix swcarpentry/lesson-example#118: use checkpoint::scanForPackages
Francois Michonneau [Sat, 29 Apr 2017 22:26:45 +0000 (18:26 -0400)]
fix swcarpentry/lesson-examples#118: use checkpoint::scanForPackages
ErinBecker [Tue, 25 Apr 2017 20:36:15 +0000 (13:36 -0700)]
Suggest template language
Raniere Silva [Tue, 4 Apr 2017 07:02:53 +0000 (08:02 +0100)]
Add Library Carpentry to the workshop template
Includes @drjwbaker's description of Library Carpentry.
Raniere Silva [Tue, 14 Mar 2017 14:25:35 +0000 (14:25 +0000)]
Merge pull request #139 from rgaiacs/improve-wording
Improve wording on syllabus.html
Raniere Silva [Tue, 14 Mar 2017 14:22:16 +0000 (14:22 +0000)]
Improve wording on syllabus.html
As suggested by @gcapes.
Raniere Silva [Fri, 3 Mar 2017 21:37:47 +0000 (21:37 +0000)]
Merge pull request #138 from swcarpentry/revert-129-dt-ids
Revert "ensure dt elements have an id set"