Merge branch 'master' into feature/update_logo

This commit is contained in:
Kelvin 2015-06-15 14:35:20 +01:00
commit ba5fd7f6e6

View file

@ -6,7 +6,7 @@ To begin development, you must do three things:
2. Install the "vagrant-bindfs" plugin: `vagrant plugin install vagrant-bindfs`
3. Create the directory ``pony.fm.files`` in the repository's parent directory
3. Create the directory `pony.fm.files` in the repository's parent directory
4. Run `vagrant up` from the folder in which you cloned the repository
@ -19,6 +19,9 @@ Pony.fm uses gulp to mange its asset pipeline. **Important** due to everything b
And then install all of the required local packages by invoking:
> npm install
Finally, build all of the scripts by executing:
> gulp build
During development, you should make a point to run "gulp watch". You can do this simply by executing:
> gulp watch
@ -29,4 +32,4 @@ Pony.fm uses nginx, php-fpm, redis, and MySQL. You can modify the configuration
If you need to change any other configuration file on the VM - copy the entire file over into the vagrant folder, make your changes, and update the "copy-and-restart-config.sh" script to copy the modified config back into the proper folder. All potential configuration requirements should be represented in the vagrant folder **and never only on the VM itself** as changes will not be preserved.
**NOTE:** currently, Redis' configuration is not reloaded by the "copy-and-restart-config.sh"
**NOTE:** currently, Redis' configuration is not reloaded by the "copy-and-restart-config.sh"