François Michonneau [Thu, 20 Dec 2018 18:12:29 +0000 (13:12 -0500)]
update link for coc reporting
Raniere Silva [Wed, 19 Dec 2018 15:11:19 +0000 (15:11 +0000)]
Merge pull request #379 from maxim-belkin/lesson-links
links.md: lesson-specific links
Maxim Belkin [Wed, 12 Dec 2018 08:13:23 +0000 (02:13 -0600)]
knit_lessons.sh: require 2 inputs exactly
Maxim Belkin [Wed, 12 Dec 2018 08:14:08 +0000 (02:14 -0600)]
lesson_check.py: require _config.yml too
Maxim Belkin [Fri, 7 Dec 2018 20:55:51 +0000 (14:55 -0600)]
links.md: sync with downstream (lesson-example)
Maxim Belkin [Fri, 7 Dec 2018 22:54:49 +0000 (16:54 -0600)]
.travis.yml: use Python 3.7
Signed-off-by: Maxim Belkin <maxim.belkin@gmail.com>
François Michonneau [Thu, 6 Dec 2018 16:38:26 +0000 (11:38 -0500)]
add meta tag for carpentry type
Maxim Belkin [Mon, 3 Dec 2018 22:41:08 +0000 (22:41 +0000)]
CONTRIBUTING.md: remove repetitive text
Maxim Belkin [Tue, 4 Dec 2018 15:47:35 +0000 (09:47 -0600)]
links.md: lesson-specific links
Chris Erdmann [Sun, 2 Dec 2018 11:56:25 +0000 (03:56 -0800)]
Update to inclusive language - roles
Chris Erdmann [Sun, 2 Dec 2018 12:08:12 +0000 (04:08 -0800)]
Add Carpentries, LC site, issues
Chris Erdmann [Sun, 2 Dec 2018 12:27:15 +0000 (04:27 -0800)]
Add LC condition
Chris Erdmann [Sun, 2 Dec 2018 12:23:17 +0000 (04:23 -0800)]
Include LC, Lesson Program date, update language
Chris Erdmann [Sun, 2 Dec 2018 12:38:30 +0000 (04:38 -0800)]
Update to LC inclusive language
François Michonneau [Mon, 3 Dec 2018 14:14:52 +0000 (09:14 -0500)]
add cp as template option
Chris Erdmann [Sun, 2 Dec 2018 12:35:19 +0000 (04:35 -0800)]
Add lc to conditions, comments, text
Chris Erdmann [Sun, 2 Dec 2018 12:13:44 +0000 (04:13 -0800)]
Add LC to instruction material section
Chris Erdmann [Sun, 2 Dec 2018 21:06:22 +0000 (13:06 -0800)]
links.md: Update link to Library Carpentry lessons
Pull Request: carpentries/styles#374
Raniere Silva [Thu, 29 Nov 2018 23:15:31 +0000 (23:15 +0000)]
Merge pull request #368 from maxim-belkin/aio-fixes
aio.md: fix indentation and variable declaration
Erin Becker [Thu, 29 Nov 2018 22:00:54 +0000 (14:00 -0800)]
Merge pull request #366 from katrinleinweber/patch-3
ISSUE_TEMPLATE.md: Nudge contributors to specify episodes unambigously
Maxim Belkin [Thu, 29 Nov 2018 20:38:59 +0000 (14:38 -0600)]
aio.md: fix indentation and variable declaration
Katrin Leinweber [Wed, 14 Nov 2018 09:08:23 +0000 (10:08 +0100)]
Nudge contributors to specify episodes unambigously
See https://github.com/swcarpentry/r-novice-inflammation/issues/401 > 3.
Raniere Silva [Wed, 10 Oct 2018 08:45:10 +0000 (09:45 +0100)]
Merge pull request #359 from sdruskat/gh-pages
Fix https://github.com/carpentries/workshop-template/issues/540
Stephan Druskat [Wed, 10 Oct 2018 06:33:35 +0000 (08:33 +0200)]
Fix https://github.com/carpentries/workshop-template/issues/540
Maxim Belkin [Tue, 2 Oct 2018 16:29:03 +0000 (11:29 -0500)]
Remove gh-variables from links.md
Sarah Brown [Mon, 24 Sep 2018 16:12:33 +0000 (12:12 -0400)]
Merge branch 'gh-pages' into gh-pages
François Michonneau [Tue, 11 Sep 2018 14:03:09 +0000 (10:03 -0400)]
edit comment
François Michonneau [Mon, 27 Aug 2018 14:53:54 +0000 (10:53 -0400)]
refactor to avoid errors when rendering locally
François Michonneau [Fri, 24 Aug 2018 21:33:33 +0000 (17:33 -0400)]
use github metadata to identify branch to use when editing files
Trevor Keller [Wed, 29 Aug 2018 22:56:02 +0000 (18:56 -0400)]
spelling corrections using en_US dictionary
François Michonneau [Wed, 29 Aug 2018 20:37:41 +0000 (16:37 -0400)]
use quietly to avoid spurrious warnings
François Michonneau [Wed, 29 Aug 2018 20:21:17 +0000 (16:21 -0400)]
install remotes instead of failing if package not available
Katrin Leinweber [Mon, 27 Aug 2018 13:30:13 +0000 (15:30 +0200)]
Reflect Apple's rebranding
See apple.com/macos
François Michonneau [Fri, 24 Aug 2018 18:19:50 +0000 (14:19 -0400)]
include base_path where needed
Raniere Silva [Fri, 24 Aug 2018 15:41:47 +0000 (16:41 +0100)]
Merge pull request #345 from maxim-belkin/margin0
Code/callout/prereq/etc blocks: set left and right margins to 0
François Michonneau [Thu, 23 Aug 2018 23:02:03 +0000 (19:02 -0400)]
make relative_base_path available to syllabus
François Michonneau [Thu, 23 Aug 2018 21:22:03 +0000 (17:22 -0400)]
make sure relative_root_path is in scope in the episode navbar
François Michonneau [Thu, 23 Aug 2018 20:00:11 +0000 (16:00 -0400)]
use requirements package to find lesson dependencies
François Michonneau [Thu, 23 Aug 2018 19:49:40 +0000 (15:49 -0400)]
fix variable names
Maxim Belkin [Wed, 22 Aug 2018 19:58:07 +0000 (14:58 -0500)]
Clone images instead of creating new ones
François Michonneau [Thu, 23 Aug 2018 00:08:58 +0000 (20:08 -0400)]
Replace page.root (#310)
* replace page.root with 'base' variable that knows path level
* deal with case of trailing / in URL
* use link to figure out path for logos
* simplify path building for favicons
* baseurl isn't used in our template so it can removed
* use 'base' variable for path root instead of unecessary http request to
site.url
* replace page.root with 'base' variable that knows path level
* deal with case of trailing / in URL
* use link to figure out path for logos
* simplify path building for favicons
* baseurl isn't used in our template so it can removed
* use 'base' variable for path root instead of unecessary http request to
site.url
* rename variable, consolidate comments
* rename variable in template files
François Michonneau [Wed, 22 Aug 2018 19:28:49 +0000 (15:28 -0400)]
make figures a little larger and higher definition
Maxim Belkin [Wed, 22 Aug 2018 17:28:59 +0000 (17:28 +0000)]
figures.md: fixes and improvements
Pull Request carpentries/styles#330
Closes carpentries/styles#343
1. Fix the script so that all figures are displayed.
2. Add image numbers.
3. Don't add headers for episodes without images.
4. Add horizontal rulers to better separate adjacent images.
Don't add a ruler after the last image in the episode.
5. Add empty lines to `figures.md` to improve code readability.
6. Use classes for styling text and figures
Maxim Belkin [Wed, 22 Aug 2018 16:32:44 +0000 (11:32 -0500)]
Set left/right margins to 0
Maxim Belkin [Wed, 22 Aug 2018 16:20:01 +0000 (16:20 +0000)]
Adjust spacing of headers
Pull Request: carpentries/styles#327
François Michonneau [Tue, 21 Aug 2018 21:24:40 +0000 (17:24 -0400)]
change shell parameter to "$@"
François Michonneau [Tue, 21 Aug 2018 16:51:35 +0000 (12:51 -0400)]
update test checking src and dest are provided
jsta [Sun, 1 Jul 2018 14:23:24 +0000 (10:23 -0400)]
only knit rmd files to md if they have changed
Katrin Leinweber [Tue, 21 Aug 2018 16:02:31 +0000 (18:02 +0200)]
.editorconfig: code style guidelines for text editors
Pull Request: carpentries/styles#216
François Michonneau [Tue, 21 Aug 2018 14:12:02 +0000 (10:12 -0400)]
add missing <article> tags
François Michonneau [Tue, 21 Aug 2018 13:50:55 +0000 (09:50 -0400)]
upgrade version number
François Michonneau [Tue, 21 Aug 2018 13:45:12 +0000 (09:45 -0400)]
add lesson life cycle stage indicator
Maxim Belkin [Mon, 20 Aug 2018 18:18:04 +0000 (18:18 +0000)]
lesson.scss: center images
Pull Request: carpentries/styles#323
Raniere Silva [Wed, 15 Aug 2018 15:51:58 +0000 (16:51 +0100)]
Fix footer and copyright notice
Close carpentries/styles#325
Raniere Silva [Wed, 15 Aug 2018 16:20:42 +0000 (17:20 +0100)]
Merge pull request #340 from tracykteal/calendar
added workshop calendar
Raniere Silva [Wed, 15 Aug 2018 16:05:18 +0000 (17:05 +0100)]
Merge pull request #326 from carpentries/callout-margins
space out callout elements better
François Michonneau [Tue, 14 Aug 2018 21:58:44 +0000 (17:58 -0400)]
use site.github.url only in production
François Michonneau [Tue, 14 Aug 2018 14:58:33 +0000 (10:58 -0400)]
avoid warnings and errors around github metadata for local rendering
Tracy Teal [Mon, 6 Aug 2018 13:33:35 +0000 (09:33 -0400)]
added workshop calendar
Raniere Silva [Fri, 3 Aug 2018 07:34:33 +0000 (08:34 +0100)]
Merge pull request #338 from rgaiacs/336
Fix lesson_initialize.py to initialize new lessons
Raniere Silva [Fri, 3 Aug 2018 07:32:39 +0000 (08:32 +0100)]
Fix lesson_initialize.py to initialize new lessons
CODE_OF_CONDUCT.md is already at the root of the repository.
François Michonneau [Fri, 20 Jul 2018 13:14:44 +0000 (09:14 -0400)]
Merge pull request #334 from carpentries/add-surveys
Add surveys
François Michonneau [Fri, 20 Jul 2018 13:13:00 +0000 (09:13 -0400)]
[fix #332] add instructor training survey links
François Michonneau [Fri, 20 Jul 2018 13:09:25 +0000 (09:09 -0400)]
add LC survey links
Raniere Silva [Wed, 18 Jul 2018 08:31:32 +0000 (09:31 +0100)]
Merge pull request #333 from maxim-belkin/fix-makefile
Makefile: fix typo in clean-rmd rule
Maxim Belkin [Tue, 17 Jul 2018 21:53:56 +0000 (16:53 -0500)]
Makefile: fix typo in clean-rmd rule
Raniere Silva [Thu, 12 Jul 2018 12:15:53 +0000 (13:15 +0100)]
Merge pull request #328 from carpentries/fix-survey
fix survey link variables
François Michonneau [Thu, 12 Jul 2018 05:02:15 +0000 (15:02 +1000)]
fix survey link variables
François Michonneau [Tue, 3 Jul 2018 21:45:43 +0000 (17:45 -0400)]
space out callout elements better
François Michonneau [Tue, 3 Jul 2018 20:44:33 +0000 (16:44 -0400)]
restrict to article
François Michonneau [Tue, 3 Jul 2018 20:30:31 +0000 (16:30 -0400)]
use 20px margin
François Michonneau [Tue, 3 Jul 2018 20:21:46 +0000 (16:21 -0400)]
center images
François Michonneau [Thu, 28 Jun 2018 13:12:02 +0000 (09:12 -0400)]
Merge pull request #318 from carpentries/tracykteal-patch-1
added about the discussion stage to the LC description
François Michonneau [Thu, 28 Jun 2018 13:11:48 +0000 (09:11 -0400)]
Merge branch 'gh-pages' into tracykteal-patch-1
Belinda Weaver [Thu, 28 Jun 2018 01:04:24 +0000 (11:04 +1000)]
Merge pull request #317 from carpentries/fix-311
[fix carpentries/styles#311] update descriptions of the carpentries
Tracy Teal [Wed, 27 Jun 2018 21:36:30 +0000 (14:36 -0700)]
added about the discussion stage to the LC description
François Michonneau [Wed, 27 Jun 2018 19:40:40 +0000 (15:40 -0400)]
[fix carpentries/styles#311] update descriptions of the carpentries
Maxim Belkin [Sat, 23 Jun 2018 14:00:41 +0000 (14:00 +0000)]
_config.yml: fix link to the Library Carpentry website
Pull Request: carpentries/styles#313
trk [Sat, 23 Jun 2018 13:54:36 +0000 (13:54 +0000)]
Update Library Carpentry link, resolve #304
François Michonneau [Wed, 20 Jun 2018 17:22:51 +0000 (13:22 -0400)]
lesson_check.py: check YAML headers in Rmd episodes
Check that Rmd episode files include `source: Rmd`
Fixes carpentries/styles#273
Raniere Silva [Wed, 20 Jun 2018 13:35:33 +0000 (14:35 +0100)]
Merge pull request #303 from katrinleinweber/patch-3
links.md: add links to carpentries' lessons overview pages
Katrin Leinweber [Wed, 20 Jun 2018 05:57:03 +0000 (07:57 +0200)]
Sort alphabetically
Katrin Leinweber [Wed, 20 Jun 2018 05:26:48 +0000 (07:26 +0200)]
Link to lessons (closes swcarpentry/r-novice-inflammation/#371)
François Michonneau [Tue, 19 Jun 2018 17:41:35 +0000 (13:41 -0400)]
bump version number
François Michonneau [Tue, 19 Jun 2018 17:40:37 +0000 (13:40 -0400)]
[fix carpentries/styles#300] add CODE_OF_CONDUCT.md to root
François Michonneau [Tue, 19 Jun 2018 16:00:38 +0000 (12:00 -0400)]
switch contact email to team@carpentries.org
François Michonneau [Mon, 18 Jun 2018 20:56:21 +0000 (16:56 -0400)]
Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages
François Michonneau [Fri, 15 Jun 2018 16:32:34 +0000 (12:32 -0400)]
bump version in footer
François Michonneau [Fri, 15 Jun 2018 15:55:22 +0000 (11:55 -0400)]
Add 'cp' (Carpentry) as a new lesson type
* Add 'cp' (Carpentry) as a lesson type (for instructor training)
* Explain lesson type abbreviations (swc, dc, lc, cp)
* Emphasize the fact that there is no need to edit "repository" variable in front matter
François Michonneau [Fri, 15 Jun 2018 13:10:04 +0000 (09:10 -0400)]
[fix carpentries/styles#281] add missing include links.md
François Michonneau [Tue, 12 Jun 2018 19:19:11 +0000 (15:19 -0400)]
fix URL
François Michonneau [Tue, 12 Jun 2018 16:24:07 +0000 (12:24 -0400)]
Merge pull request #295 from carpentries/update-urls
update URLs to reflect consolidation to carpentries organization
François Michonneau [Tue, 12 Jun 2018 16:22:00 +0000 (12:22 -0400)]
update URLs to reflect consolidation to carpentries organization
Raniere Silva [Tue, 12 Jun 2018 13:54:29 +0000 (14:54 +0100)]
Merge pull request #284 from maxim-belkin/fix-links-md
Add links.md to files in boilerplate
François Michonneau [Mon, 11 Jun 2018 19:59:12 +0000 (15:59 -0400)]
Merge pull request #243 from alee/docker
Makefile: add docker-serve target
Raniere Silva [Wed, 6 Jun 2018 07:22:21 +0000 (08:22 +0100)]
Merge pull request #285 from maxim-belkin/fix-conduct
Move CODE_OF_CONDUCT.md to boilerplate
Maxim Belkin [Tue, 5 Jun 2018 15:58:35 +0000 (08:58 -0700)]
Add CODE_OF_CONDUCT.md to boilerplate
Maxim Belkin [Fri, 1 Jun 2018 12:50:15 +0000 (07:50 -0500)]
Remove CODE_OF_CONDUCT.md
Raniere Silva [Sat, 2 Jun 2018 18:34:30 +0000 (19:34 +0100)]
Merge pull request #282 from mr-c/patch-1
remove permalink that breaks asset includes
Raniere Silva [Sat, 2 Jun 2018 18:27:35 +0000 (19:27 +0100)]
Merge pull request #286 from mzc9/gitIgnoreChanges
gitIgnore for R
projects / rnaseq-cwl-training.git / log