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 7e3993f58e57cd275bd014ea5c1006bcbe10cc37 Merge: 576df6d 289ef81 Author: Adrien <a.garandel@dralagen.fr> Date: Fri Jul 18 17:19:12 2014 +0200 Merge branch 'feature/checkDeleteRessource' into develop .../pollen/persistence/entity/ChoiceTopiaDao.java | 23 +++++++++ pollen-persistence/src/main/xmi/pollen.zargo | Bin 20385 -> 20479 bytes pollen-rest-api/src/main/resources/mapping | 2 +- .../rest/api/converter/JsonArrayConverterTest.java | 4 +- .../chorem/pollen/services/bean/ChoiceBean.java | 8 ++- .../pollen/services/service/ChoiceService.java | 57 +++++++++------------ .../pollen/services/service/PollService.java | 3 ++ .../services/service/PollenResourceService.java | 31 +++++++++-- .../services/service/PollenServiceSupport.java | 2 +- .../i18n/pollen-services_en_GB.properties | 4 +- .../i18n/pollen-services_fr_FR.properties | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 10 ++-- pollen-ui-angular/src/main/webapp/js/directives.js | 17 ++++-- .../src/main/webapp/partials/inline-poll.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 6 +-- .../{zoomImage.html => printResource.html} | 4 +- .../src/test/unit/pollControllersTest.js | 10 ++-- 17 files changed, 121 insertions(+), 68 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.