From: Philippe Barbosa <contact@philippebarbosa.com>
Date: Wed, 2 Mar 2016 15:10:07 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1f25e0b65d27503f2cfc16dd1ac9cfc5f3948bd4;p=mezzo.git

Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
---

1f25e0b65d27503f2cfc16dd1ac9cfc5f3948bd4
diff --cc README.rst
index e42eb7fa,01f41eab..a95c82cc
--- a/README.rst
+++ b/README.rst
@@@ -27,42 -27,8 +27,42 @@@ The last command is needed to init the 
  Restore the backuped database, in another terminal (or a Docker Quickstart Terminal)::
  
      cd Manifeste
-     ./scripts/restore.sh
+     scripts/restore.sh
  
  Give you user password if asked.
 -
  You should be able to browse the app at http://localhost:8010/ (replacing 'localhost' by the IP given by the docker terminal on OSX and Windows)
 +
 +If app is broken after a restore script :
 +`docker-compose restart` to restart the machine.
 +
 +Work with gulp
 +==================
 +
 +Gulp allow to compile scss to css, concatenate js files and has a watcher, who do this tasks on file change.
 +Gulp require nodejs installed on your computer to work.
 +
 +- 1. Install gulp globally:
 +__If you have previously installed a version of gulp globally, please run `npm rm --global gulp`
 +to make sure your old version doesn't collide with gulp-cli.__
 +
 +```
 +$ npm install --global gulp-cli
 +```
 +
 +- 2. Install gulp dependancies
 +
 +```
 +$ npm install
 +```
 +
 +- 3. Run gulp:
 +
 +```sh
 +$ gulp [task]
 +```
 +
 +Paths
 +============
 +
 +- `app/festival/templates` : Personnal templates
 +- `app/festival/static/festival` : Static files