Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Elias Meire committed Jul 26, 2017
2 parents e0d4110 + f8c1749 commit 5190bb7
Show file tree
Hide file tree
Showing 147 changed files with 13,791 additions and 237 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@ typings/
# dotenv environment variables file
.env

build/

build/
*.css
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
dist: precise
language: node_js
node_js: node
before_script: yarn build-css
script:
- npm test
- npm run lint
- yarn test
- yarn lint
before_deploy: yarn build
deploy:
provider: firebase
skip_cleanup: true
on:
branch: develop
branch: master
token:
secure: "GS79zf4LkXMykpAmkHvUM56+qTtrTfTaa1E+2dCBziQHPfaMHJPvP/41Qmz5lzj9aPAxtdi7O1jr8WIQYlbM/gjmZhikz+ph91w1qbf0eMAE4kLK885hvjSb2pu6LAMvg6TZyu4ntjcaumjKle7Hia1EjfU0tfgYuFc+4Q1SM6w2YhIfZF8TyKU4wGGBOLzvchVEMZUsVswMlepcQ8xI5Azj5fymleUVP9CWonIZn2IoJPnrnDt93ndBiY0d7I3Ym+n5rADMi+G/nz6jgQun//Sbh12hMBgspPuSe+3Gfmn0qQyAv85JgkvR8pj23L0sFFdP+I+lC7lHdxkbeerY5X8rYQZKR8QwB1uzPKiwC4nuEJnUPaq3FS7afepmbqk7j138YpdZmq1BMUR9Pm5hzcd6Shg6OyD54c031L5qB12+fVY1f0t5M+u/ORhsAGiOgMaWajiWntf90U3OlYh9jKPJDOMoK2BNdsCUKelzuF3lQzrLAzvQwuEIXCA5colX06r0jXsNG9GrUbnbybv8QxOikc5p3SjbUdqXA8MSmR73T4ucqn3LqXD6XIiguxal62N5NylNFT+oEAeIDBCKIIFpCz4oTT2AS1Cq2ayhQYUwKRJfdLlH8fHai+CepDfrCRf1UsVSWmR5lJvKKsP0Vpu4JEystsTs4iP9caVoP8g="
secure: "mOV5wAxFJPwQd5eIfq8Q/OOxeQBVUGf4SHUL7ZDoJw6DzAoX8GP37s9hhoD+tZQosKitZneIg6VzJ+B+I3C25plzMVDZ68nXmjIb7s10cUcha6haaF8yYqT/0rAkE+P9XOCJHFoP1c6JfWtMWyhXjUm1NQSdhtjT0bAr0eg9qJVguCoQr2QYGpfYQR2tsGSDBuPsuEKvMGETpEtVmss+mA2umkBV3AG/DieAbYLs+XAPz5OX2Jf8oS5ccluJGUyZNyyDZr9+8M/Go7NYvHbDbDQtlTT//cnf09zexcNc90FTb7Wyxu2yrRsSfqGildShmed1h/s5Qpt1Uemh5AQtRBDcClF+2BD5dwg4DUwQ9EyljxCu6ujbfqZHMxmsB95q4rXh+nAYFtc+tYkeo7tms57lluLQ/aaBOvLUyPOXhmIZ421roJnW7EKSDdQKaJr9BhFlPoWiBgG7c1IcHCwYsKIaeu9j4MCdgP4pojXe5J8cTN2WQCNlY287wfokfIiFs5p3NEDGZjas++abjHoZyCi87u7pu5jLCtclpIaYXUpH5LtPobCVqsktMgyL+8zNkZodBa7w4kGO0fpr17LfAed/ZpUF43jixL0LISRfBkB/Qz3flDt5QOvwxPZxf+M2gZMuKwEzRq1m8K+Yn6hgWNUzlw1mXSTzEEI1GEk+PsU="
cache: yarn
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# iShare

[![Build Status](https://travis-ci.org/oSoc17/ishare.svg?branch=develop)](https://travis-ci.org/oSoc17/istwaar)
[![Build Status](https://travis-ci.org/oSoc17/ishare.svg?branch=develop)](https://travis-ci.org/oSoc17/ishare)
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
![Dependencies Status](https://david-dm.org/osoc17/ishare.svg)

> Educational web app that teaches history based on human stories
see it live on https://snipstory.be!

## Local development

### Install dependencies
Expand Down
Loading

0 comments on commit 5190bb7

Please sign in to comment.