Merged dev into branch, added docs into README.md
This commit is contained in:
parent
2824ba5aaf
commit
717f5fc9ec
3 changed files with 62 additions and 14 deletions
|
|
@ -1,15 +1,39 @@
|
|||
# Scope 2015 #
|
||||
# Scopesessions website
|
||||
|
||||
scopesessions.org
|
||||
|
||||
* Built with Jekyll
|
||||
* 0.0.1
|
||||
* 1.0.0
|
||||
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
|
||||
|
||||
### Development ###
|
||||
### Development
|
||||
|
||||
1. Install [Jekyll](http://jekyllrb.com)
|
||||
2. Serve files
|
||||
* Install [Jekyll](http://jekyllrb.com)
|
||||
* Clone repository
|
||||
```
|
||||
git clone https://acorbi@bitbucket.org/acorbi/scopesessions.org.git
|
||||
```
|
||||
* Install dependencies
|
||||
```
|
||||
bower install
|
||||
```
|
||||
* Serve files
|
||||
```
|
||||
#!
|
||||
jekyll serve
|
||||
```
|
||||
|
||||
### Deployment
|
||||
|
||||
* Build files
|
||||
```
|
||||
jekyll build
|
||||
```
|
||||
* SSH into scopesessions.org and pull the changes from master
|
||||
```
|
||||
cd /var/www/vhosts/scopesessions.org
|
||||
git pull
|
||||
```
|
||||
|
||||
**NOTE:** There are two branches:
|
||||
* master: production code, always keep functional and error-free
|
||||
* dev: development branch, merge to master when production-ready
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
</description>
|
||||
<link>http://scopesessions.org/</link>
|
||||
<atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" />
|
||||
<pubDate>Thu, 16 Apr 2015 12:26:06 +0200</pubDate>
|
||||
<lastBuildDate>Thu, 16 Apr 2015 12:26:06 +0200</lastBuildDate>
|
||||
<pubDate>Thu, 16 Apr 2015 12:46:17 +0200</pubDate>
|
||||
<lastBuildDate>Thu, 16 Apr 2015 12:46:17 +0200</lastBuildDate>
|
||||
<generator>Jekyll v2.5.2</generator>
|
||||
|
||||
<item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue