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.

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

Fedback 1 #123

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
134cec0
change title
diegozwolf Jun 25, 2018
fc6d9a2
add publications and content
diegozwolf Jun 25, 2018
c4c6173
add research items
diegozwolf Jun 25, 2018
a328e1f
add content in publications
diegozwolf Jun 26, 2018
8f2b26f
fix publications content
diegozwolf Jun 26, 2018
c0bbf26
uploading
diegozwolf Jun 26, 2018
a5e66b7
hey
diegozwolf Jun 26, 2018
58a4b31
Merge pull request #1 from pjliberman/change-info
pjliberman Jun 26, 2018
6ff1aef
Merge branch 'master' of https://github.com/diegozwolf/academicpages.…
diegozwolf Jun 26, 2018
f3471f6
test
diegozwolf Jun 27, 2018
6a6e4d7
links test
diegozwolf Jun 27, 2018
6c12b5f
revove localhost
diegozwolf Jun 27, 2018
d905bfe
set up
diegozwolf Jun 27, 2018
aa58b4c
change side description
diegozwolf Jun 27, 2018
961f7a2
change side bar
diegozwolf Jun 27, 2018
4f98f27
merge git change-info
diegozwolf Jun 27, 2018
fc347fc
remove hovers in titles
diegozwolf Jun 27, 2018
8950ed0
change footer
diegozwolf Jun 27, 2018
21cd2ec
add bopgota dev link in footer
diegozwolf Jun 27, 2018
edbd01d
change font size in email
diegozwolf Jun 27, 2018
4a54280
remove trash pluggins
diegozwolf Jun 27, 2018
e8fe696
update title
diegozwolf Jun 28, 2018
f00cfc7
remove test
Jun 28, 2018
31ca62a
add test publish
Jun 28, 2018
19cad7c
Update about.md
pjliberman Jun 29, 2018
0c6f371
Update does_conquest _pay.md
pjliberman Jun 29, 2018
b216834
Update does_conquest _pay.md
pjliberman Jun 29, 2018
ff5ef17
Update does_conquest _pay.md
pjliberman Jun 29, 2018
9ff50ba
Update does_conquest _pay.md
pjliberman Jun 29, 2018
71bd30f
add peters feedback
diegozwolf Jun 29, 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
255 changes: 255 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.17.9)
ruby-enum (~> 0.5)
concurrent-ruby (1.0.5)
dnsruby (1.60.2)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.11.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.25)
forwardable-extended (2.6.0)
gemoji (3.0.0)
github-pages (186)
activesupport (= 4.2.10)
github-pages-health-check (= 1.8.1)
jekyll (= 3.7.3)
jekyll-avatar (= 0.5.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.5)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.9.3)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.9.4)
jekyll-mentions (= 1.3.0)
jekyll-optional-front-matter (= 0.3.0)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.2.0)
jekyll-redirect-from (= 0.13.0)
jekyll-relative-links (= 0.5.3)
jekyll-remote-theme (= 0.3.1)
jekyll-sass-converter (= 1.5.2)
jekyll-seo-tag (= 2.4.0)
jekyll-sitemap (= 1.2.0)
jekyll-swiss (= 0.4.0)
jekyll-theme-architect (= 0.1.1)
jekyll-theme-cayman (= 0.1.1)
jekyll-theme-dinky (= 0.1.1)
jekyll-theme-hacker (= 0.1.1)
jekyll-theme-leap-day (= 0.1.1)
jekyll-theme-merlot (= 0.1.1)
jekyll-theme-midnight (= 0.1.1)
jekyll-theme-minimal (= 0.1.1)
jekyll-theme-modernist (= 0.1.1)
jekyll-theme-primer (= 0.5.3)
jekyll-theme-slate (= 0.1.1)
jekyll-theme-tactile (= 0.1.1)
jekyll-theme-time-machine (= 0.1.1)
jekyll-titles-from-headings (= 0.5.1)
jemoji (= 0.9.0)
kramdown (= 1.16.2)
liquid (= 4.0.0)
listen (= 3.1.5)
mercenary (~> 0.3)
minima (= 2.4.1)
nokogiri (>= 1.8.2, < 2.0)
rouge (= 2.2.1)
terminal-table (~> 1.4)
github-pages-health-check (1.8.1)
addressable (~> 2.3)
dnsruby (~> 1.60)
octokit (~> 4.0)
public_suffix (~> 2.0)
typhoeus (~> 1.3)
hawkins (2.0.5)
em-websocket (~> 0.5)
jekyll (~> 3.1)
html-pipeline (2.8.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.5.0)
jekyll (~> 3.0)
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.2.0)
commonmarker (~> 0.14)
jekyll (>= 3.0, < 4.0)
jekyll-commonmark-ghpages (0.1.5)
commonmarker (~> 0.17.6)
jekyll-commonmark (~> 1)
rouge (~> 2)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.9.3)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.9.4)
jekyll (~> 3.1)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.3.0)
activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-optional-front-matter (0.3.0)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.2.0)
jekyll (~> 3.0)
jekyll-redirect-from (0.13.0)
jekyll (~> 3.3)
jekyll-relative-links (0.5.3)
jekyll (~> 3.3)
jekyll-remote-theme (0.3.1)
jekyll (~> 3.5)
rubyzip (>= 1.2.1, < 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.4.0)
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-swiss (0.4.0)
jekyll-theme-architect (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-cayman (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-dinky (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-hacker (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-leap-day (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-merlot (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-midnight (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-minimal (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-modernist (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-primer (0.5.3)
jekyll (~> 3.5)
jekyll-github-metadata (~> 2.9)
jekyll-seo-tag (~> 2.0)
jekyll-theme-slate (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-tactile (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-time-machine (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-titles-from-headings (0.5.1)
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.9.0)
activesupport (~> 4.0, >= 4.2.9)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.16.2)
liquid (4.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
minima (2.4.1)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.11.3)
multipart-post (2.0.0)
nokogiri (1.8.3)
mini_portile2 (~> 2.3.0)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
ruby-enum (0.7.2)
i18n
ruby_dep (1.5.0)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.3.0)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.0)

PLATFORMS
ruby

DEPENDENCIES
github-pages
hawkins
jekyll-feed
jekyll-sitemap

BUNDLED WITH
1.16.1
16 changes: 16 additions & 0 deletions _book_reviews/1-issf.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "ISSF Roundtable, Vol 8, No. 6 (2015)"
collection: book_reviews
permalink: /book_reviews/1-issf
excerpt: 'Extended review of Paul MacDonald, Networks of Domination: The Social Foundations of Peripheral Conquest in International Politics.'
# date: 2015-01-01
venue: 'Journal 1'
# link
# paperurl: ''
# citation: ''
---
ISSF Roundtable, Vol 8, No. 6 (2015). Extended review of Paul MacDonald, Networks of Domination: The Social Foundations of Peripheral Conquest in International Politics.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/11-testfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "test-book"
collection: book_reviews
permalink: /book_reviews/1-issf
excerpt: 'Extended review of Paul MacDonald, Networks of Domination: The Social Foundations of Peripheral Conquest in International Politics.'
date: 2005-10-28
venue: 'Journal 1'
# link
# paperurl: ''
# citation: ''
---
ISSF Roundtable, Vol 8, No. 6 (2015). Extended review of Paul MacDonald, Networks of Domination: The Social Foundations of Peripheral Conquest in International Politics.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/2-foreign-affairs.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "Foreign Affairs (January/February 2011)"
collection: book_reviews
permalink: /book_reviews/2-foreign-affairs
excerpt: 'Review of John M. Owen IV, The Clash of Ideas in World Politics: Transnational Networks, States, and Regime Change, 1510–2010.'
# date: 2011-02-01
venue: 'Journal 1'
# link
# paperurl: ''
# citation: ''
---
Foreign Affairs (January/February 2011). Review of John M. Owen IV, The Clash of Ideas in World Politics: Transnational Networks, States, and Regime Change, 1510–2010.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/3-h-diplo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "H-Diplo Roundtable, Vol. X, No. 15 (2009)"
collection: book_reviews
permalink: /book_reviews/3-diplo
excerpt: ' With Federico Manfredi, extended review of David Edelstein, Occupational Hazards: Success & Failure in Military Occupations'
# date: 2009-01-01
venue: 'Journal 1'
# link
paperurl: 'https://networks.h-net.org/h-diplo'
# citation: ''
---
H-Diplo Roundtable, Vol. X, No. 15 (2009). With Federico Manfredi, extended review of David Edelstein, Occupational Hazards: Success & Failure in Military Occupations, http://www.h-net.org/~diplo/williams 2009.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/4-political_science.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "Political Science Quarterly (Winter 2008–9)"
collection: book_reviews
permalink: /book_review/4-political_science
excerpt: 'Vol. 123, No. 4 (Winter 2008–9). Review of Nina Tannenwald, The Nuclear Taboo: The United States and the Non-Use of Nuclear Weapons Since 1945.'
date: 2008-09-01
venue: 'Journal 1'
# link
# paperurl: ''
# citation: ''
---
Political Science Quarterly, Vol. 123, No. 4 (Winter 2008–9). Review of Nina Tannenwald, The Nuclear Taboo: The United States and the Non-Use of Nuclear Weapons Since 1945.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/5-journal_of_cold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "Journal of Cold War Studies (Winter 2009)"
collection: book_reviews
permalink: /book_review/5-journal_of_cold
excerpt: 'Vol. 11, No. 1 (Winter 2009). Review of Kevin Narizny, The Political Economy of Grand Strategy.'
# date: 2009-12-01
venue: 'Journal 1'
# link
# paperurl: ''
# citation: ''
---
Journal of Cold War Studies, Vol. 11, No. 1 (Winter 2009). Review of Kevin Narizny, The Political Economy of Grand Strategy.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/6-political-sciences_121.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "Political Science Quarterly (Fall 2009)"
collection: book_reviews
permalink: /book_review/6-political-sciences_121
excerpt: 'Vol. 121, No. 3 (Fall 2006). Review of Hendrik Spruyt, Ending Empire: Contested Sovereignty and Territorial Partition.'
date: 2009-12-01
venue: 'Journal 1'
# link
# paperurl: ''
# citation: ''
---
Political Science Quarterly, Vol. 121, No. 3 (Fall 2006). Review of Hendrik Spruyt, Ending Empire: Contested Sovereignty and Territorial Partition.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
16 changes: 16 additions & 0 deletions _book_reviews/7-international_studies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: "International Studies Review (2004)"
collection: book_reviews
permalink: /book_review/7-international_studies.
excerpt: 'Vol. 6 (2004). Review of Edward D. Mansfield and Brian M. Pollins, eds., Economic Interdependence and International Conflict: New Perspectives on an Enduring Debate.'
date: 2009-12-01
venue: 'Journal 1'
# # link
# paperurl: ''
# citation: ''
---
International Studies Review, Vol. 6 (2004). Review of Edward D. Mansfield and Brian M. Pollins, eds., Economic Interdependence and International Conflict: New Perspectives on an Enduring Debate.

<!-- [Read paper here](http://www.foreignaffairs.com/articles/141036/peter-liberman-and-julie-a-george/will-conquest-pdf) -->

<!-- Recommended citation: Your Name, You. (2009). "Paper Title Number 1." <i>Journal 1</i>. 1(1). -->
Loading