-
Notifications
You must be signed in to change notification settings - Fork 3
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 github.com:JuliaFEM/juliafem.github.io
- Loading branch information
Showing
1 changed file
with
21 additions
and
2 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 |
---|---|---|
@@ -1,3 +1,22 @@ | ||
# 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](https://jekyllrb.com/) related stuff installed on | ||
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 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 | ||
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. |