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 3ece7496aa831bef966bdd4dd09ad139aff3cdae Merge: 2ed75b2 3fab593 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 27 12:05:18 2014 +0200 Merge remote-tracking branch 'origin/develop' into develop pollen-persistence/pom.xml | 4 +--- .../persistence/entity/PollenResourceTopiaDao.java | 21 ++++++++++++++++++++ pollen-rest-api/pom.xml | 4 +--- .../pollen/rest/api/v1/PollenResourceApi.java | 21 ++++++++++++++++++++ .../pollen/rest/api/v1/VoteCountingTypeApi.java | 21 ++++++++++++++++++++ pollen-services/src/license/THIRD-PARTY.properties | 12 +++++++---- .../pollen/services/bean/ResourceFileBean.java | 21 ++++++++++++++++++++ .../pollen/services/bean/ResourceMetaBean.java | 21 ++++++++++++++++++++ .../pollen/services/bean/ResourceStreamBean.java | 21 ++++++++++++++++++++ .../pollen/services/bean/VoteCountingTypeBean.java | 21 ++++++++++++++++++++ .../services/service/PollenResourceService.java | 21 ++++++++++++++++++++ .../services/service/PollenUIUrlRenderService.java | 21 ++++++++++++++++++++ .../services/service/VoteCountingTypeService.java | 21 ++++++++++++++++++++ .../service/PollenUIUrlRenderServiceTest.java | 21 ++++++++++++++++++++ .../services/service/VoterListServiceTest.java | 21 ++++++++++++++++++++ pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/pom.xml | 23 ++++++++++++++++++++++ pollen-ui-angular/src/main/webapp/WEB-INF/web.xml | 21 ++++++++++++++++++++ pollen-ui-angular/src/main/webapp/i18n/en.js | 20 +++++++++++++++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 20 +++++++++++++++++++ pollen-ui-angular/src/main/webapp/js/app.js | 4 ++-- .../src/main/webapp/js/controllers/alertCtrl.js | 6 +++--- .../main/webapp/js/controllers/favoriteListCtrl.js | 4 ++-- .../src/main/webapp/js/controllers/localeCtrl.js | 4 ++-- .../src/main/webapp/js/controllers/mainCtrl.js | 4 ++-- .../src/main/webapp/js/controllers/pollCtrl.js | 6 +++--- .../src/main/webapp/js/controllers/userCtrl.js | 6 +++--- pollen-ui-angular/src/main/webapp/js/directives.js | 4 ++-- .../src/main/webapp/js/libs/ckeditor/config.js | 20 +++++++++++++++++++ .../main/webapp/js/scripts/sticky-inline-poll.js | 4 ++-- .../src/main/webapp/partials/alerts.html | 20 +++++++++++++++++++ .../src/main/webapp/partials/dateTimePicker.html | 20 +++++++++++++++++++ .../src/main/webapp/partials/pagination.html | 20 +++++++++++++++++++ .../src/main/webapp/partials/poll-info.html | 20 +++++++++++++++++++ .../src/main/webapp/partials/printResource.html | 20 +++++++++++++++++++ pollen-ui-angular/src/test/karma.conf.ci.js | 20 +++++++++++++++++++ pollen-ui-angular/src/test/karma.conf.js | 20 +++++++++++++++++++ .../src/test/unit/alertControllersTest.js | 20 +++++++++++++++++++ .../src/test/unit/pollControllersTest.js | 20 +++++++++++++++++++ pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- pom.xml | 13 ++++++++++++ 49 files changed, 590 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.