From 717f5fc9ecfc196ea22fdfdda8aa27dcf056171a Mon Sep 17 00:00:00 2001 From: "Open-Steps.org" Date: Thu, 16 Apr 2015 12:46:52 +0200 Subject: [PATCH] Merged dev into branch, added docs into README.md --- README.md | 36 ++++++++++++++++++++++++++++++------ _site/README.md | 36 ++++++++++++++++++++++++++++++------ _site/feed.xml | 4 ++-- 3 files changed, 62 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 8525f967..a8774f97 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/_site/README.md b/_site/README.md index 8525f967..a8774f97 100644 --- a/_site/README.md +++ b/_site/README.md @@ -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 diff --git a/_site/feed.xml b/_site/feed.xml index f2c054e1..83e9ed04 100644 --- a/_site/feed.xml +++ b/_site/feed.xml @@ -6,8 +6,8 @@ http://scopesessions.org/ - Thu, 16 Apr 2015 12:26:06 +0200 - Thu, 16 Apr 2015 12:26:06 +0200 + Thu, 16 Apr 2015 12:46:17 +0200 + Thu, 16 Apr 2015 12:46:17 +0200 Jekyll v2.5.2