From dbe8b6dd4f8074f05ed35fbe3aee72d2235b5640 Mon Sep 17 00:00:00 2001 From: snapshotpl Date: Sat, 24 Jan 2015 13:08:23 +0100 Subject: [PATCH 1/3] Imporvements in README --- README.md | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 68726d74..7784356f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ [![Build Status](https://travis-ci.org/zendframework/modules.zendframework.com.svg?branch=master)](https://travis-ci.org/zendframework/modules.zendframework.com) # ZF2 Modules Site -Version 0.0.1 ## Introduction @@ -11,25 +10,25 @@ This site will eventually be a community site for publishing and sharing Zend Fr ###Main Setup - * Clone this project git clone git://github.com/zendframework/modules.zendframework.com.git. - * Run **composer install** to initialize your vendors - * Import data/0.sql into your database - * Create a new Application in github here. https://github.com/settings/applications/new + * Clone this project `git clone git://github.com/zendframework/modules.zendframework.com.git` + * Run `composer install` to initialize your vendors + * Import `data/0.sql` into your database + * [Create a new application in GitHub](https://github.com/settings/applications/new) * Main URL and CALLBACK url must be the same without any routing. e.g. http://modules.zendframework.com - * Copy config/autoload/github.local.php.dist to config/autoload/github.local.php and enter the Id and Secret provided during the Application registration on github. - * Copy config/autoload/database.local.php.dist to config/autoload/database.local.php and enter your database credentials here. - * Copy config/autoload/cache.local.php.dist to config/autoload/cache.local.php. It's optional + * Copy `config/autoload/github.local.php.dist` to `config/autoload/github.local.php` and enter the Id and Secret provided during the application registration on GitHub + * Copy `config/autoload/database.local.php.dist` to `config/autoload/database.local.php` and enter your database credentials here + * Copy `config/autoload/cache.local.php.dist` to `config/autoload/cache.local.php`. It's optional ###Vagrant Setup * Clone this project: `git clone git://github.com/zendframework/modules.zendframework.com.git` - * Create a new Application in github [here](https://github.com/settings/applications/new) + * [Create a new application in GitHub](https://github.com/settings/applications/new) * Main URL and CALLBACK url must be the same without any routing. e.g. http://modules.zendframework.com * Remove the `.dist` suffix from the files in `config/autoload` and edit them according to your own credentials - The database information for vagrant is: - - Username: modules - - Database name: modules - - Password: modules + - Username: `modules` + - Database name: `modules` + - Password: `modules` * Run `vagrant up` (You will need [Vagrant](http://www.vagrantup.com/)) * Add an entry in your hosts (`/etc/hosts` or `C:\Windows\system32\drivers\etc\hosts`): - `192.168.56.101 modules.zendframework.dev` @@ -37,6 +36,4 @@ This site will eventually be a community site for publishing and sharing Zend Fr ## Deployment -The master branch of this repository is automatically deployed live to -[modules.zendframework.com](http://modules.zendframework.com/) every 10 -minutes. +The master branch of this repository is automatically deployed live to [modules.zendframework.com](http://modules.zendframework.com/) every 10 minutes. From 42196d9e1e11134359848ab250532a928b5c801c Mon Sep 17 00:00:00 2001 From: snapshotpl Date: Sat, 24 Jan 2015 13:11:49 +0100 Subject: [PATCH 2/3] Move build status next to head title --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7784356f..7ca1fc70 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -[![Build Status](https://travis-ci.org/zendframework/modules.zendframework.com.svg?branch=master)](https://travis-ci.org/zendframework/modules.zendframework.com) - -# ZF2 Modules Site +# ZF2 Modules Site [![Build Status](https://travis-ci.org/zendframework/modules.zendframework.com.svg?branch=master)](https://travis-ci.org/zendframework/modules.zendframework.com) ## Introduction From 5b7e777811b09a8ddcb4a224d478df092701de67 Mon Sep 17 00:00:00 2001 From: snapshotpl Date: Sat, 24 Jan 2015 13:22:50 +0100 Subject: [PATCH 3/3] Gary's deployment :-) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7ca1fc70..67da664e 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,4 @@ This site will eventually be a community site for publishing and sharing Zend Fr ## Deployment -The master branch of this repository is automatically deployed live to [modules.zendframework.com](http://modules.zendframework.com/) every 10 minutes. +The master branch of this repository is manually deployed live to [modules.zendframework.com](http://modules.zendframework.com/) by [@GeeH](https://github.com/GeeH).