| [galette-commits] [GIT] galette/galette.git branch, master, updated. 0.7.5.5-47-g9aa77c0 |
[ 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, master has been updated
via 9aa77c06a087b9d738c82b3fb88eb228ee9e1b7c (commit)
via 2674610ad12b97dcc1cdd2b1421c602af0a30f67 (commit)
via f64053287e196a0cae0bdf2cab7158198ccfbf5e (commit)
via 3cc8ef033d9f6f1820ba0a2c8c0d35f71e4acece (commit)
via 475bbbd3e76945b9458151be5e48f725ef985348 (commit)
via 816ef24048277ad9f73ee82781e9e5b3ec06cba2 (commit)
via 226ea59961b8e6ae7cac6c3f2eb7cc2f383624cd (commit)
via 86bfac6323e590681b6c4fa72ad36bc407935193 (commit)
via f03a58855d4854a1b7009e734b755a3d30987a50 (commit)
via 8feb465021d4a169526395ac8278cf21bac3c0ce (commit)
via b1062d0364b32fc563781bcffc14eabca9c24eed (commit)
via 7850dd597f0f9a21951edf109ae78aa200c1961a (commit)
via 485a6498dd2f4897c35cb68deaef5ad70d2e1673 (commit)
via c2ebe100e32d80cdd2b36f280afcfca869325300 (commit)
via 18b6fe3640b84cecdac3ae1e294782c8a4e6b872 (commit)
via 851d39af1fdbbf7ff8581dbc45eec7f9cb3fe154 (commit)
via 7681e5e40acd7bcd58af352500bf909af84b8b91 (commit)
via fc545ae0407217e9fb180671f574c6aebdf1636e (commit)
via a87ec03e8a3ab5e016e6679a0b42cc33e5297521 (commit)
via accd842b5447f6066f409349751e09e9684a7375 (commit)
via 66e19e59fc53105a801cde8543a527c047b4f7ad (commit)
via d1ae4cf1c7fd7d7f4b89974529f3753450cd2cc4 (commit)
via 72b56065ba266126024ae1c4ed7fc17fdbfa704a (commit)
via 6ead54ed4e74e0aca625e7c18e667e842051f7c6 (commit)
via bd9a4b16acd28b76291337c39177d746f565924b (commit)
via 43bb6dff96786a26252ee71141fa42afab1ea796 (commit)
via 792c06f8bd8e96d3553ecc8258191e54f1a6cce6 (commit)
via 7762fd9e9871b1d000be71349755785163e54991 (commit)
via f9c13a44397c713438c992080fc0353c95e00f6c (commit)
via f2520b663103bee9558ff3ae2b5af4c0d50c2be5 (commit)
via ab83ff283670451716eb59547b1c691b77236fd6 (commit)
via 8f543b9b36200286dbea87c65d76d97c5f8597a8 (commit)
via 9d6d70544c9dc0136ccb9fd2579558dac8f4e4e9 (commit)
via 48478672bdaf5cf5f3f3871482ce8c29ad4f8005 (commit)
via 8da06a1b680e82a7294a299c8704dc737402ed0b (commit)
via a6579528321969ca60a9ad856775fcf4502e9819 (commit)
via a429fd8eabc089608a7e5d77aed8c841ac8bf944 (commit)
via 1a4f9b2f8acc6dee8e476e01ccc55de297717f2a (commit)
via 3d32f59dde88ea6160e2a86535dc8df88fada09f (commit)
via f77151d4cd685ed653780b34d5f62d511d3291f9 (commit)
via 476152ec0840f40cee8de560883743eafb31cc92 (commit)
via 9e91089acdca8118cbbf5d5273bad0d0495bcdc6 (commit)
via 2bc1f1f0fd6d4dfcdb5882b5883075ca96fa40ca (commit)
via a7ea27a70a9125696ba9581ddf81d6fc470ce069 (commit)
via 851f2629e3d7132f2bfcc0c29788b6231b403fac (commit)
via d30895ae124050ac604887e6e595ad966f8c24cb (commit)
via 111c89c9d76784368d0d3261e4be44e765d226b5 (commit)
from 0d820ecbd913e58a1b2c4c6c392ac0cf083f77c0 (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 9aa77c06a087b9d738c82b3fb88eb228ee9e1b7c
Merge: 0d820ec 2674610
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sat Oct 19 10:08:30 2013 +0200
Merge branch 'release/0.7.6'
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 5 +
.tx/config | 2 +-
galette/ajax_mailing_preview.php | 23 +-
galette/ajouter_adherent.php | 4 +-
galette/ajouter_contribution.php | 3 +-
galette/config/paths.inc.php | 3 +
galette/configurer_fiches.php | 96 +-
galette/doandget_export.php | 9 +-
galette/docs/CHANGES | 12 +-
galette/docs/INSTALL | 4 +-
galette/editer_champ.php | 32 +-
galette/export.php | 76 +-
galette/galette.doap | 71 +
galette/gestion_adherents.php | 14 +-
galette/gestion_intitules.php | 179 +--
galette/gestion_mailings.php | 1 +
galette/get_export.php | 8 +-
galette/{get_export.php => get_import.php} | 21 +-
galette/import.php | 140 ++
galette/import_model.php | 121 ++
galette/{photos => imports}/.htaccess | 0
galette/{cache => imports}/readme.txt | 0
galette/includes/common.js | 7 +-
galette/includes/galette.inc.php | 4 +-
galette/includes/html5-ie.js | 2 +-
galette/includes/jquery/README | 9 +-
galette/includes/jquery/chili-1.7.pack.js | 1 -
galette/includes/jquery/jquery.bgiframe.pack.js | 10 -
galette/includes/jquery/jquery.tooltip.pack.js | 15 -
galette/install/index.php | 56 +-
galette/install/sql/mysql.sql | 11 +-
galette/install/sql/pgsql.sql | 20 +-
galette/install/sql/sqlite.sql | 10 +-
galette/install/sql/upgrade-to-0.76-mysql.sql | 10 +
galette/install/sql/upgrade-to-0.76-pgsql.sql | 19 +
galette/install/sql/upgrade-to-0.76-sqlite.sql | 9 +
galette/lang/en_US.po | 1445 +++++++++++--------
galette/lang/en_US/LC_MESSAGES/galette.mo | Bin 93081 -> 97613 bytes
galette/lang/fr_FR.utf8.po | 1459 ++++++++++++--------
galette/lang/fr_FR.utf8/LC_MESSAGES/galette.mo | Bin 102980 -> 108084 bytes
galette/lang/lang_english.php | 1239 ++++++++++--------
galette/lang/lang_french.php | 1239 ++++++++++--------
galette/lang/messages.po | 1260 ++++++++++-------
galette/lib/Galette/Core/CheckModules.php | 11 +
galette/lib/Galette/Core/History.php | 2 +-
galette/lib/Galette/Core/Password.php | 10 +-
galette/lib/Galette/Core/PasswordImage.php | 16 +-
galette/lib/Galette/Core/Picture.php | 4 +-
galette/lib/Galette/Core/Plugins.php | 24 +-
galette/lib/Galette/Core/Preferences.php | 8 +-
galette/lib/Galette/Entity/Adherent.php | 99 +-
galette/lib/Galette/Entity/ContributionsTypes.php | 497 +-------
galette/lib/Galette/Entity/DynamicFields.php | 38 +
galette/lib/Galette/Entity/Entitled.php | 641 +++++++++
galette/lib/Galette/Entity/ImportModel.php | 215 +++
galette/lib/Galette/Entity/PdfModel.php | 5 +-
galette/lib/Galette/Entity/Status.php | 403 +-----
galette/lib/Galette/Filters/MembersList.php | 3 +-
galette/lib/Galette/IO/Csv.php | 315 +----
galette/lib/Galette/IO/CsvIn.php | 582 ++++++++
galette/lib/Galette/IO/{Csv.php => CsvOut.php} | 236 +---
galette/lib/Galette/Repository/Members.php | 161 ++-
galette/lib/Galette/Repository/PdfModels.php | 2 +-
galette/needs_update.php | 7 +-
galette/templates/default/common_header.tpl | 7 +-
.../templates/default/display_dynamic_fields.tpl | 12 +-
galette/templates/default/edit_dynamic_fields.tpl | 8 +-
galette/templates/default/editer_intitule.tpl | 55 +-
galette/templates/default/export.tpl | 4 +-
galette/templates/default/galette.css | 7 +
.../templates/default/gestion_intitule_content.tpl | 18 +-
galette/templates/default/gestion_mailings.tpl | 43 +
galette/templates/default/images/icon-prefs.png | Bin 0 -> 945 bytes
galette/templates/default/import.tpl | 112 ++
galette/templates/default/import_model.tpl | 88 ++
galette/templates/default/member.tpl | 4 +-
galette/templates/default/page.tpl | 1 +
galette/templates/default/preferences.tpl | 2 +-
galette/templates/default/voir_adherent.tpl | 2 +-
tests/Galette/Core/tests/units/Db.php | 11 +-
80 files changed, 6636 insertions(+), 4666 deletions(-)
create mode 100644 galette/galette.doap
copy galette/{get_export.php => get_import.php} (78%)
create mode 100644 galette/import.php
create mode 100644 galette/import_model.php
copy galette/{photos => imports}/.htaccess (100%)
copy galette/{cache => imports}/readme.txt (100%)
delete mode 100644 galette/includes/jquery/chili-1.7.pack.js
delete mode 100644 galette/includes/jquery/jquery.bgiframe.pack.js
delete mode 100644 galette/includes/jquery/jquery.tooltip.pack.js
create mode 100644 galette/install/sql/upgrade-to-0.76-mysql.sql
create mode 100644 galette/install/sql/upgrade-to-0.76-pgsql.sql
create mode 100644 galette/install/sql/upgrade-to-0.76-sqlite.sql
create mode 100644 galette/lib/Galette/Entity/Entitled.php
create mode 100644 galette/lib/Galette/Entity/ImportModel.php
create mode 100644 galette/lib/Galette/IO/CsvIn.php
copy galette/lib/Galette/IO/{Csv.php => CsvOut.php} (55%)
create mode 100644 galette/templates/default/images/icon-prefs.png
create mode 100644 galette/templates/default/import.tpl
create mode 100644 galette/templates/default/import_model.tpl
hooks/post-receive
--
galette/galette.git
--
--
Galette repositories commits - http://galette.tuxfamily.org