From ab7fd1479176efbd887c4bdc7f1eec7dc16443f9 Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Tue, 15 Aug 2017 15:06:01 +0300 Subject: [PATCH 1/5] Update README.md --- README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66ed652..7d8be95 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ -# juliafem.github.io +# juliafem.github.io / www.juliafem.org -Web pages for organization. +Web pages for organization. The actual page is juliafem.github.io and www.juliafem.org is pointing +to same site. + +## Adding content + +**for contributors**: If you have all Jekyll related stuff installed on local machine, you can do +`bundle exec jekyll serve` and check from `localhost:4000` that content is OK. If that is the case, +you can then push directly to the master. Otherwise, create branch, do changes, make pull request +and ask someone to review changes locally before merging. + +**for others**: Fork, do local changes, do pull request. If you want to be extra helpful and have +installed Jekyll things on local machine, you can add screenshot of page to PR to make it easier +for reviewers. From 93b029f643899a54cf986eee4a52c8cff4d2fc5c Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Tue, 15 Aug 2017 15:18:50 +0300 Subject: [PATCH 2/5] Update README.md --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7d8be95..5c65013 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,17 @@ to same site. ## Adding content -**for contributors**: If you have all Jekyll related stuff installed on local machine, you can do -`bundle exec jekyll serve` and check from `localhost:4000` that content is OK. If that is the case, -you can then push directly to the master. Otherwise, create branch, do changes, make pull request -and ask someone to review changes locally before merging. +**for contributors**: If you have all [Jekyll](https://jekyllrb.com/) related stuff installed on +local machine (computer you are using to develop), you can do `bundle exec jekyll serve` and check +from `localhost:4000` that content is OK. **If that is the case**, you can then push directly to the +master. Otherwise, create branch, do changes, make pull request and ask someone to review changes +locally before merging. **for others**: Fork, do local changes, do pull request. If you want to be extra helpful and have installed Jekyll things on local machine, you can add screenshot of page to PR to make it easier for reviewers. + +Examples can be written using Jupyter Notebooks or Markdown. See +`examples/2017-08-06-instructions-how-to-write-examples` how to write using Jupyter and +`performance/2017-08-13-eigenvalue-analysis-of-eiffel-tower-using-juliafem-0.3.2.md` how to write +using Markdown syntax. From 9f62148ad0220dd8d1d045b6be488f7b78cef559 Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Tue, 15 Aug 2017 15:19:52 +0300 Subject: [PATCH 3/5] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c65013..205cce8 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ to same site. **for contributors**: If you have all [Jekyll](https://jekyllrb.com/) related stuff installed on local machine (computer you are using to develop), you can do `bundle exec jekyll serve` and check -from `localhost:4000` that content is OK. **If that is the case**, you can then push directly to the +using your web browser from url address `localhost:4000`, (i.e. write to address bar `http://localhost:4000`) +that content is OK. **If that is the case**, you can then push directly to the master. Otherwise, create branch, do changes, make pull request and ask someone to review changes locally before merging. From ae875be381d71a6f3bd97c9a0ac6a3059922d8f5 Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Tue, 15 Aug 2017 15:20:13 +0300 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 205cce8..9fcaedd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ to same site. local machine (computer you are using to develop), you can do `bundle exec jekyll serve` and check using your web browser from url address `localhost:4000`, (i.e. write to address bar `http://localhost:4000`) that content is OK. **If that is the case**, you can then push directly to the -master. Otherwise, create branch, do changes, make pull request and ask someone to review changes +master. **Otherwise**, create branch, do changes, make pull request and ask someone to review changes locally before merging. **for others**: Fork, do local changes, do pull request. If you want to be extra helpful and have From ead312bf8d2f0fb07e9047b20b815d2cdaadcc31 Mon Sep 17 00:00:00 2001 From: Jukka Aho Date: Tue, 15 Aug 2017 15:22:05 +0300 Subject: [PATCH 5/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9fcaedd..6701730 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ to same site. local machine (computer you are using to develop), you can do `bundle exec jekyll serve` and check using your web browser from url address `localhost:4000`, (i.e. write to address bar `http://localhost:4000`) that content is OK. **If that is the case**, you can then push directly to the -master. **Otherwise**, create branch, do changes, make pull request and ask someone to review changes -locally before merging. +master. **Otherwise**, create branch to repository [juliafem.github.io](https://github.com/JuliaFEM/juliafem.github.io), +do changes, make pull request and ask someone to review changes locally before merging. **for others**: Fork, do local changes, do pull request. If you want to be extra helpful and have installed Jekyll things on local machine, you can add screenshot of page to PR to make it easier