From c864f27d61ce3d7d832f12fbae58cfa15cea6f95 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 11 Jul 2014 09:35:34 +1200 Subject: [PATCH] Alias dev-master as 1.2 Include composer installation instructions --- README.md | 3 ++- composer.json | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f695621..046cd57 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ ## Installation - 1. Extract the contents so they reside as a **postgresql** directory inside your SilverStripe project code + 1. Install via composer `composer require silverstripe/postgresql 1.2.*-dev` or extract the contents + so they reside as a `postgresql` directory inside your SilverStripe project code 2. Open the installer by browsing to install.php, e.g. http://localhost/silverstripe/install.php 3. Select PostgreSQL in the database list and enter your database details diff --git a/composer.json b/composer.json index 2d10be3..1657b52 100644 --- a/composer.json +++ b/composer.json @@ -4,14 +4,17 @@ "type": "silverstripe-module", "keywords": ["silverstripe", "postgresql", "database"], "authors": [ - { - "name": "Sam Minnée", - "email": "sam@silverstripe.com" - } + { + "name": "Sam Minnée", + "email": "sam@silverstripe.com" + } ], - - "require": - { + "require": { "silverstripe/framework": "~3.2" + }, + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } } }