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.

Sign up for GitHub

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

Update to styles v9.5.2 #23

Merged
merged 265 commits into from
Jun 20, 2018
Merged

Update to styles v9.5.2 #23

Changes from 1 commit
Commits
Show all changes
265 commits
Select commit Hold shift + click to select a range
cfc5573
Addition of link to setup had one too few columns.
gvwilson Jan 18, 2017
4dcf2ed
Add missing class on _includes/syllabus.html
rgaiacs Jan 18, 2017
9781de1
Add multiday condition on _includes/syllabus.html
rgaiacs Jan 18, 2017
3a09799
Enforce Bootstrap's 12 column layout
rgaiacs Jan 18, 2017
0958c5f
bin/lesson_initialize.py: Remove 'example-site' reference
wking Jan 23, 2017
3d04cbb
Merge pull request #128 from wking/example-site-reference
rgaiacs Jan 24, 2017
39973ee
ensure dt elements have an id set
neon-ninja Jan 31, 2017
0cb3ca5
Add javascript comments to the dt-ids snippet
neon-ninja Jan 31, 2017
220eedc
Merge pull request #126 from gvwilson/consolidating-links
rgaiacs Feb 4, 2017
48248d1
Merge pull request #117 from maxim-belkin/patch-2
rgaiacs Feb 8, 2017
0bbff2b
Merge pull request #109 from gvwilson/adding-jquery-debugging
rgaiacs Feb 18, 2017
62e0431
Merge pull request #127 from rgaiacs/fix-syllabus
rgaiacs Feb 18, 2017
93aae56
Merge pull request #129 from neon-ninja/dt-ids
rgaiacs Feb 18, 2017
c510f14
Make tables wider
rgaiacs Feb 18, 2017
bb66b28
Merge pull request #132 from rgaiacs/table
rgaiacs Feb 18, 2017
60185ce
Improve round corners on block input and output
rgaiacs Feb 18, 2017
5ec7776
Merge pull request #133 from rgaiacs/styles-round-corners
rgaiacs Feb 18, 2017
9911100
Update copyright year with current year
rgaiacs Mar 2, 2017
89b2d3c
Merge pull request #135 from rgaiacs/106
rgaiacs Mar 2, 2017
8dbb992
Add link to Edit on GitHub
rgaiacs Feb 23, 2017
2093505
Change Edit on GitHub link to edit page
rgaiacs Mar 3, 2017
8874a3f
Adopt @lexnederbragt suggestion for Edit link
rgaiacs Mar 3, 2017
15da8bb
Fix issue with link to GitHub from RMarkdown files
rgaiacs Mar 3, 2017
6731202
Merge pull request #136 from rgaiacs/styles-edit-on-github
rgaiacs Mar 3, 2017
c0eafd4
Numbering the lessons in the schedule
rgaiacs Feb 18, 2017
d68646c
Merge pull request #137 from rgaiacs/styles-numbering
rgaiacs Mar 3, 2017
f994dfb
Revert "ensure dt elements have an id set"
rgaiacs Mar 3, 2017
bb2b611
Merge pull request #138 from swcarpentry/revert-129-dt-ids
rgaiacs Mar 3, 2017
12506a4
Improve wording on syllabus.html
rgaiacs Mar 14, 2017
50d94bd
Merge pull request #139 from rgaiacs/improve-wording
rgaiacs Mar 14, 2017
38307ff
Add Library Carpentry to the workshop template
rgaiacs Apr 4, 2017
bc6056f
Suggest template language
ErinBecker Apr 25, 2017
db363c8
fix swcarpentry/lesson-examples#118: use checkpoint::scanForPackages
fmichonneau Apr 29, 2017
df9ba82
Merge pull request #145 from fmichonneau/fix-checkpoint
rgaiacs May 2, 2017
53c0a7f
make sure that checkpoint version is 0.4.0 or higher
fmichonneau May 4, 2017
468a433
Merge pull request #146 from fmichonneau/check-version-checkpoint
rgaiacs May 5, 2017
ac2d0d5
Merge pull request #142 from rgaiacs/styles-library-carpentry
rgaiacs May 6, 2017
895499e
Merge pull request #143 from ErinBecker/gh-pages
rgaiacs May 6, 2017
7999654
Updated CONDUCT.md
rgaiacs May 6, 2017
e4e394b
Merge pull request #147 from rgaiacs/update-coc
rgaiacs May 6, 2017
6f6cba4
Make challenges and discussion visibles
rgaiacs May 6, 2017
6951d40
Merge pull request #148 from rgaiacs/show-challenges
rgaiacs May 6, 2017
3474a5f
Add all in one lesson build with Javascript
rgaiacs May 2, 2017
908fff1
Merge pull request #149 from rgaiacs/styles-print
rgaiacs May 6, 2017
c34c225
Remove extra link to Library Carpentry
rgaiacs May 6, 2017
1e56203
Remove CONDUCT.md since it should be generate by bin/lesson_initializ…
rgaiacs May 6, 2017
98e4bc6
Fix bug with Python script
rgaiacs May 6, 2017
9f34e6e
Revert "Remove CONDUCT.md since it should be generate by bin/lesson_i…
rgaiacs May 10, 2017
b08b83d
Handler for collaborative_notes
rgaiacs Jun 18, 2017
55c2e1b
Link LC as for SWC and DC
jnothman Jul 4, 2017
8462459
Merge pull request #156 from jnothman/patch-1
rgaiacs Jul 4, 2017
6e4e4c4
Unify Library Carpentry logo
rgaiacs Jul 5, 2017
8fed5dc
Merge pull request #157 from rgaiacs/155
rgaiacs Jul 5, 2017
0ab311b
Fix logo at navbar
rgaiacs Jul 5, 2017
1a6efba
Merge pull request #158 from rgaiacs/fix-logo-nav
rgaiacs Jul 5, 2017
4b831ad
Add Library Carpentry SVG logo
rgaiacs Jul 6, 2017
879e415
Update Library Carpentry logo
rgaiacs Jul 14, 2017
ba59492
Merge pull request #159 from rgaiacs/lc-svg-logo
rgaiacs Jul 14, 2017
eb1bb0a
Sort episodes before producing figures
mawds Aug 8, 2017
2208a4b
Sort HTML_DST output
mawds Aug 8, 2017
354a469
Merge pull request #163 from mawds/sortfigs
rgaiacs Aug 8, 2017
b2abd06
add keyboard key style
brandoncurtis Aug 18, 2017
1df4f12
use <kbd></kbd> for keyboard keys
brandoncurtis Aug 28, 2017
961d4ee
Load methods package
jsta Sep 5, 2017
745e85d
Merge pull request #169 from jsta/patch-1
rgaiacs Sep 6, 2017
d20077a
Converted to `col-xs-*` from `col-md-*` classes for navbar div
IanLee1521 Oct 11, 2017
b54dcce
Pull left / right arrows in episode nav to outside of row
IanLee1521 Oct 11, 2017
5edc669
Merge pull request #174 from IanLee1521/fix-episode-nav-wrapping
rgaiacs Oct 11, 2017
5aaa87a
Add "Offline" Capable
rgaiacs Nov 5, 2017
a7be704
Merge pull request #181 from rgaiacs/styles-offline
rgaiacs Nov 5, 2017
17a345a
Fix github-importer link
rgaiacs Nov 5, 2017
080298e
Merge pull request #182 from rgaiacs/gh-pages
rgaiacs Nov 5, 2017
9fd880c
Fix concept-maps link
rgaiacs Nov 5, 2017
3418441
Merge pull request #183 from rgaiacs/gh-pages
rgaiacs Nov 5, 2017
337a6e8
Merge pull request #165 from brandoncurtis/keyboard-keys
rgaiacs Nov 5, 2017
47bfe1b
Replace extract_figures.py with Javacript
rgaiacs Nov 5, 2017
1082c28
Merge pull request #184 from rgaiacs/styles-js-load-images
rgaiacs Nov 5, 2017
76c2d51
Adopt email instead of contact as keyword
rgaiacs Nov 5, 2017
446d1c2
Merge pull request #185 from rgaiacs/178
rgaiacs Nov 5, 2017
3e332fc
Fix email as keyword in bin/lesson_check.py
rgaiacs Nov 5, 2017
95644a9
Fix root YAML variable in bin/lesson_initialize.py
rgaiacs Nov 7, 2017
8404c00
Updated lesson_initialize
wclose Nov 7, 2017
595602d
Fix broken link
rgaiacs Nov 15, 2017
78d3716
Enable syntax highlighting
naught101 Nov 16, 2017
1b10e59
Change bin/chunk-options.R to use .language-r instead of r
rgaiacs Nov 16, 2017
a747be0
Fix validation for syntax highlight
rgaiacs Nov 16, 2017
7e835fd
Remove check for all_figures.html now that we are using Javascript
rgaiacs Nov 16, 2017
1083d36
Merge pull request #192 from rgaiacs/syntax-highlight
rgaiacs Nov 16, 2017
9259abf
Fix usage instruction at bin/workshop_check.py
rgaiacs Nov 19, 2017
e1a840c
Rename _includes/lc/syllabys.html to _includes/lc/syllabus.html
rgaiacs Nov 19, 2017
fcc731b
Port changes from workshop
rgaiacs Nov 23, 2017
b68e55d
Port changes from workshop
rgaiacs Nov 23, 2017
23a9827
Copy _extras/figures.md from lesson example
rgaiacs Nov 23, 2017
a1ab182
Fix bin/lesson_initialize.py
rgaiacs Nov 24, 2017
01957e2
Merge pull request #193 from rgaiacs/gh-pages
rgaiacs Nov 24, 2017
0f8afa2
Fix problem with {% link reference.md %}
rgaiacs Dec 1, 2017
55b723a
Made requested revisions to lesson_initialize
wclose Dec 7, 2017
af2df7a
Made minor revision to order of information
wclose Dec 7, 2017
4f40bac
pre-empt server-side redirects
katrinleinweber Dec 20, 2017
0e1523e
Merge pull request #196 from katrinleinweber/patch-1
rgaiacs Dec 21, 2017
e7b99da
Insert comment in YAML header advising not to edit
mawds Jan 25, 2018
6a3a807
Fix CSS to use .language-X class
rgaiacs Jan 29, 2018
682e775
Implement using @naupaka 's suggestions
mawds Jan 30, 2018
27ead33
Merge pull request #200 from mawds/commentgenerated
rgaiacs Jan 30, 2018
b9a00c8
fix svg files
fmichonneau Feb 12, 2018
e512f44
Merge pull request #202 from rgaiacs/gh-pages
rgaiacs Feb 14, 2018
0685412
Merge pull request #188 from wclose/update_lesson_initialize
rgaiacs Feb 14, 2018
accf26a
Add current year to copyright of workshop footer
jcoliver Jan 10, 2018
0b6b1b4
Merge pull request #205 from rgaiacs/gh-pages
rgaiacs Feb 14, 2018
a1707b0
Fix broken link for Contact
rgaiacs Feb 15, 2018
56a763d
Merge pull request #206 from rgaiacs/gh-pages
rgaiacs Feb 15, 2018
d128191
Requested changes
andrewsanchez Feb 15, 2018
d29296b
Merge pull request #209 from rgaiacs/gh-pages
rgaiacs Feb 16, 2018
34b0d39
Fix issue with CSS
rgaiacs Feb 19, 2018
e0ade11
Merge pull request #203 from swcarpentry/fix-svg
rgaiacs Feb 19, 2018
ecc2efa
Remove out-of-date CoC language
ErinBecker Feb 27, 2018
8f9e76c
Merge pull request #213 from ErinBecker/update-coc
rgaiacs Feb 28, 2018
e4dd616
Link DOIs to preferred resolver
katrinleinweber Mar 3, 2018
bbf3bd9
Merge pull request #214 from katrinleinweber/resolve-DOIs-securely
rgaiacs Mar 5, 2018
ad4cd67
Fix source of typo #646
katrinleinweber Mar 19, 2018
10bce82
Merge pull request #219 from katrinleinweber/patch-2
rgaiacs Mar 19, 2018
cd798b9
Add swc-releases to _includes/links
rgaiacs Mar 22, 2018
91a6d2a
Update Trademark
rgaiacs Mar 22, 2018
ae4a693
Improve language on CONTRIBUTING file
rgaiacs Mar 22, 2018
d46a578
don't break words in code
fmichonneau Apr 4, 2018
1182f75
check hex color using lowercase
fmichonneau Apr 9, 2018
fd9e75e
update github labels
fmichonneau Apr 9, 2018
0e3a431
Merge pull request #224 from fmichonneau/update-gh-labels
rgaiacs Apr 11, 2018
e611262
use CRAN canonical addresses for packages
fmichonneau Apr 11, 2018
1b7639d
Merge pull request #223 from fmichonneau/no-hyphens-code
rgaiacs Apr 11, 2018
2df359c
Updating to handbook as canonical source for CoC
jduckles Apr 13, 2018
8c6a1a7
Merge pull request #225 from swcarpentry/jduck-coc
rgaiacs Apr 13, 2018
e7f98a6
fix github meta data
fmichonneau Apr 17, 2018
1205026
Merge pull request #227 from fmichonneau/fix-gh-metadata
rgaiacs Apr 17, 2018
26ccd8c
Secure hyperlinks
katrinleinweber Mar 18, 2018
3ed2866
Resort hyperlinks alphabetically
katrinleinweber Mar 18, 2018
0d0f943
Reflect merger
katrinleinweber Mar 18, 2018
bf65236
Convert CRAN links to preferred, canonical form
katrinleinweber Mar 18, 2018
f55a015
Merge pull request #228 from rgaiacs/gh-pages
rgaiacs Apr 17, 2018
51293be
links.md: remove duplicate line
maxim-belkin Apr 19, 2018
f82fed8
bin/util.py: fix error handling for Python 2
maxim-belkin Apr 19, 2018
782d6cb
Merge pull request #230 from maxim-belkin/fix-links
rgaiacs Apr 20, 2018
e9acce2
Merge pull request #231 from maxim-belkin/fix-util
rgaiacs Apr 20, 2018
93eb566
convert to py3.4 syntax, a few cleanups
mr-c Apr 20, 2018
079bbc2
Merge pull request #234 from mr-c/py34
rgaiacs May 8, 2018
1c0faba
Fix Copyright information
rgaiacs May 8, 2018
95a6248
Fix favicon
dpshelio May 8, 2018
84fcd6c
Merge pull request #240 from rgaiacs/favicon
rgaiacs May 8, 2018
667c691
Clean footer HTML
rgaiacs May 8, 2018
9ccbb18
Merge pull request #241 from rgaiacs/clean-footer
rgaiacs May 8, 2018
30f8cd1
Add note about the version of the style
rgaiacs May 8, 2018
7ccdf49
add docker-serve make target for #238
alee May 8, 2018
672022e
Fix search
rgaiacs May 11, 2018
6f0df1d
Merge pull request #247 from rgaiacs/styles-246
rgaiacs May 11, 2018
3aff0b2
Merge branch 'gh-pages' into 237
rgaiacs May 13, 2018
a700bde
Merge pull request #239 from rgaiacs/237
rgaiacs May 13, 2018
54fbb57
Merge branch 'gh-pages' into add-version-to-footer
rgaiacs May 13, 2018
caa6e0b
Merge pull request #242 from rgaiacs/add-version-to-footer
rgaiacs May 13, 2018
9eff7ab
add favicons for all flavors
fmichonneau May 15, 2018
ce5073e
rename cc to cp for carpentries
fmichonneau May 15, 2018
f550f8b
add html for favicons
fmichonneau May 15, 2018
bfec005
fix logos and add Carpentries as an option
fmichonneau May 15, 2018
661069d
fix/add logos and icons for navbar
fmichonneau May 15, 2018
b490ea4
add cp as option in footers
fmichonneau May 15, 2018
1faa3eb
use favicons for workshop page
fmichonneau May 15, 2018
9a55cba
remove unused .ico in root folder
fmichonneau May 15, 2018
bc8a996
change alt text for Carpentries logo
fmichonneau May 16, 2018
d0022dc
remove unneeded files
fmichonneau May 16, 2018
f30cc4e
Merge pull request #250 from fmichonneau/favicons
rgaiacs May 16, 2018
d5837c7
Fix links in LICENSE
remram44 May 17, 2018
7ca21f5
Merge pull request #252 from remram44/patch-1
rgaiacs May 17, 2018
51a86ac
Exit with a status of 1 if something was wrong
maxim-belkin May 17, 2018
a2c7c54
New 'permissive' flag for lesson-check
maxim-belkin May 17, 2018
2e6d3c6
Use --permissive flag with lesson-check-all
maxim-belkin May 17, 2018
8cdca1d
Merge pull request #253 from maxim-belkin/error-out
rgaiacs May 17, 2018
ea6c22b
lesson_check: switch to argparse
maxim-belkin May 18, 2018
601ad2f
lesson_check: get_val is a static method
maxim-belkin May 18, 2018
5e079a9
Python3-style inits
maxim-belkin May 18, 2018
2dd5fce
lesson_check: add missing docstring
maxim-belkin May 18, 2018
d73ae1c
Merge pull request #255 from maxim-belkin/use-argparse
rgaiacs May 18, 2018
7fdc6f8
Merge pull request #258 from maxim-belkin/add-docstring
rgaiacs May 18, 2018
b32734f
Merge pull request #257 from maxim-belkin/py3-inits
rgaiacs May 18, 2018
61416e0
repo_check: use argparse and remove unused variable
maxim-belkin May 18, 2018
3d9748e
Merge pull request #256 from maxim-belkin/static-get-val
rgaiacs May 18, 2018
40c41b0
Merge pull request #259 from maxim-belkin/fix-repocheck
rgaiacs May 18, 2018
f507875
Move boilerplate files to their own file
rgaiacs May 18, 2018
de20813
Merge pull request #260 from rgaiacs/shutil
rgaiacs May 18, 2018
aa98c3f
Fix line wrap after dash in code block
rgaiacs May 18, 2018
1e7efe2
Merge pull request #261 from rgaiacs/249
rgaiacs May 18, 2018
18b36ec
Add README to bin/lesson_initialize.py
abought May 18, 2018
ac0a549
Merge pull request #262 from rgaiacs/248
rgaiacs May 18, 2018
20bc579
Fix font size of h2 in call out box
rgaiacs May 18, 2018
11774e3
Merge pull request #263 from rgaiacs/244
rgaiacs May 18, 2018
ec50ea0
lesson_check: fix create_checker function
maxim-belkin May 20, 2018
2ba1381
utils.py: simplify report function
maxim-belkin May 20, 2018
50a8525
Merge pull request #266 from maxim-belkin/simple-report
rgaiacs May 21, 2018
feb54ba
Merge pull request #265 from maxim-belkin/not-implmntd
rgaiacs May 21, 2018
485e4ba
missing comma in boilerplate generation
jsta May 21, 2018
894d47f
Merge pull request #267 from jsta/patch-2
rgaiacs May 21, 2018
1d64dbb
Remove unnecessary super call
maxim-belkin May 22, 2018
dd1fce0
util.py: make functions return NotImplemented
maxim-belkin May 22, 2018
199a809
Use Python3-style class declaration
maxim-belkin May 22, 2018
961f24a
Merge pull request #268 from maxim-belkin/fix-returns
rgaiacs May 23, 2018
6d7a9d7
Merge pull request #270 from maxim-belkin/py3-classes
rgaiacs May 23, 2018
434abbe
Merge pull request #269 from maxim-belkin/fix-super-call
rgaiacs May 23, 2018
3ccc406
Remove root and layout from YAML for boilerplate
rgaiacs May 23, 2018
8e1b106
Merge pull request #272 from rgaiacs/remove-root-and-layout
rgaiacs May 23, 2018
ee84f54
Improve .travis.yml to build the lesson
rgaiacs May 23, 2018
9126d2c
Merge pull request #275 from rgaiacs/travis-build
rgaiacs May 23, 2018
57f2069
Make Jekyll ignore .Rproj
rgaiacs May 23, 2018
0802ec9
Merge pull request #276 from rgaiacs/274
rgaiacs May 23, 2018
149e18f
Change shebang to Python3
rgaiacs May 23, 2018
9f4023a
Merge pull request #277 from rgaiacs/bin-python3
rgaiacs May 23, 2018
c0be5cc
Update Makefile
rgaiacs May 23, 2018
8f9af3d
Run lesson-fixme from within lesson-check
maxim-belkin May 23, 2018
4a85f2c
Merge pull request #278 from maxim-belkin/fix264
rgaiacs May 24, 2018
f8f4cff
Fix lesson_check.py
rgaiacs May 24, 2018
c001ec8
Merge pull request #279 from rgaiacs/lesson-check
rgaiacs May 24, 2018
2a7326f
Increase version to v9.5.0
rgaiacs May 24, 2018
5d78abc
Upgrade repo's Community Profile
katrinleinweber May 27, 2018
0e0f2bf
Merge pull request #280 from katrinleinweber/patch-3
rgaiacs May 27, 2018
986a6be
remove permalink that breaks asset includes
mr-c May 30, 2018
f03403b
_config.yml: no 'mailto' in 'email'
mr-c May 30, 2018
5d9e943
Add links.md to files in boilerplate
maxim-belkin Jun 1, 2018
73683e4
Remove extra blank lines
maxim-belkin Jun 1, 2018
8249bf6
Add several FIXMEs to the template episode
maxim-belkin Jun 1, 2018
2f61821
gitIgnore for R
Jun 1, 2018
546ffa6
Merge pull request #286 from mzc9/gitIgnoreChanges
rgaiacs Jun 2, 2018
999ce61
Merge pull request #282 from mr-c/patch-1
rgaiacs Jun 2, 2018
396a399
Remove CODE_OF_CONDUCT.md
maxim-belkin Jun 1, 2018
add555b
Add CODE_OF_CONDUCT.md to boilerplate
maxim-belkin Jun 5, 2018
b488e64
Merge pull request #285 from maxim-belkin/fix-conduct
rgaiacs Jun 6, 2018
6099b78
Merge pull request #243 from alee/docker
fmichonneau Jun 11, 2018
2a938b0
Merge pull request #284 from maxim-belkin/fix-links-md
rgaiacs Jun 12, 2018
305f7b4
update URLs to reflect consolidation to carpentries organization
fmichonneau Jun 12, 2018
90df6d3
Merge pull request #295 from carpentries/update-urls
fmichonneau Jun 12, 2018
e650b89
fix URL
fmichonneau Jun 12, 2018
1223100
[fix carpentries/styles#281] add missing include links.md
fmichonneau Jun 15, 2018
bb9b1d3
Add 'cp' (Carpentry) as a new lesson type
fmichonneau Jun 15, 2018
13802da
bump version in footer
fmichonneau Jun 15, 2018
67513ef
Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages
fmichonneau Jun 18, 2018
ba909cc
switch contact email to [email protected]
fmichonneau Jun 19, 2018
4755a6d
[fix carpentries/styles#300] add CODE_OF_CONDUCT.md to root
fmichonneau Jun 19, 2018
0ff9a92
bump version number
fmichonneau Jun 19, 2018
e8b4a1c
Link to lessons (closes swcarpentry/r-novice-inflammation/#371)
katrinleinweber Jun 20, 2018
05ee737
Sort alphabetically
katrinleinweber Jun 20, 2018
2b8a946
Merge pull request #303 from katrinleinweber/patch-3
rgaiacs Jun 20, 2018
dc04753
merge styles v9.5.2
fmichonneau Jun 20, 2018
31037fa
update _config.yml
fmichonneau Jun 20, 2018
e92c367
use language-r code block type
fmichonneau Jun 20, 2018
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
don't break words in code
  • Loading branch information
@fmichonneau
fmichonneau committed Apr 4, 2018
commit d46a5784feaa2f5b0c4111eae23a020518723311
1 change: 1 addition & 0 deletions assets/css/bootstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.