Skip to content

Commit 0b24f19

Browse files
committed
Site update.
1 parent 7dd2919 commit 0b24f19

20 files changed

+209
-130
lines changed

Gemfile.lock

Lines changed: 139 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,195 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.6)
4+
activesupport (4.2.7)
65
i18n (~> 0.7)
76
json (~> 1.7, >= 1.7.7)
87
minitest (~> 5.1)
98
thread_safe (~> 0.3, >= 0.3.4)
109
tzinfo (~> 1.1)
11-
addressable (2.4.0)
12-
blankslate (2.1.2.4)
13-
classifier-reborn (2.0.4)
14-
fast-stemmer (~> 1.0)
10+
addressable (2.5.0)
11+
public_suffix (~> 2.0, >= 2.0.2)
1512
coffee-script (2.4.1)
1613
coffee-script-source
1714
execjs
18-
coffee-script-source (1.10.0)
19-
colorator (0.1)
20-
ethon (0.9.0)
15+
coffee-script-source (1.12.2)
16+
colorator (1.1.0)
17+
ethon (0.10.1)
2118
ffi (>= 1.3.0)
2219
execjs (2.7.0)
23-
faraday (0.9.2)
20+
faraday (0.10.1)
2421
multipart-post (>= 1.2, < 3)
25-
fast-stemmer (1.0.2)
26-
ffi (1.9.10)
22+
ffi (1.9.14)
23+
forwardable-extended (2.6.0)
2724
gemoji (2.1.0)
28-
github-pages (43)
29-
RedCloth (= 4.2.9)
30-
github-pages-health-check (= 0.6.0)
31-
jekyll (= 2.4.0)
25+
github-pages (114)
26+
activesupport (= 4.2.7)
27+
github-pages-health-check (= 1.3.0)
28+
jekyll (= 3.3.1)
29+
jekyll-avatar (= 0.4.2)
3230
jekyll-coffeescript (= 1.0.1)
33-
jekyll-feed (= 0.3.1)
31+
jekyll-default-layout (= 0.1.4)
32+
jekyll-feed (= 0.8.0)
3433
jekyll-gist (= 1.4.0)
35-
jekyll-mentions (= 0.2.1)
34+
jekyll-github-metadata (= 2.3.0)
35+
jekyll-mentions (= 1.2.0)
36+
jekyll-optional-front-matter (= 0.1.2)
3637
jekyll-paginate (= 1.1.0)
37-
jekyll-redirect-from (= 0.9.1)
38+
jekyll-readme-index (= 0.0.3)
39+
jekyll-redirect-from (= 0.11.0)
40+
jekyll-relative-links (= 0.2.1)
3841
jekyll-sass-converter (= 1.3.0)
39-
jekyll-seo-tag (= 0.1.4)
40-
jekyll-sitemap (= 0.9.0)
41-
jemoji (= 0.5.0)
42-
kramdown (= 1.9.0)
43-
liquid (= 2.6.2)
44-
maruku (= 0.7.0)
42+
jekyll-seo-tag (= 2.1.0)
43+
jekyll-sitemap (= 0.12.0)
44+
jekyll-swiss (= 0.4.0)
45+
jekyll-theme-architect (= 0.0.3)
46+
jekyll-theme-cayman (= 0.0.3)
47+
jekyll-theme-dinky (= 0.0.3)
48+
jekyll-theme-hacker (= 0.0.3)
49+
jekyll-theme-leap-day (= 0.0.3)
50+
jekyll-theme-merlot (= 0.0.3)
51+
jekyll-theme-midnight (= 0.0.3)
52+
jekyll-theme-minimal (= 0.0.3)
53+
jekyll-theme-modernist (= 0.0.3)
54+
jekyll-theme-primer (= 0.1.5)
55+
jekyll-theme-slate (= 0.0.3)
56+
jekyll-theme-tactile (= 0.0.3)
57+
jekyll-theme-time-machine (= 0.0.3)
58+
jekyll-titles-from-headings (= 0.1.4)
59+
jemoji (= 0.7.0)
60+
kramdown (= 1.11.1)
61+
liquid (= 3.0.6)
62+
listen (= 3.0.6)
4563
mercenary (~> 0.3)
46-
pygments.rb (= 0.6.3)
47-
rdiscount (= 2.1.8)
48-
redcarpet (= 3.3.3)
64+
minima (= 2.0.0)
65+
nokogiri (= 1.6.8.1)
66+
rouge (= 1.11.1)
4967
terminal-table (~> 1.4)
50-
github-pages-health-check (0.6.0)
68+
github-pages-health-check (1.3.0)
5169
addressable (~> 2.3)
5270
net-dns (~> 0.8)
53-
public_suffix (~> 1.4)
71+
octokit (~> 4.0)
72+
public_suffix (~> 2.0)
5473
typhoeus (~> 0.7)
55-
html-pipeline (1.9.0)
74+
html-pipeline (2.4.2)
5675
activesupport (>= 2)
57-
nokogiri (~> 1.4)
76+
nokogiri (>= 1.4)
5877
i18n (0.7.0)
59-
jekyll (2.4.0)
60-
classifier-reborn (~> 2.0)
61-
colorator (~> 0.1)
62-
jekyll-coffeescript (~> 1.0)
63-
jekyll-gist (~> 1.0)
64-
jekyll-paginate (~> 1.0)
78+
jekyll (3.3.1)
79+
addressable (~> 2.4)
80+
colorator (~> 1.0)
6581
jekyll-sass-converter (~> 1.0)
6682
jekyll-watch (~> 1.1)
6783
kramdown (~> 1.3)
68-
liquid (~> 2.6.1)
84+
liquid (~> 3.0)
6985
mercenary (~> 0.3.3)
70-
pygments.rb (~> 0.6.0)
71-
redcarpet (~> 3.1)
86+
pathutil (~> 0.9)
87+
rouge (~> 1.7)
7288
safe_yaml (~> 1.0)
73-
toml (~> 0.1.0)
89+
jekyll-avatar (0.4.2)
90+
jekyll (~> 3.0)
7491
jekyll-coffeescript (1.0.1)
7592
coffee-script (~> 2.2)
76-
jekyll-feed (0.3.1)
93+
jekyll-default-layout (0.1.4)
94+
jekyll (~> 3.0)
95+
jekyll-feed (0.8.0)
96+
jekyll (~> 3.3)
7797
jekyll-gist (1.4.0)
7898
octokit (~> 4.2)
79-
jekyll-mentions (0.2.1)
80-
html-pipeline (~> 1.9.0)
81-
jekyll (~> 2.0)
99+
jekyll-github-metadata (2.3.0)
100+
jekyll (~> 3.1)
101+
octokit (~> 4.0, != 4.4.0)
102+
jekyll-mentions (1.2.0)
103+
activesupport (~> 4.0)
104+
html-pipeline (~> 2.3)
105+
jekyll (~> 3.0)
106+
jekyll-optional-front-matter (0.1.2)
107+
jekyll (~> 3.0)
82108
jekyll-paginate (1.1.0)
83-
jekyll-redirect-from (0.9.1)
109+
jekyll-readme-index (0.0.3)
110+
jekyll (~> 3.0)
111+
jekyll-redirect-from (0.11.0)
84112
jekyll (>= 2.0)
113+
jekyll-relative-links (0.2.1)
114+
jekyll (~> 3.3)
85115
jekyll-sass-converter (1.3.0)
86116
sass (~> 3.2)
87-
jekyll-seo-tag (0.1.4)
88-
jekyll (>= 2.0)
89-
jekyll-sitemap (0.9.0)
90-
jekyll-watch (1.4.0)
117+
jekyll-seo-tag (2.1.0)
118+
jekyll (~> 3.3)
119+
jekyll-sitemap (0.12.0)
120+
jekyll (~> 3.3)
121+
jekyll-swiss (0.4.0)
122+
jekyll-theme-architect (0.0.3)
123+
jekyll (~> 3.3)
124+
jekyll-theme-cayman (0.0.3)
125+
jekyll (~> 3.3)
126+
jekyll-theme-dinky (0.0.3)
127+
jekyll (~> 3.3)
128+
jekyll-theme-hacker (0.0.3)
129+
jekyll (~> 3.3)
130+
jekyll-theme-leap-day (0.0.3)
131+
jekyll (~> 3.3)
132+
jekyll-theme-merlot (0.0.3)
133+
jekyll (~> 3.3)
134+
jekyll-theme-midnight (0.0.3)
135+
jekyll (~> 3.3)
136+
jekyll-theme-minimal (0.0.3)
137+
jekyll (~> 3.3)
138+
jekyll-theme-modernist (0.0.3)
139+
jekyll (~> 3.3)
140+
jekyll-theme-primer (0.1.5)
141+
jekyll (~> 3.3)
142+
jekyll-theme-slate (0.0.3)
143+
jekyll (~> 3.3)
144+
jekyll-theme-tactile (0.0.3)
145+
jekyll (~> 3.3)
146+
jekyll-theme-time-machine (0.0.3)
147+
jekyll (~> 3.3)
148+
jekyll-titles-from-headings (0.1.4)
149+
jekyll (~> 3.3)
150+
jekyll-watch (1.5.0)
91151
listen (~> 3.0, < 3.1)
92-
jemoji (0.5.0)
152+
jemoji (0.7.0)
153+
activesupport (~> 4.0)
93154
gemoji (~> 2.0)
94-
html-pipeline (~> 1.9)
95-
jekyll (>= 2.0)
96-
json (1.8.3)
97-
kramdown (1.9.0)
98-
liquid (2.6.2)
99-
listen (3.0.8)
100-
rb-fsevent (~> 0.9, >= 0.9.4)
101-
rb-inotify (~> 0.9, >= 0.9.7)
102-
maruku (0.7.0)
155+
html-pipeline (~> 2.2)
156+
jekyll (>= 3.0)
157+
json (1.8.6)
158+
kramdown (1.11.1)
159+
liquid (3.0.6)
160+
listen (3.0.6)
161+
rb-fsevent (>= 0.9.3)
162+
rb-inotify (>= 0.9.7)
103163
mercenary (0.3.6)
104164
mini_portile2 (2.1.0)
105-
minitest (5.9.0)
165+
minima (2.0.0)
166+
minitest (5.10.1)
106167
multipart-post (2.0.0)
107168
net-dns (0.8.0)
108-
nokogiri (1.6.8)
169+
nokogiri (1.6.8.1)
109170
mini_portile2 (~> 2.1.0)
110-
pkg-config (~> 1.1.7)
111-
octokit (4.3.0)
112-
sawyer (~> 0.7.0, >= 0.5.3)
113-
parslet (1.5.0)
114-
blankslate (~> 2.0)
115-
pkg-config (1.1.7)
116-
posix-spawn (0.3.11)
117-
public_suffix (1.5.3)
118-
pygments.rb (0.6.3)
119-
posix-spawn (~> 0.3.6)
120-
yajl-ruby (~> 1.2.0)
121-
rb-fsevent (0.9.7)
171+
octokit (4.6.2)
172+
sawyer (~> 0.8.0, >= 0.5.3)
173+
pathutil (0.14.0)
174+
forwardable-extended (~> 2.6)
175+
public_suffix (2.0.5)
176+
rb-fsevent (0.9.8)
122177
rb-inotify (0.9.7)
123178
ffi (>= 0.5.0)
124-
rdiscount (2.1.8)
125-
redcarpet (3.3.3)
126-
rouge (1.11.0)
179+
rouge (1.11.1)
127180
safe_yaml (1.0.4)
128-
sass (3.4.22)
129-
sawyer (0.7.0)
130-
addressable (>= 2.3.5, < 2.5)
131-
faraday (~> 0.8, < 0.10)
132-
terminal-table (1.6.0)
181+
sass (3.4.23)
182+
sawyer (0.8.1)
183+
addressable (>= 2.3.5, < 2.6)
184+
faraday (~> 0.8, < 1.0)
185+
terminal-table (1.7.3)
186+
unicode-display_width (~> 1.1.1)
133187
thread_safe (0.3.5)
134-
toml (0.1.2)
135-
parslet (~> 1.5.0)
136188
typhoeus (0.8.0)
137189
ethon (>= 0.8.0)
138190
tzinfo (1.2.2)
139191
thread_safe (~> 0.1)
140-
yajl-ruby (1.2.1)
192+
unicode-display_width (1.1.3)
141193

142194
PLATFORMS
143195
ruby
@@ -148,4 +200,4 @@ DEPENDENCIES
148200
rouge
149201

150202
BUNDLED WITH
151-
1.12.5
203+
1.13.7

_config.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ people:
5757

5858
- name: Subash Ray
5959
pic: subash
60-
position: Graduate Student
60+
position: Graduate Student (PhD candidate)
6161
social:
6262
- title: twitter
6363
url: https://twitter.com/skrRay
@@ -144,6 +144,10 @@ people:
144144
pic: default
145145
position: Undergraduate Student
146146

147+
- name: Mitali Shah
148+
pic: default
149+
position: Undergraduate Student
150+
147151
- name: Purva Shah
148152
pic: purva
149153
position: Undergraduate Student, Lab Assistant

_posts/2015-06-01-shiny-teachR.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
22
title: <code>teachR</code> package
3-
subtitle: All our educational Shiny apps in one place
3+
subtitle: All our educational Shiny apps in one place
44
layout: default
55
modal-id: teachR
66
date: 2015-06-01
77
img: r_teachr.png
88
thumbnail: r_teachr-thumbnail.png
99
alt: image-alt
10-
category:
10+
category:
1111
- shiny-portfolio
1212
- r-portfolio
13-
description:
14-
<b>Description:</b> <code>teachR</code> is a convenience R package that makes it easy to install and run all our
13+
description:
14+
<b>Description:</b> <code>teachR</code> is a convenience R package that makes it easy to install and run all our
1515
educational Shiny apps on your computer. It also contains a function to export self-contained versions of our apps
16-
for installing them on your personal <a href="https://www.rstudio.com/products/shiny/shiny-server/">Shiny Server</a>
17-
or on your <a href="https://www.shinyapps.io/">shinyapps.io</a> account.
16+
for installing them on your personal <a href="https://www.rstudio.com/products/shiny/shiny-server/">Shiny Server</a>, <a href="http://www.shinyproxy.io/">ShinyProxy Server</a>,
17+
or on your <a href="https://www.shinyapps.io/">shinyapps.io</a> account.
1818
<br><br>
19-
We are also welcoming contributions to <code>teachR</code>. If you would like your Shiny educational app to be
19+
We are also welcoming contributions to <code>teachR</code>. If you would like your Shiny educational app to be
2020
included in <code>teachR</code>, just fork our <a href="https://github.com/swarm-lab/teachR/">GitHub repository</a>,
2121
add your app to your copy of <code>teachR</code>, and submit a pull request. Make sure to include an <code>info</code>
22-
file following the model included in each of <code>teachR</code>'s apps.
22+
file following the model included in each of <code>teachR</code>'s apps.
2323
<br><br>
2424
<b>Source code and installation instructions:</b> <a href="https://github.com/swarm-lab/teachR/">Click here</a>
2525

_posts/2015-06-02-biol-337.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ img: biol337.png
88
thumbnail: biol337-thumbnail.png
99
alt: image-alt
1010
category: teaching-portfolio
11-
description:
11+
description:
1212
Understanding collective intelligence is one of the main challenges of contemporary science. Social dynamics are
1313
essential for the organization of gregarious and social organisms, and they are an important part of many human
1414
activities including the selection of social and industrial norms, the growing use of crowd-sourcing and viral
15-
marketing in social networks, and the influence of media and entourage on the outcome of democratic processes. This
16-
course will provide an overview of the fundamental principles underlying the organization of animal societies. It
17-
will include detailed consideration of the behavioral, social and physical processes that are responsible for the
18-
coordination of activities in large animal and human groups.
15+
marketing in social networks, and the influence of media and entourage on the outcome of democratic processes. This
16+
course will provide an overview of the fundamental principles underlying the organization of animal societies. It
17+
will include detailed consideration of the behavioral, social and physical processes that are responsible for the
18+
coordination of activities in large animal and human groups.
1919
<br><br>
20-
<a href="http://biology.njit.edu/docs/biol_337-S15.pdf">Latest syllabus</a>
20+
<a href="http://biology.njit.edu/sites/biology/files/lcms/docs/biol_337-S17_0.pdf">Latest syllabus</a>
2121

2222
---

_posts/2015-06-02-shiny-agg-seg.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ date: 2015-06-02
77
img: agg_seg.png
88
thumbnail: agg_seg-thumbnail.png
99
alt: image-alt
10-
category:
10+
category:
1111
- shiny-portfolio
12-
description:
13-
<b>Description:</b> ...
12+
description:
13+
<b>Description:</b> This app lets you explore a simple model of aggregation and segregation between two types of particles.
1414
<br><br>
1515
<b>Demo:</b> <a href="/shiny/aggregation_segregation/">Click here</a>
1616
<br><br>

_posts/2015-06-03-biol-320.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ category: teaching-portfolio
1111
description:
1212
Success in the constantly evolving fields of biology and medicine necessitates staying current in scientific literature. This requires competency in skills such as analysis of primary sources, synthesis of information from multiple sources, and oral and written communication skills. This course focuses on these competencies. Students will develop skills needed to read and analyze scientific literature, and to communicate science through the making of short educational movies, scientific podcasts, and popular science articles.
1313
<br><br><a href="/biol320/">Course webpage</a>
14-
<br><br><a href="http://biology.njit.edu/docs/biol_320-F14.pdf">Latest syllabus</a>
14+
<br><br><a href="http://biology.njit.edu/sites/biology/files/lcms/docs/F16_BIOL_320_1.pdf">Latest syllabus</a>
1515

1616
---

_posts/2015-07-26-shiny-ant-coll-dec.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ date: 2015-07-26
77
img: ant_coll_dec.png
88
thumbnail: ant_coll_dec-thumbnail.png
99
alt: image-alt
10-
category:
10+
category:
1111
- shiny-portfolio
12-
description:
13-
<b>Description:</b> ...
12+
description:
13+
<b>Description:</b> This app let's you explore a model of collective decision-making in ants. This model combines ideas from <a href="http://link.springer.com/article/10.1007%2FBF00462870">Goss et al. (1989)</a> and <a href="http://link.springer.com/article/10.1007%2FBF02224053">Beckers et al. (1990)</a>.
1414
<br><br>
1515
<b>Demo:</b> <a href="/shiny/ant_collective_decision/">Click here</a>
1616
<br><br>

0 commit comments

Comments
 (0)