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 73e7c45 Merge branch 'feature/waitResourceBeforeSave' into develop new 47e45a8 edit list of poll new b74be20 Improve delete resource The 2 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 b74be2055671225d698e0c37f29a0f5b4bb5c35a Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 24 17:52:27 2014 +0200 Improve delete resource commit 47e45a86625c3048069e3baf59da74186e3f6001 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 24 15:57:48 2014 +0200 edit list of poll - select one or more poll - delete selected poll Summary of changes: .../pollen/persistence/entity/ChoiceTopiaDao.java | 19 +++--- .../persistence/entity/PollenResourceTopiaDao.java | 41 +++++++++++++ pollen-rest-api/src/main/resources/mapping | 2 +- .../pollen/services/service/PollService.java | 2 - .../services/service/PollenResourceService.java | 14 +---- pollen-ui-angular/src/main/webapp/i18n/en.js | 9 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 5 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 71 +++++++++++++++++++++- .../src/main/webapp/partials/poll-list.html | 26 ++++++-- .../src/main/webapp/partials/poll-poll.html | 4 +- 10 files changed, 158 insertions(+), 35 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenResourceTopiaDao.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.