randogoth/scopesessions.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged dev into branch, added docs into README.md

Browse source
This commit is contained in:
Open-Steps.org 2015-04-16 12:46:52 +02:00
parent 2824ba5aaf
commit 717f5fc9ec
3 changed files with 62 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
README.md
View file

@ -1,15 +1,39 @@
# Scope 2015 # # Scopesessions website
scopesessions.org scopesessions.org
* Built with Jekyll * Built with Jekyll
* 0.0.1 * 1.0.0
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo) * [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
### Development ### ### Development
1. Install [Jekyll](http://jekyllrb.com) * Install [Jekyll](http://jekyllrb.com)
2. Serve files * Clone repository
```
git clone https://acorbi@bitbucket.org/acorbi/scopesessions.org.git
```
* Install dependencies
```
bower install
```
* Serve files
``` ```
#!
jekyll serve 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

36
_site/README.md
View file

@ -1,15 +1,39 @@
# Scope 2015 # # Scopesessions website
scopesessions.org scopesessions.org
* Built with Jekyll * Built with Jekyll
* 0.0.1 * 1.0.0
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo) * [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
### Development ### ### Development
1. Install [Jekyll](http://jekyllrb.com) * Install [Jekyll](http://jekyllrb.com)
2. Serve files * Clone repository
```
git clone https://acorbi@bitbucket.org/acorbi/scopesessions.org.git
```
* Install dependencies
```
bower install
```
* Serve files
``` ```
#!
jekyll serve 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

4
_site/feed.xml
View file

@ -6,8 +6,8 @@
</description> </description>
<link>http://scopesessions.org/</link> <link>http://scopesessions.org/</link>
<atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" /> <atom:link href="http://scopesessions.org /feed.xml " rel="self" type="application/rss+xml" />
<pubDate>Thu, 16 Apr 2015 12:26:06 +0200</pubDate> <pubDate>Thu, 16 Apr 2015 12:46:17 +0200</pubDate>
<lastBuildDate>Thu, 16 Apr 2015 12:26:06 +0200</lastBuildDate> <lastBuildDate>Thu, 16 Apr 2015 12:46:17 +0200</lastBuildDate>
<generator>Jekyll v2.5.2</generator> <generator>Jekyll v2.5.2</generator>
<item> <item>