This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 42a27fc4c8b131bb1111039454fb29c350d4820a Merge: 418a032 50e4ba1 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jun 18 17:08:09 2014 +0200 Merge branch 'feature/favoriteVoterList' into develop .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 12 +- .../services/service/FavoriteListService.java | 16 +- .../i18n/pollen-services_en_GB.properties | 7 + .../i18n/pollen-services_fr_FR.properties | 13 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 15 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 9 +- pollen-ui-angular/src/main/webapp/index.html | 7 + pollen-ui-angular/src/main/webapp/js/app.js | 5 +- .../src/main/webapp/js/conf.js.exemple | 3 + .../main/webapp/js/controllers/favoriteListCtrl.js | 197 +++++++++++++++++++++ pollen-ui-angular/src/main/webapp/js/services.js | 61 +++++++ .../main/webapp/partials/favoriteList-edit.html | 50 ++++++ .../main/webapp/partials/favoriteList-list.html | 13 ++ 13 files changed, 383 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.