Skip to content

Commit

Permalink
Merge pull request #13 from okTurtles/mkBlog
Browse files Browse the repository at this point in the history
Added blog!
  • Loading branch information
taoeffect authored Jun 18, 2016
2 parents c6699ca + 4747c28 commit 1045983
Show file tree
Hide file tree
Showing 62 changed files with 2,528 additions and 4,806 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ Thumbs.db
db.json
*.log
node_modules/
public/
.deploy*/
notes.md
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ A `group income` ___(n)___ is a fair income sharing mechanism that allows groups

### Contributing

__This project uses [Hexo](https://hexo.io/) to generate the HTML from the `index.md` files inside `/source`!__ So if you want to translate or update this webpage, __please focus on `index.md` files.__
__This project uses [Hexo](https://hexo.io/) to generate the HTML from the `index.md` files inside `/source`!__ So if you want to translate or update this webpage, __please focus on `index.md`.

Make sure to work in a named branch. See [`CONTRIBUTING.md`](https://github.com/okTurtles/group-income-simple/blob/master/CONTRIBUTING.md) for details.

#### Getting started

If you haven't already, you'll need to install [Hexo](https://hexo.io):
If you haven't already, you'll need to install [Hexo](https://hexo.io). Some optional dependencies were causing a ["Module version mismatch" error](https://github.com/hexojs/hexo/issues/1733), so we recommend using the `--no-optional` tag and `--save`-ing that preference to hexo's `package.json`:

``` bash
npm install hexo-cli -g
npm install hexo -g --no-optional --save
```

Clone the website repo & install dependencies:
Expand All @@ -52,6 +52,6 @@ The [Hexo server](https://hexo.io/docs/server.html) will watch for file changes/

### Contributors

- [taoeffect](https://github.com/taoeffect)
- [dotmacro](https://github.com/dotmacro)
- [taoeffect](https://github.com/taoeffect)

16 changes: 13 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ timezone:

# URL
## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
url: http://groupcurrency.org/
url: http://groupincome.org
root: /
permalink: :title/
permalink: :year/:month/:day/:title/
permalink_defaults:

# Directory
Expand All @@ -31,7 +31,7 @@ skip_render: README.md
# Writing
new_post_name: :title.md # File name of new posts
default_layout: page
titlecase: false # Transform title into titlecase
titlecase: true # Transform title into titlecase
external_link: true # Open external links in new tab
filename_case: 0
render_drafts: false
Expand Down Expand Up @@ -70,3 +70,13 @@ theme: minos
## Docs: https://hexo.io/docs/deployment.html
deploy:
type:

# RSS feed
feed:
type: atom
path: atom.xml
limit: 20
hub:

# Disqus
disqus_shortname:
Loading

0 comments on commit 1045983

Please sign in to comment.