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 df79b27 [jgitflow-maven-plugin]updating poms for 2.0-SNAPSHOT development new 1f0dd60 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b6df59f [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-1' with snapshot versions new 37cca05 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-1' with non-snapshot versions new ca8ad65 add license headers + fix release (license, thridparties) new e5a1179 Merge branch 'release/2.0-alpha-1' new 761e793 Merge branch 'master' into develop new 3fab593 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 3fab593cef5af476e679610ffaa9045e03987e1f Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 11:05:40 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 761e793a2d49954eea5a352ba33c3525a0b5d58c Merge: 1f0dd60 e5a1179 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 11:05:39 2014 +0200 Merge branch 'master' into develop commit 1f0dd60cf6a0aaddf7527077d2524d4c58c3cc2e Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 11:05:38 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e5a11797f0a3cf7d981ce071b09d293b89dbfd76 Merge: 99645a0 ca8ad65 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 11:05:33 2014 +0200 Merge branch 'release/2.0-alpha-1' commit ca8ad654b17ecc986eaf26a511f49f52e9908230 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 11:02:07 2014 +0200 add license headers + fix release (license, thridparties) commit 37cca05d92b825fdc0f0d46d5a9c56f750f2a637 Author: Maven Release <maven-release@codelutin.com> Date: Wed Aug 27 10:58:59 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-1' with non-snapshot versions Summary of changes: .../persistence/entity/PollenResourceTopiaDao.java | 21 +++++++++++++++++++++ .../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/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 +- 44 files changed, 551 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.