From 437ec42f4946d1d1faea8753c8a6ce2711b82600 Mon Sep 17 00:00:00 2001
From: Jerome Mouneyrac <jerome@mouneyrac.com>
Date: Fri, 6 Nov 2015 14:41:07 +0000
Subject: [PATCH] Bump version to 2.2

---
 CHANGELOG.md | 25 +++++++++++++++++++++++--
 README.md    |  2 +-
 version.php  |  4 ++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5b988e..f7b9f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,27 @@
 Changelog
 ==========
 
+Release 2.2
+-----------
+* #177 Create new button similar to socialsharekit but open source
+* #176 Missing closing div in auth_googleoauth2_render_buttons()
+* #173 The label in the log in buttons should be "Log in" instead of "LOGIN"
+* #172 I could not connect to facebook
+* #171 Got problem after installing plug-in in moodle2.9.1
+* #169 Create some statistics
+* #168 test upgrade from the version before phpleague to the last phpleague version with Google+ (can student still connect)
+* #167 User not logged in after authenticating...
+* #164 Buttons are not showing (except for midori browser) ¿?
+* #162 create link to contributors, stargazers... on the jekyll site
+* #161 fix codacy issues to get A rating
+* #160 update Moodle.org plugin screenshots
+* #159 mention how to contribute to the plugin in the plugin settings page
+* #154 switch from shippable to travis
+* #152 Manual display of button showing link but not image
+* #151 Merge behat fix pull request
+* #149 Correction de test behat.
+* #147 Failed Login 'auth_googleoauth2\event\user_loggedin'
+
 Release 2.1
 -----------
 * #143 add licence file
@@ -35,10 +56,10 @@ Release 1.5 (Build: 2014120000)
 
 v1.5 (18/7/14)
 --------------
-* code updated to support the new Google Oauth2 API as the one used by the plugin is been deprecated in two months.  
+* code updated to support the new Google Oauth2 API as the one used by the plugin is been deprecated in two months.
 See: https://developers.google.com/+/api/auth-migration#timetable
 
-*ACTION REQUIRED* you need to enable the Google+ API in the Google developer console:  
+*ACTION REQUIRED* you need to enable the Google+ API in the Google developer console:
 Project > API & AUTH > APIs
 
 v1.5
diff --git a/README.md b/README.md
index 84342b3..224a438 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ If you do any change related to composer, here is what need to be done:
 PS: if you need to know more about composer, you can read [Composer Namespaces in 5 Minutes](https://jtreminio.com/2012/10/composer-namespaces-in-5-minutes/)
 
 ### Continueous integration, tracker...
-[![Build Status](https://api.shippable.com/projects/546da22ad46935d5fbbe1761/badge?branchName=master)](https://app.shippable.com/projects/546da22ad46935d5fbbe1761/builds/latest)
+[![Build Status](https://travis-ci.org/mouneyrac/moodle-auth_googleoauth2.svg?branch=master)](https://travis-ci.org/mouneyrac/moodle-auth_googleoauth2.svg?branch=master)
 [![Stories in Ready](https://badge.waffle.io/mouneyrac/moodle-auth_googleoauth2.png?label=ready&title=Ready)](https://waffle.io/mouneyrac/moodle-auth_googleoauth2)
 [![Codacy Badge](https://www.codacy.com/project/badge/84928dc4c553414786735ba745e57c93)](https://www.codacy.com/app/jerome/moodle-auth_googleoauth2)
 [![bountysource](https://api.bountysource.com/badge/team?team_id=49212&style=raised)](https://www.bountysource.com/teams/oauth2-authentication-plugin-for-moodle/backers)
diff --git a/version.php b/version.php
index b3da143..a74a6f7 100644
--- a/version.php
+++ b/version.php
@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2015090203;
+$plugin->version  = 2015110600;
 $plugin->requires = 2014051200;   // Requires Moodle 2.7 or later.
-$plugin->release = '2.1 (Build: 2015090200)';
+$plugin->release = '2.2 (Build: 2015110600)';
 $plugin->maturity = MATURITY_STABLE;             // This version's maturity level.
 $plugin->component = 'auth_googleoauth2'; // Declare the type and name of this plugin.