forked from alshedivat/al-folio
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/alshedivat/al-folio
* 'master' of https://github.com/alshedivat/al-folio: (35 commits) Fixes alshedivat#304. Fix bad horizontal template include (alshedivat#305) Adds support for image zoom (alshedivat#296) Fix project page colors (alshedivat#295) Added BibTeX hidden block (alshedivat#293) add dblp to social links (alshedivat#270) Fix for images (alshedivat#271) Added proper instructions in personal webpages (alshedivat#261) Added the Programming Group at HSG to labs (alshedivat#254) Categories for projects and an optional horizontal project card style (alshedivat#224) Change gitcdn link (alshedivat#234) Issue 183 (alshedivat#192) Update Gemfile (alshedivat#230) Add gitlab to social (alshedivat#229) Update stale.yml Create stale.yml Switch favicon to emoji (alshedivat#217) Update README.md (alshedivat#216) Update README.md Update README.md Fix titles and headings (alshedivat#204) ... # Conflicts: # _bibliography/papers.bib # _config.yml # _data/coauthors.yml # _includes/head.html # _layouts/about.html # _layouts/bib.html # _pages/projects.md # _projects/mali.markdown # _sass/_base.scss # _sass/_themes.scss # _sass/_variables.scss # _software/feddlib.markdown # _teaching/ss20-scientific-machine-learning.markdown # _teaching/ws1516-seminar-numII.markdown
- Loading branch information
Showing
39 changed files
with
848 additions
and
274 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Number of days of inactivity before an issue becomes stale | ||
daysUntilStale: 60 | ||
# Number of days of inactivity before a stale issue is closed | ||
daysUntilClose: 7 | ||
# Issues with these labels will never be considered stale | ||
exemptLabels: | ||
- pinned | ||
- security | ||
- enhancement | ||
# Label to use when marking an issue as stale | ||
staleLabel: wontfix | ||
# Comment to post when marking an issue as stale. Set to `false` to disable | ||
markComment: > | ||
This issue has been automatically marked as stale because it has not had | ||
recent activity. It will be closed if no further activity occurs. Thank you | ||
for your contributions. | ||
# Comment to post when closing a stale issue. Set to `false` to disable | ||
closeComment: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
name: Deploy | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
- source | ||
pull_request: | ||
branches: | ||
- master | ||
- source | ||
|
||
jobs: | ||
deploy: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
- name: Setup Ruby | ||
uses: actions/setup-ruby@v1 | ||
with: | ||
ruby-version: '2.7' | ||
- name: Enable bundler cache | ||
uses: actions/cache@v2 | ||
with: | ||
path: vendor/bundle | ||
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} | ||
restore-keys: | | ||
${{ runner.os }}-gems- | ||
- name: Install deps | ||
run: | | ||
gem install bundler | ||
bundle config path vendor/bundle | ||
bundle install --jobs 4 --retry 3 | ||
- name: Setup deploy options | ||
id: setup | ||
run: | | ||
git config --global user.name "GitHub Action" | ||
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" | ||
if [[ ${GITHUB_REF} = refs/pull/*/merge ]]; then # pull request | ||
echo "::set-output name=SRC_BRANCH::${GITHUB_HEAD_REF}" | ||
echo "::set-output name=NO_PUSH::--no-push" | ||
elif [[ ${GITHUB_REF} = refs/heads/* ]]; then # branch, e.g. master, source etc | ||
echo "::set-output name=SRC_BRANCH::${GITHUB_REF#refs/heads/}" | ||
fi | ||
if [[ ${{ github.repository }} = *.github.io ]]; then # user/org repo | ||
echo "::set-output name=DEPLOY_BRANCH::master" | ||
else | ||
echo "::set-output name=DEPLOY_BRANCH::gh-pages" | ||
fi | ||
- name: Deploy website | ||
run: yes | bin/deploy --verbose ${{ steps.setup.outputs.NO_PUSH }} | ||
--src ${{ steps.setup.outputs.SRC_BRANCH }} | ||
--deploy ${{ steps.setup.outputs.DEPLOY_BRANCH }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
_site | ||
.bundle | ||
.sass-cache | ||
.jekyll-cache | ||
.jekyll-metadata | ||
.DS_store | ||
.ruby-version | ||
.tweet-cache/ | ||
.tweet-cache | ||
Gemfile.lock | ||
vendor |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
source 'https://rubygems.org' | ||
group :jekyll_plugins do | ||
gem 'github-pages' | ||
gem 'jekyll' | ||
gem 'jekyll-email-protect' | ||
gem 'jekyll-github-metadata' | ||
gem 'jekyll-paginate-v2' | ||
gem 'jekyll-scholar' | ||
gem 'jekyll-twitter-plugin' | ||
gem 'jemoji' | ||
gem 'kramdown-parser-gfm' | ||
gem 'unicode_utils' | ||
gem 'webrick' | ||
end |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,59 +1,79 @@ | ||
Balzani: | ||
- firstname: ["Daniel", "D."] | ||
url: http://www.lkm.rub.de/institut/team/Balzani.html | ||
|
||
Deparis: | ||
- firstname: ["Simone", "S."] | ||
url: https://people.epfl.ch/Simone.Deparis?lang=en | ||
|
||
Frei: | ||
- firstname: ["Stefan", "S."] | ||
url: https://www.math.uni-konstanz.de/~frei/ | ||
|
||
Grimm: | ||
- firstname: ["Viktor", "V."] | ||
url: https://numerik.uni-koeln.de/arbeitsgruppe/v-grimm-m-sc | ||
|
||
Hochmuth: | ||
- firstname: ["Christian", "C."] | ||
url: https://numerik.uni-koeln.de/arbeitsgruppe/dr-c-hochmuth | ||
|
||
Lanser: | ||
- firstname: ["Martin", "M."] | ||
url: https://numerik.uni-koeln.de/arbeitsgruppe/dr-m-lanser | ||
|
||
Klawonn: | ||
- firstname: ["Axel", "A."] | ||
url: https://numerik.uni-koeln.de | ||
|
||
Knepper: | ||
- firstname: ["Jascha", "J."] | ||
url: https://numerik.uni-koeln.de/arbeitsgruppe/j-knepper-m-sc | ||
|
||
Kühn: | ||
- firstname: ["Martin", "M."] | ||
url: https://www.dlr.de/sc/desktopdefault.aspx/tabid-1192/1635_read-38447/sortby-b_city/ | ||
|
||
Perego: | ||
- firstname: ["Mauro", "M."] | ||
url: https://cfwebprod.sandia.gov/cfdocs/CompResearch/templates/insert/profile.cfm?mperego | ||
|
||
Quarteroni: | ||
- firstname: ["Alfio", "A."] | ||
url: https://mox.polimi.it/people/alfio-quarteroni/ | ||
|
||
Rajamanickam: | ||
- firstname: ["Sivasankaran", "Siva", "S."] | ||
url: https://www.sandia.gov/~srajama/index.html | ||
|
||
Rheinbach: | ||
- firstname: ["Oliver", "O."] | ||
url: https://tu-freiberg.de/fakult1/nmo/rheinbach | ||
|
||
Richter: | ||
- firstname: ["Thomas", "T."] | ||
url: https://www.math.uni-magdeburg.de/~richter/ | ||
|
||
Röver: | ||
- firstname: ["Friederike", "F."] | ||
url: https://tu-freiberg.de/fakult1/nmo/roever | ||
|
||
Sandfeld: | ||
- firstname: ["Stefan", "S."] | ||
url: https://tu-freiberg.de/fakult4/imfd/mimm/mitarbeiter/stefan-sandfeld | ||
|
||
Schröder: | ||
- firstname: ["Jörg", "J."] | ||
url: https://www.uni-due.de/mechanika/index.php | ||
|
||
Steinberger: | ||
- firstname: ["Daniel", "D."] | ||
url: https://tu-freiberg.de/fakult4/imfd/mimm/mitarbeiter/dominik-steinberger | ||
|
||
Weber: | ||
- firstname: ["Janine", "J."] | ||
url: https://numerik.uni-koeln.de/arbeitsgruppe/j-weber-m-sc | ||
|
||
Widlund: | ||
- firstname: ["Olof B.", "Olof B.", "O. B.", "O."] | ||
url: https://cs.nyu.edu/widlund/ |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.