Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: academicpages/academicpages.github.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ALSETLab/ALSETLab.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Jul 24, 2017

  1. Update _config.yml

    First change to _config.yml according to instructions
    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    76e30e4 View commit details
  2. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    2abd5c9 View commit details
  3. Update about.md

    Clearing up as suggested in tutorial.
    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    b2d0d98 View commit details
  4. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    392ab5d View commit details
  5. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    6e4bdf5 View commit details
  6. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    15dd98d View commit details
  7. Update navigation.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    1ce3806 View commit details
  8. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    46fc17a View commit details
  9. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    fce66d8 View commit details
  10. Add files via upload

    adding images for the website
    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    a6b6bd0 View commit details
  11. Update _config.yml

    updating avatar
    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    16dc04b View commit details
  12. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    fb2aeb6 View commit details
  13. Add files via upload

    adding rpi logo
    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    c2d1e6b View commit details
  14. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    173da40 View commit details
  15. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    754f0f3 View commit details
  16. Create CNAME

    lvanfretti committed Jul 24, 2017
    Copy the full SHA
    e6c3bbf View commit details
  17. Update _config.yml

    lvanfretti authored Jul 24, 2017
    Copy the full SHA
    b6c6e61 View commit details

Commits on Jul 25, 2017

  1. Update _config.yml

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    2b71782 View commit details
  2. Delete CNAME

    lvanfretti committed Jul 25, 2017
    Copy the full SHA
    1f0ea3b View commit details
  3. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    2fca115 View commit details
  4. Add files via upload

    luigi small picture
    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    2101515 View commit details
  5. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    e84adfa View commit details
  6. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    8b4a6f8 View commit details
  7. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    2b93a63 View commit details
  8. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    dbe0067 View commit details
  9. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    ff7723a View commit details
  10. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    ecc200f View commit details
  11. Add files via upload

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    ccd0b5e View commit details
  12. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    d2a33c4 View commit details
  13. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    ec0c7c5 View commit details
  14. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    599594d View commit details
  15. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    cd7a355 View commit details
  16. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    ff8a4d7 View commit details
  17. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    ac656ef View commit details
  18. Update about.md

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    20e6c7d View commit details
  19. Update _config.yml

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    4983832 View commit details
  20. Update navigation.yml

    lvanfretti authored Jul 25, 2017
    Copy the full SHA
    0275739 View commit details
  21. Copy the full SHA
    008f856 View commit details
  22. update

    lvanfretti committed Jul 25, 2017
    Copy the full SHA
    34b3430 View commit details
  23. no message

    lvanfretti committed Jul 25, 2017
    Copy the full SHA
    53c6a54 View commit details
  24. changes

    lvanfretti committed Jul 25, 2017
    Copy the full SHA
    4eeae83 View commit details
  25. fix cv

    lvanfretti committed Jul 25, 2017
    Copy the full SHA
    f24ccfd View commit details

Commits on Jul 26, 2017

  1. update

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    dc4f879 View commit details
  2. update pages

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    b801980 View commit details
  3. no message

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    22f20e6 View commit details
  4. Updates!

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    4308879 View commit details
  5. Update clean up.

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    92557f1 View commit details
  6. fixing publications page

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    4658ca9 View commit details
  7. fixing again...

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    b853306 View commit details
  8. no message

    lvanfretti committed Jul 26, 2017
    Copy the full SHA
    6931003 View commit details
Showing with 3,781 additions and 509 deletions.
  1. BIN .DS_Store
  2. +22 −24 _config.yml
  3. +7 −16 _data/authors.yml
  4. +40 −15 _data/navigation.yml
  5. +0 −221 _data/ui-text.yml
  6. +3 −0 _pages/404.md
  7. +34 −33 _pages/about.md
  8. +40 −0 _pages/consulting.md
  9. +77 −49 _pages/cv.md
  10. +70 −0 _pages/donate.md
  11. +33 −0 _pages/lab.md
  12. +128 −0 _pages/labroster.md
  13. +58 −0 _pages/links.md
  14. +2,723 −0 _pages/publications.md
  15. +36 −0 _pages/recruiting.md
  16. +125 −0 _pages/research.md
  17. +5 −0 _pages/sitemap.md
  18. +93 −0 _pages/software.md
  19. +99 −0 _pages/students.md
  20. +2 −2 _pages/talks.html
  21. +1 −0 _pages/teaching.html
  22. +1 −1 _pages/terms.md
  23. +0 −20 _posts/2012-08-14-blog-post-1.md
  24. +0 −20 _posts/2013-08-14-blog-post-2.md
  25. +0 −20 _posts/2014-08-14-blog-post-3.md
  26. +0 −11 _talks/2012-03-01-talk-1.md
  27. +0 −13 _talks/2013-03-01-tutorial-1.md
  28. +0 −13 _talks/2014-02-01-talk-2.md
  29. +0 −11 _talks/2014-03-01-talk-3.md
  30. +35 −0 _talks/talks.md
  31. +0 −20 _teaching/2014-spring-teaching-1.md
  32. +0 −20 _teaching/2015-spring-teaching-2.md
  33. +15 −0 _teaching/2017-fall-teaching-1.md
  34. +25 −0 _teaching/2018-fall-teaching.md
  35. +16 −0 _teaching/2018-spring-teaching.md
  36. +25 −0 _teaching/2019-fall-teaching.md
  37. +16 −0 _teaching/2019-spring-teaching.md
  38. BIN files/paper1.pdf
  39. BIN files/paper2.pdf
  40. BIN files/paper3.pdf
  41. BIN images/3953273590_704e3899d5_m.jpg
  42. BIN images/500x300.png
  43. BIN images/ALSETLab-1pager.pdf
  44. BIN images/ALSETLab-1pager.png
  45. BIN images/bio-photo-2.jpg
  46. BIN images/bio-photo.jpg
  47. BIN images/charlie.gif
  48. BIN images/donors/DE_logo.png
  49. BIN images/donors/GER_logo.png
  50. BIN images/donors/SEL_logo.png
  51. BIN images/donors/github_logo.png
  52. BIN images/donors/notion_logo.png
  53. BIN images/editing-talk.png
  54. BIN images/foo-bar-identity-th.jpg
  55. BIN images/foo-bar-identity.jpg
  56. BIN images/image-alignment-1200x4002.jpg
  57. BIN images/image-alignment-150x150.jpg
  58. BIN images/image-alignment-300x200.jpg
  59. BIN images/image-alignment-580x300.jpg
  60. BIN images/logo/rpilogo.png
  61. BIN images/luigi_small.jpg
  62. BIN images/mstile-144x144.png
  63. BIN images/mstile-150x150.png
  64. BIN images/mstile-310x150.png
  65. BIN images/mstile-310x310.png
  66. BIN images/mstile-70x70.png
  67. BIN images/paragraph-indent.png
  68. BIN images/paragraph-no-indent.png
  69. BIN images/profile.png
  70. BIN images/rpilogo.png
  71. BIN images/site-logo.png
  72. +26 −0 redirect/RPI-ECSE/index.html
  73. +26 −0 redirect/RPI-RCS/index.html
Binary file added .DS_Store
Binary file not shown.
46 changes: 22 additions & 24 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

# Site Settings
locale : "en-US"
title : "Your Name / Site Title"
title : "ALSETLab Home"
title_separator : "-"
name : &name "Your Name"
description : &description "personal description"
url : https://academicpages.github.io # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
name : &name "Luigi Vanfretti"
description : &description "Prof. Luigi Vanfretti's research group and lab. working on cyber-physical power system modeling and simulation, stability and control, and synchrophasor technology."
url : https://ALSETLab.github.io # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
baseurl : "" # the subpath of your site, e.g. "/blog"
repository : "academicpages/academicpages.github.io"
repository : "ALSETLAB/ALSETLab.github.io"
teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png"
breadcrumbs : false # true, false (default)
words_per_minute : 160
@@ -72,42 +72,44 @@ social:
analytics:
provider : "google-universal" # false (default), "google", "google-universal", "custom"
google:
tracking_id :
tracking_id : "UA-9051787-3"


# Site Author
author:
name : "Your Sidebar Name"
avatar : "profile.png"
bio : "Your biography for the left-hand sidebar"
location : "Location"
employer :
googlescholar : "http://yourfullgooglescholarurl.com"
email :
name : "ALSETLab"
avatar : "rpilogo.png"
bio : "Prof. Luigi Vanfretti's research group and lab. working on cyber-physical power system modeling and simulation, stability and control."
location : "Troy, NY"
employer : "RPI"
googlescholar : "https://scholar.google.com/citations?user=_XI6Q6UAAAAJ&hl=en&oi=ao"
email : "luigi.vanfretti@gmail.com"
uri :
bitbucket :
codepen :
dribbble :
flickr :
facebook :
foursquare :
github : "academicpages"
github : "lvanfretti"
google_plus :
keybase :
instagram :
lastfm :
linkedin :
orcid : "http://orcid.org/yourorcidurl"
linkedin : "vanfretti"
orcid : "https://orcid.org/0000-0002-4125-1055"
pinterest :
researcherid : "http://www.researcherid.com/rid/B-8174-2017"
scopus : "https://www.scopus.com/authid/detail.uri?authorId=23029592800"
soundcloud :
stackoverflow : # http://stackoverflow.com/users/123456/username
stackoverflow : "https://stackoverflow.com/users/8391684/luigi-vanfretti"
steam :
tumblr :
twitter : "replacethistwitterhandle"
twitter : "lvanfretti"
vine :
weibo :
xing :
youtube :
youtube : "lvanfretti"
wikipedia :


@@ -145,15 +147,13 @@ keep_files:
encoding: "utf-8"
markdown_ext: "markdown,mkdown,mkdn,mkd,md"


# Conversion
markdown: kramdown
highlighter: rouge
lsi: false
excerpt_separator: "\n\n"
incremental: false


# Markdown Processing
kramdown:
input: GFM
@@ -165,7 +165,6 @@ kramdown:
smart_quotes: lsquo,rsquo,ldquo,rdquo
enable_coderay: false


# Collections
collections:
teaching:
@@ -181,7 +180,6 @@ collections:
output: true
permalink: /:collection/:path/


# Defaults
defaults:
# _posts
@@ -248,7 +246,7 @@ sass:
permalink: /:categories/:title/
# paginate: 5 # amount of posts to show
# paginate_path: /page:num/
timezone: America/Los_Angeles # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones


# Plugins
23 changes: 7 additions & 16 deletions _data/authors.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
# Authors

Name Name:
name : "Name Name"
uri : "http://name.com"
email : "name@name.com"
bio : "This is the first name."
avatar : "bio-photo-2.jpg"
twitter : "name"
google_plus : "Name"

Name2 Name2:
name : "Name2 Name2"
email : "name2@name2.com"
bio : "I ordered what?"
avatar : "bio-photo.jpg"
twitter : "name2"
google_plus : "Name"
name : "Luigi Vanfretti"
uri : "http://alsetlab.com"
email : "luigi.vanfretti@gmail.com"
bio : "Associate Professor, @RPI, Troy, NY 🇺🇸. Lead of ALSETLab! Electrical Power & Cyber Physical Systems, Modeling & Simulation, Modelica & FMI "
avatar : "luigi_xsmall.jpg"
twitter : "lvanfretti"
google_plus : "luigi.vanfretti"
55 changes: 40 additions & 15 deletions _data/navigation.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,47 @@
# main links links
main:

- title: "Contact & CV"
url: /cv/

- title: "The Lab!"
url: /lab/

- title: "Consulting"
url: /consulting/

- title: "Publications"
url: /publications/

- title: "Talks"
url: /talks/
- title: "Research"
url: /research/

- title: "Lab. Members"
url: /labroster/

- title: "For Students"
url: /students/

- title: "Teaching"
url: /teaching/

- title: "Portfolio"
url: /portfolio/

- title: "Blog Posts"
url: /year-archive/

- title: "CV"
url: /cv/

- title: "Guide"
url: /markdown/
url: /teaching/

- title: "Software"
url: /software/

- title: "Donors/Donate!"
url: /donate/

- title: "Links"
url: /Links/

# - title: "Talks"
# url: /talks/

# - title: "Portfolio"
# url: /portfolio/

# - title: "Blog Posts"
# url: /year-archive/

# - title: "Guide"
# url: /markdown/
Loading