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.
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"
Raniere Silva [Fri, 3 Mar 2017 21:37:22 +0000 (21:37 +0000)]
Revert "ensure dt elements have an id set"
Raniere Silva [Fri, 3 Mar 2017 21:08:11 +0000 (21:08 +0000)]
Merge pull request #137 from rgaiacs/styles-numbering
Numbering the lessons in the schedule
Raniere Silva [Sat, 18 Feb 2017 17:14:20 +0000 (17:14 +0000)]
Numbering the lessons in the schedule
Related with https://github.com/swcarpentry/styles/issues/80.
Raniere Silva [Fri, 3 Mar 2017 21:04:32 +0000 (21:04 +0000)]
Merge pull request #136 from rgaiacs/styles-edit-on-github
Edit on GitHub
Raniere Silva [Fri, 3 Mar 2017 20:52:49 +0000 (20:52 +0000)]
Fix issue with link to GitHub from RMarkdown files
Jekyll doesn't export the _episodes_rmd so we need to flag the files.
Each Rmd file must have in the YAML header
source: Rmd
Raniere Silva [Fri, 3 Mar 2017 20:44:12 +0000 (20:44 +0000)]
Adopt @lexnederbragt suggestion for Edit link
https://github.com/swcarpentry/lesson-example/pull/104#issuecomment-
283310978
Raniere Silva [Fri, 3 Mar 2017 20:42:00 +0000 (20:42 +0000)]
Change Edit on GitHub link to edit page
Raniere Silva [Thu, 23 Feb 2017 17:22:53 +0000 (17:22 +0000)]
Add link to Edit on GitHub
Raniere Silva [Thu, 2 Mar 2017 22:03:07 +0000 (22:03 +0000)]
Merge pull request #135 from rgaiacs/106
Update copyright year with current year
Raniere Silva [Thu, 2 Mar 2017 22:01:47 +0000 (22:01 +0000)]
Update copyright year with current year
Raniere Silva [Sat, 18 Feb 2017 18:05:42 +0000 (18:05 +0000)]
Merge pull request #133 from rgaiacs/styles-round-corners
Improve round corners on block input and output
Raniere Silva [Sat, 18 Feb 2017 17:49:06 +0000 (17:49 +0000)]
Improve round corners on block input and output
Raniere Silva [Sat, 18 Feb 2017 17:57:35 +0000 (17:57 +0000)]
Merge pull request #132 from rgaiacs/table
Make tables wider
Raniere Silva [Sat, 18 Feb 2017 17:56:38 +0000 (17:56 +0000)]
Make tables wider
Close https://github.com/swcarpentry/styles/issues/101.
Raniere Silva [Sat, 18 Feb 2017 17:04:36 +0000 (17:04 +0000)]
Merge pull request #129 from neon-ninja/dt-ids
ensure dt elements have an id set
Raniere Silva [Sat, 18 Feb 2017 17:04:22 +0000 (17:04 +0000)]
Merge pull request #127 from rgaiacs/fix-syllabus
Fix layout of syllabus table
Raniere Silva [Sat, 18 Feb 2017 17:01:39 +0000 (17:01 +0000)]
Merge pull request #109 from gvwilson/adding-jquery-debugging
Adding JQuery debugging
Raniere Silva [Wed, 8 Feb 2017 17:41:00 +0000 (17:41 +0000)]
Merge pull request #117 from maxim-belkin/patch-2
Visually separate inline code blocks
Raniere Silva [Sat, 4 Feb 2017 14:28:41 +0000 (14:28 +0000)]
Merge pull request #126 from gvwilson/consolidating-links
Checking consolidated links
Nick Young [Tue, 31 Jan 2017 21:19:36 +0000 (10:19 +1300)]
Add javascript comments to the dt-ids snippet
Nick Young [Tue, 31 Jan 2017 04:10:48 +0000 (17:10 +1300)]
ensure dt elements have an id set
Raniere Silva [Tue, 24 Jan 2017 10:26:08 +0000 (10:26 +0000)]
Merge pull request #128 from wking/example-site-reference
bin/lesson_initialize.py: Remove 'example-site' reference
W. Trevor King [Mon, 23 Jan 2017 22:54:50 +0000 (14:54 -0800)]
bin/lesson_initialize.py: Remove 'example-site' reference
The consumer was removed by
079d7d50 (Updating contribution guidelines
in boilerplate, 2016-06-26).
Raniere Silva [Wed, 18 Jan 2017 22:50:09 +0000 (22:50 +0000)]
Enforce Bootstrap's 12 column layout
Raniere Silva [Wed, 18 Jan 2017 22:39:47 +0000 (22:39 +0000)]
Add multiday condition on _includes/syllabus.html
Raniere Silva [Wed, 18 Jan 2017 22:37:17 +0000 (22:37 +0000)]
Add missing class on _includes/syllabus.html
Greg Wilson [Wed, 18 Jan 2017 12:27:55 +0000 (07:27 -0500)]
Addition of link to setup had one too few columns.
Rev
7da36a56c0ee added a new row to the syllabus table with only 11 columns (instead of 12), which broke layout.
This fix adds the missing space.
Greg Wilson [Sun, 15 Jan 2017 20:02:34 +0000 (15:02 -0500)]
Checking consolidated links
Raniere Silva [Tue, 10 Jan 2017 13:21:22 +0000 (13:21 +0000)]
Merge pull request #123 from gvwilson/mentioning-library-carpentry
Including mention of Library Carpentry in include files
Greg Wilson [Tue, 10 Jan 2017 00:59:11 +0000 (19:59 -0500)]
Merging changes from other branches
Raniere Silva [Mon, 9 Jan 2017 23:47:24 +0000 (23:47 +0000)]
Merge pull request #119 from itcarroll/gh-pages
Knit episodes only when any one RMarkdown source changes
Raniere Silva [Mon, 9 Jan 2017 23:35:18 +0000 (23:35 +0000)]
Merge pull request #122 from gvwilson/commenting-includes
Adding comments on purposes of include files
Raniere Silva [Mon, 9 Jan 2017 23:34:13 +0000 (23:34 +0000)]
Merge pull request #121 from gvwilson/prev-next
Using page.previous and page.next for links instead of loop
Greg Wilson [Mon, 9 Jan 2017 20:15:58 +0000 (15:15 -0500)]
Including mention of Library Carpentry in include files
Greg Wilson [Mon, 9 Jan 2017 20:14:44 +0000 (15:14 -0500)]
Adding comments on include files purposes
Greg Wilson [Mon, 9 Jan 2017 20:12:30 +0000 (15:12 -0500)]
Using page.previous and page.next for links instead of loop
Raniere Silva [Mon, 9 Jan 2017 13:02:15 +0000 (13:02 +0000)]
Merge pull request #116 from maxim-belkin/patch-1
lesson.scss: 2em left padding for lists
Ian Carroll [Sat, 31 Dec 2016 01:49:20 +0000 (20:49 -0500)]
changes lesson-rmd target to lesson-md with new recipe