This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from a2c4bac change branch for bootstrap-datetimepicker adds 95ccc62 add import favorite list from 'csv' file adds c721979 add error when import favorite list from csv file adds 816ac2a add redirect when error 403 to / on favoriteListCtrl new 6da8eb9 Merge Import Favorite List from csv file The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6da8eb9565fa1d0c12926e49f05ddfe4ac9bec78 Merge: a2c4bac 816ac2a Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 21 13:36:22 2014 +0200 Merge Import Favorite List from csv file Summary of changes: .../org/chorem/pollen/rest/api/JsonHelper.java | 20 +++++++++ .../org/chorem/pollen/rest/api/PollenRender.java | 3 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 10 +++++ .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 5 ++- .../pollen/rest/api/v1/PollenResourceApi.java | 1 + pollen-rest-api/src/main/resources/mapping | 1 + .../i18n/pollen-services_en_GB.properties | 6 +-- .../i18n/pollen-services_fr_FR.properties | 6 +-- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + .../main/webapp/js/controllers/favoriteListCtrl.js | 38 ++++++++++++----- pollen-ui-angular/src/main/webapp/js/directives.js | 48 +++++++++++++++++++++- pollen-ui-angular/src/main/webapp/js/services.js | 8 ++++ pollen-ui-angular/src/main/webapp/less/style.less | 4 ++ .../main/webapp/partials/favoriteList-edit.html | 6 +++ 15 files changed, 138 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.