Merge pull request #9601 from civicrm/4.7.15-rc

4.7.15 rc
civicrm · Jan 4, 2017 · 0587504 · 0587504
2 parents 151c312 + 88d7fa0
commit 0587504
Show file tree

Hide file tree

Showing 5 changed files with 482 additions and 19 deletions.
diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php
@@ -154,7 +154,6 @@ public static function create(&$params) {
     $transaction = new CRM_Core_Transaction();
 
     $paymentParams = array();
-    $paymentParams['status_id'] = CRM_Utils_Array::value('status_id', $params);
     if (!empty($params['installment_amount'])) {
       $params['amount'] = $params['installment_amount'] * $params['installments'];
     }
@@ -174,6 +173,7 @@ public static function create(&$params) {
         }
       }
     }
+    $paymentParams['status_id'] = CRM_Utils_Array::value('status_id', $params);
 
     $pledge = self::add($params);
     if (is_a($pledge, 'CRM_Core_Error')) {

diff --git a/contributor-key.yml b/contributor-key.yml
@@ -10,30 +10,61 @@
 - github      : agileware
   name        : Agileware Team
   organization: Agileware
+  jira        : agileware
 - github      : alifrumin
   name        : Alice Frumin
   organization: AGH Strategies
 - github      : andrew-cormick-dockery
   name        : Andrew Cormick-Dockery
+  jira        : andrew_dockery
 - github      : artem3
   name        : Artem Goncharenko
+- github      : bhahumanists
+  name        : Andrew West
+  organization: British Humanist Association
+  jira        : awestbha
+- github      : bsilvern
+  name        : Bob Silvern
+  jira        : bobs0
+- github      : coldrunKacper
+  name        : Kacper Warda
+  jira        : coldrunKacper
 - github      : colemanw
   name        : Coleman Watts
   organization: CiviCRM
+  jira        : colemanw
+- name        : Daniel Martinez
+  jira        : danielmart
 - github      : davecivicrm
   name        : Dave Greenberg
   organization: CiviCRM
+  jira        : dgg
 - github      : davejenx
   name        : Dave Jenkins
   organization: Circle Interactive
+  jira        : davej
+- name        : David Tarrant
+  organization: Nubay Services
+  jira        : dtarrant
 - github      : edzelopez
   name        : Edzel Lopez
   organization: JMA Consulting
 - github      : eileenmcnaughton
   name        : Eileen McNaughton
-  organization: Fuzion NZ
+  organization: Fuzion
+  jira        : eileen
 - github      : francescbassas
   name        : Francesc Bassas i Bullich
+  jira        : francescbassas
+- github      : galgeek
+  name        : Barbara Miller
+  jira        : galgeek
+- github      : garethdylan361
+  name        : Gareth Small
+  jira        : garethsmall361@gmail.com
+- github      : gemmapotaka
+  name        : Gemma Potaka
+  organization: Fuzion
 - github      : ginkgofjg
   name        : Frank Gómez
   organization: Ginkgo Street Labs
@@ -47,17 +78,33 @@
 - github      : jitendrapurohit
   name        : Jitendra Purohit
   organization: CiviCRM
+  jira        : jitendra.purohit
 - github      : jmcclelland
   name        : Jamie McClelland
   organization: Progressive Technology Project
+  jira        : jamie
 - github      : JKingsnorth
   name        : John Kingsnorth
-- github      : joemurray
+  jira        : john
+- github      : JoeMurray
   name        : Joe Murray
   organization: JMA Consulting
+- github      : johanv
+  name        : Johan Vervloet
 - github      : JohnFF
   name        : John Kirk
   organization: CiviFirst
+- name        : Jon-man Cheung
+  organization: GMCVO Databases
+  jira        : jon-man
+- github      : joshgowans
+  name        : Josh Gowans
+  organization: CiviCRM
+  jira        : jgowans
+- github      : Kajakaran
+  name        : Kajakaran Balakrishnan
+  organization: Veda Consulting
+  jira        : kajan
 - github      : KarinG
   name        : Karin Gerritsen
   organization: Semper IT
@@ -67,37 +114,60 @@
 - github      : lcdservices
   name        : Brian Shaughnessy
   organization: Lighthouse Design and Consulting
+  jira        : lcdweb
 - github      : liedekef
   name        : Franky Van Liedekerke
   organization: E-Dynamics
+  jira        : liedekef
 - github      : litespeedmarc
   name        : Marc Brazeau
+- name        : Lola Slade
+  organization: Freeform Solutions
+  jira        : lola_slade
 - github      : magnolia61
   name        : Richard van Oosterhout
+  jira        : magnolia61
 - github      : michaelmcandrew
   name        : Michael McAndrew
   organization: Third Sector Design
 - github      : MiltoxBeyond
   name        : Milton Zurita
+  jira        : MiltoxB
 - github      : MiyaNoctem
   name        : Camilo Rodriguez
   organization: CompuCorp
 - github      : mlutfy
   name        : Mathieu Lutfy
   organization: Coop SymbioTIC
+  jira        : mlutfy
 - github      : mollux
   name        : Mattias Michaux
 - github      : monishdeb
   name        : Monish Deb
   organization: CiviCRM
+  jira        : monish.deb
 - github      : nganivet
   name        : Nicolas Ganivet
   organization: CiviDesk
+  jira        : nganivet
+- name        : Dennis Gray
+  jira        : ozyank
 - github      : PalanteJon
   name        : Jon Goldberg
+  jira        : palantejon
+- github      : petednz
+  name        : Peter Davis
+  organization: Fuzion
+  jira        : petednz
+- name        : Peter Davis
+  organization: Fuzion
+  jira        : peted
 - github      : pradpnayak
   name        : Pradeep Nayak
   organization: JMA Consulting
+  jira        : pradeep.nayak
+- name        : Lutz Frommberger
+  jira        : re-quest
 - github      : rubofvil
   name        : Rubén Pineda
   organization: iXiam
@@ -112,35 +182,64 @@
 - github      : seamuslee001
   name        : Seamus Lee
   organization: Australian Greens
+  jira        : seamuslee
 - github      : sharique
   name        : Sharique Ahmed Farooqui
+  jira        : sharique
 - github      : sqweets
   name        : Ellen Hendricks
   organization: Spry Digital
+- github      : stevekessler
+  name        : Steve Kessler
+  organization: Denver DataMan
+  jira        : Skessler
 - github      : stoob
   name        : Stuart Gaston
   organization: Korlon
+  jira        : stoob
+- github      : sunilpawar
+  name        : Sunil Pawar
+  organization: CiviDesk
+  jira        : sunil
 - github      : systopia
   name        : Björn Endres
   organization: Systopia
+- name        : Thomas Nilefalk
+  jira        : thoni56
 - github      : tobiaslounsbury
   name        : Tobias Lounsbury
   organization: Ginkgo Street Labs
 - github      : totten
   name        : Tim Otten
   organization: CiviCRM
+  jira        : timotten
 - github      : tschuettler
   name        : Thomas Schüttler
+- github      : twomice
+  name        : Allen Shaw
+  organization: Joinery
+  jira        : allenshaw
+- name        : Vakees K
+  jira        : vakeesan26
+- github      : VangelisP
+  name        : Vangelis Pantazis
+  organization: iXiam
+  jira        : VangelisP
 - github      : vedantrathore
   name        : Vedant Rathore
 - github      : Vgratioulet
   name        : Véronique Gratioulet
+- name        : William Gordon
+  organization: British Humanist Association
+  jira        : wdgordon
 - github      : wmortada
   name        : William Mortada
   organization: Community IT Academy
 - github      : xurizaemon
   name        : Chris Burgess
   organization: Fuzion
+  jira        : xurizaemon
 - github      : yashodha
   name        : Yashodha Chaku
   organization: CiviCRM
+  jira        : yashodha
diff --git a/release-notes.md b/release-notes.md
@@ -14,6 +14,14 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
+## CiviCRM 4.7.15
+
+Released January 4, 2017
+
+- **[Features](release-notes/4.7.15.md#features)**
+- **[Bugs resolved](release-notes/4.7.15.md#bugs)**
+- **[Credits](release-notes/4.7.15.md#credits)**
+
 ## CiviCRM 4.7.14
 
 Released December 7, 2016