| [galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.0.1-221-g63969cd |
[ Thread Index |
Date Index
| More lists.galette.eu/commits Archives
]
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 63969cdd839415b07fe2693cbb1d79e13fefa8fa (commit)
via a01680a781a86f4116a91f9a1340189724b55502 (commit)
via 23796ee36deb3a4e3a4b507cf04d24e34508463b (commit)
via 09fcf135c9844b0c39f08d97701ef1086691e6ad (commit)
via 797af583c3d4e2a9509ef0f2be1e8a348c8efef9 (commit)
via 986de2fe142dcf8296ba598e8fa90367e3f6bd5b (commit)
via 6452a120268e0f48dcb84928b950a8d9a8f68e0d (commit)
via 24b17384956823fcc780b49d4fcb4469032370fb (commit)
via df3dd9f6b415f7fca0adecb4e02aba20025db2e7 (commit)
via e3379c062f4a35d8b5f9fb11a228e7805eb68d1f (commit)
via 798639618b472077c53c136204830ca57ed2d17d (commit)
via da834b7d48303e13b43e568201d19c2641c627ae (commit)
via f1ee7587e55d24aaf445bed4f88fafc45aee07d0 (commit)
via a80ae220df2be87ff5f1a9455d94a8edf874eeb1 (commit)
via 3aeee3655af56370b52145b9449e912f4e402311 (commit)
via 6bd54605535a5b8908d8aa6393b19d9f569902c2 (commit)
via bb48914de1812778455e536d9e06b7a8013137cf (commit)
via 18afaad94412f0421ac57a1be4f663c5254ada91 (commit)
via 5a63803c2324fa7442ffafc508ef00518bdeef9b (commit)
via 7d5b5dfb6f084e1a5db4278f4d1b34bd18e4de0c (commit)
via 201aabd198224bd9e8620c6b15d119020c5abc47 (commit)
via d67fdb34d6864600ab134d3eea3a3adfc2a7c005 (commit)
via ee88465fbefc648319a5a309adbd2bcaf87a07d2 (commit)
via 6d8f023723cbea017d1adb1a90d8d16d9cad24b5 (commit)
via 4b8f1d90b21d86918c21d0d4106b920b4c23642c (commit)
via fe099d72745d6fb01e71064768902e82dc358985 (commit)
via 996df829f342c402f49003961c0cfcaeb779f3cc (commit)
via 2489302c31727a86c9018af328bb3ea5af0e4f61 (commit)
via d302c18d9efeb6018db78517a8ba8593eef2cf28 (commit)
via dea6a404783195b03a30f16a702ba0f2578fd19e (commit)
via f13af024110c672d3fab5c58615eb216580de746 (commit)
from 7c42d163600a74303eb000edf17db8f5f8f20d9c (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 63969cdd839415b07fe2693cbb1d79e13fefa8fa
Merge: a01680a 23796ee
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Sep 2 13:15:28 2012 +0200
Merge branch 'release/0.7.1' into develop
Conflicts:
galette/configurer_fiches.php
galette/includes/galette.inc.php
commit a01680a781a86f4116a91f9a1340189724b55502
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Sep 2 13:14:32 2012 +0200
Report various changes and bugfixes from release/0.7.1; fixes #351
-----------------------------------------------------------------------
Summary of changes:
galette/ajax_attendance_sheet_details.php | 2 +
galette/ajax_group.php | 2 +
galette/ajax_group_members.php | 2 +
galette/ajax_groups.php | 2 +
galette/ajax_mailing_preview.php | 3 ++
galette/ajax_members.php | 8 +++--
galette/ajax_photo.php | 2 +
galette/ajax_plugins_initdb.php | 8 ++++-
galette/ajax_recipients.php | 3 ++
galette/ajax_unique_group.php | 2 +
galette/ajouter_adherent.php | 34 +++++++++++++-----------
galette/attendance_sheet.php | 3 +-
galette/carte_adherent.php | 5 ++-
galette/config_fields.php | 2 +
galette/configurer_fiches.php | 2 +
galette/etiquettes_adherents.php | 5 ++-
galette/gestion_adherents.php | 6 ++--
galette/gestion_groupes.php | 2 +
galette/get_export.php | 2 +
galette/lib/Galette/Entity/Group.php | 4 +-
galette/mailing_adherents.php | 3 +-
galette/preferences.php | 5 ++-
galette/public/liste_membres.php | 4 +-
galette/templates/default/group.tpl | 5 +++
galette/traduire_libelles.php | 2 +
galette/voir_adherent.php | 40 +++++++++++++---------------
26 files changed, 102 insertions(+), 56 deletions(-)
hooks/post-receive
--
galette/galette.git
--
--
Galette repositories commits - http://galette.tuxfamily.org