Skip to content

Commit

Permalink
Merge pull request #105 from roy-zahor/master
Browse files Browse the repository at this point in the history
cosmetic fixes
  • Loading branch information
ripper234 authored Feb 8, 2017
2 parents 3f86cbd + 2f5864a commit 1ed0b34
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 115 deletions.
9 changes: 5 additions & 4 deletions docs/development/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ $ git remote add midburn https://github.com/Midburn/Spark.git

### Installing Node

It is recommended to use [nvm](https://github.com/creationix/nvm#installation) to get the correct node version.
Optional - It is recommended to use [nvm](https://github.com/creationix/nvm#installation) to get the correct node version.
(If you are not planning to use nvm, just skip these commands).

We have a .nvmrc file which will be detected automatically, so you will get the correct node version.

Expand Down Expand Up @@ -60,16 +61,16 @@ See [/docs/database.md](/docs/development/database.md) for more details about ou

Fire up the server after installation

`spark$ nodemon server.js`
`spark$ nodemon`

and navigate to http://localhost:3000.
and navigate to [http://localhost:3000]().

**Note** nodemon should take care of refreshing the server when you make changes.

### Creating an admin account

After lighting the spark, if this is the first time or if you have recreated the DB
browse to the development console at http://localhost:3000/dev and select **Create admin user**.
browse to the development console at [http://localhost:3000/dev]() and select **Create admin user**.

This will create a user: **a**, password: **a**

Expand Down
108 changes: 0 additions & 108 deletions locales/en.json

This file was deleted.

3 changes: 2 additions & 1 deletion locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
"open_source": "open source",
"project": "project of Midburn Tech.",
"want_to_help": "Want to help us code?",
"toc": "Boring legal stuff",
"toc": "Terms of Use and Privacy Policy",
"toc_link": "http://midburn.org/en/en-terms-and-privacy/",
"links": {

}
Expand Down
3 changes: 2 additions & 1 deletion locales/he/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
"open_source": "קוד פתוח",
"project": "של מידברן-טק.",
"want_to_help": "רוצה לעזור לנו לקודד?",
"toc": "מידע משעמם לעורכי דין",
"toc": "תנאי השימוש באתר ומדיניות פרטיות",
"toc_link": "http://midburn.org/he-terms-and-privacy/",
"links": {

}
Expand Down
2 changes: 1 addition & 1 deletion views/includes/footer.jade
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ footer.text-muted
.footer-links.col-xs-12.text-center
ul
li
a(href='http://midburn.org/terms-and-privacy/')=t('footer.toc')
a(href="#{t('footer.toc_link')}" target='_blank')=t('footer.toc')

li
a(id='scroll_top', href='javascript:;')=t('footer.scrolltop')

0 comments on commit 1ed0b34

Please sign in to comment.