[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.2.8-59-g2a20a6a

[git@xxxxxxxxxxxxx]

This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/galette.git".

The branch, develop has been updated
       via  2a20a6a8d67cff491cc3fa60ef2646c93a9de518 (commit)
       via  2d01bf65e27fd83322a930365245069798b409c4 (commit)
       via  76258d5c0fb0a50ebc2d129151023ef54c8de05d (commit)
       via  b689792fd4d6332cfa045b92f5288bcd90f417a1 (commit)
       via  329e797028417af2167a835d4388f4beac7494ae (commit)
       via  98fe5d1923e9a9783237ee226df802e3f2b618ef (commit)
       via  8b2e8134142919fbf503d312cef97139184e9712 (commit)
       via  301e0ea405d1afbd4cfe50ea5eb17d85916eafa6 (commit)
       via  7792b12658ead276217755dcaa81d21451e15eb6 (commit)
       via  9fabc351bf968f91d5b9ccd51247a3433a8f8767 (commit)
       via  d6b2d82429b9c16a3e6872f24e520953c3224b27 (commit)
      from  d5cbe507963d9536151647b93f4e7368dacbaa18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2a20a6a8d67cff491cc3fa60ef2646c93a9de518
Merge: 9fabc35 2d01bf6
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Dec 22 12:09:54 2012 +0100

    Merge branch 'hotfix/0.7.2.9' into develop
    
    Conflicts:
    	galette/includes/galette.inc.php
    	galette/lib/Galette/Entity/Adherent.php

commit 2d01bf65e27fd83322a930365245069798b409c4
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Dec 22 11:50:22 2012 +0100

    New exports links were incorrects

commit 76258d5c0fb0a50ebc2d129151023ef54c8de05d
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Dec 22 11:39:59 2012 +0100

    Correct storage and retrieving of contributions's dynamic fields; fixes #396

commit b689792fd4d6332cfa045b92f5288bcd90f417a1
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Dec 22 10:44:19 2012 +0100

    Reminders should only concern active accounts, other minor improvements; refs #462

commit 329e797028417af2167a835d4388f4beac7494ae
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 21 19:12:06 2012 +0100

    Fields definition were not always loaded; fixes #466

commit 98fe5d1923e9a9783237ee226df802e3f2b618ef
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 21 00:23:09 2012 +0100

    Members pictures are mandatory for cards; fixes #461

commit 8b2e8134142919fbf503d312cef97139184e9712
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 21 00:09:40 2012 +0100

    Uppercase file extensions can cause issues; fixes #450 (thanks to Melissa)

commit 301e0ea405d1afbd4cfe50ea5eb17d85916eafa6
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 21 00:07:15 2012 +0100

    Image were no longer regenerated from database; fixes #463

commit 7792b12658ead276217755dcaa81d21451e15eb6
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Dec 21 00:04:22 2012 +0100

    Bump version

commit 9fabc351bf968f91d5b9ccd51247a3433a8f8767
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Dec 20 21:51:13 2012 +0100

    Fix some warnings

-----------------------------------------------------------------------

Summary of changes:
 galette/ajouter_contribution.php            |    2 +-
 galette/carte_adherent.php                  |    6 +-
 galette/includes/galette.inc.php            |    1 +
 galette/lib/Galette/Core/GaletteMail.php    |    1 -
 galette/lib/Galette/Core/Mailing.php        |    5 +-
 galette/lib/Galette/Core/Picture.php        |   14 +-
 galette/lib/Galette/Entity/Adherent.php     |    2 -
 galette/lib/Galette/Entity/Contribution.php |    4 +-
 galette/lib/Galette/Repository/Members.php  |  220 ++++++++++++++-------------
 galette/mailing_adherents.php               |    1 +
 galette/templates/default/export.tpl        |    2 +-
 11 files changed, 133 insertions(+), 125 deletions(-)


hooks/post-receive
--
galette/galette.git

-- 
-- 
Galette repositories commits - http://galette.tuxfamily.org