[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.4.3-52-g3a481dc

[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  3a481dca13d96fbe95bb994df2464ef1b0f6fe40 (commit)
       via  e087d645c426266f19cd09f595226d965728afb6 (commit)
       via  19a9df3ad0465c2ba39aea68fd6102a9853cae9e (commit)
       via  b093080b82a886379e8b9f636aa7b92b0930debd (commit)
       via  8a54f57cfdee42f5780e6215dfbdfc6e30f329b4 (commit)
       via  27ae324023f14cd2fc77fb600adbc0b331e7fb0c (commit)
       via  5ac54efddb8a3c28f1927f1e95dcc98c51e7f2aa (commit)
       via  9f8929c10ea91eaa0310fedf3c1d49c03d2cb1d3 (commit)
       via  8163c9fd582c876d659eebcdd9e040b6a51705e0 (commit)
      from  afee2bf64c1fb755ed6fc529e50b49cfaddda0b1 (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 3a481dca13d96fbe95bb994df2464ef1b0f6fe40
Merge: afee2bf e087d64
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Jun 29 23:24:24 2013 +0200

    Merge branch 'hotfix/0.7.4.4' into develop
    
    Conflicts:
    	galette/ajouter_adherent.php
    	galette/docs/CHANGES
    	galette/includes/galette.inc.php

commit e087d645c426266f19cd09f595226d965728afb6
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Jun 29 23:21:08 2013 +0200

    Update changelog

commit 19a9df3ad0465c2ba39aea68fd6102a9853cae9e
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Jun 29 23:14:46 2013 +0200

    Disable member card generation for non up to date members; fixes #546

commit b093080b82a886379e8b9f636aa7b92b0930debd
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Jun 29 22:00:33 2013 +0200

    Improve CSS print; fixes #631

commit 8a54f57cfdee42f5780e6215dfbdfc6e30f329b4
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Fri Jun 28 19:16:00 2013 +0200

    Do not use translated string while editing contributions labels; fixes #630

commit 27ae324023f14cd2fc77fb600adbc0b331e7fb0c
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Jun 27 08:11:07 2013 +0200

    Prevent multiple messages on delete button; fixes #627

commit 5ac54efddb8a3c28f1927f1e95dcc98c51e7f2aa
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Jun 27 07:46:06 2013 +0200

    Fix groups management from member record; fixes #625

commit 9f8929c10ea91eaa0310fedf3c1d49c03d2cb1d3
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Jun 27 07:42:30 2013 +0200

    Bump version

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

Summary of changes:
 galette/ajouter_adherent.php                    |   53 ++++++++++----------
 galette/docs/CHANGES                            |    8 +++
 galette/includes/smarty_plugins/function._T.php |    2 +
 galette/lib/Galette/Repository/Groups.php       |   62 ++++++++++++++++-------
 galette/templates/default/editer_intitule.tpl   |    2 +-
 galette/templates/default/galette_print.css     |   16 ++++++-
 galette/templates/default/gestion_adherents.tpl |    8 ++-
 galette/templates/default/member.tpl            |    2 +-
 galette/templates/default/voir_adherent.tpl     |    2 +-
 9 files changed, 104 insertions(+), 51 deletions(-)


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

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