[pollen] branch develop updated (f9965bc -> d302d01)
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 f9965bc no fixed height for print vote, and action for vote on one line new fea63ee [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions new 113d23d [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions new 733e247 fix license headers new 613b614 Merge branch 'release/2.0-alpha-2' new dc6fdef Merge branch 'master' into develop new d302d01 [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 d302d01a5066fec4848df0724241c0bca38978ac Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:05 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit dc6fdef72617b13a1774042a8533c2c3e47298a7 Merge: fea63ee 613b614 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:04 2014 +0200 Merge branch 'master' into develop commit fea63eee6b63e197bba3ca4901b8b2cb56abe499 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:03 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 613b614a5ba421c1a602e2c4c880fa68af83592f Merge: e5a1179 733e247 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:58 2014 +0200 Merge branch 'release/2.0-alpha-2' commit 733e247446e39ec52302dcd28ef965ef04a3c31d Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:30 2014 +0200 fix license headers commit 113d23decfa4479ddd86d1d37e95d18311c393f6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 16:57:27 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions Summary of changes: pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- .../main/webapp/partials/user-edit-viewProfile.html | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 113d23decfa4479ddd86d1d37e95d18311c393f6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 16:57:27 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-angular/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 2b9807c..2d20a77 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 7bb038d..ec21e91 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index f45f6f8..04dddbf 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 98c3557..cb3f6a8 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 77b8a2f..943b881 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index ea9cbff..fbd7301 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index a8fac37..69d3f84 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 4940fab..2c2bee2 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 8efe947..424bb8e 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 6f3d6dd..529678a 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index fc5aea9..eacfdc3 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index dcd5557..802d93b 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 896969f..235dbff 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 25a5081..cac1762 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <version>2.0-alpha-2</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 733e247446e39ec52302dcd28ef965ef04a3c31d Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:30 2014 +0200 fix license headers --- pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- .../main/webapp/partials/user-edit-viewProfile.html | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index c0104c1..ed95bda 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html b/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html index dcae714..fe17596 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html @@ -1,3 +1,23 @@ +<!-- + #%L + Pollen :: UI (Angular) + %% + Copyright (C) 2009 - 2014 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> <div class="row"> <div class="col-sm-5 text-right">{{ 'user.myName' | translate }}</div> <div class="col-sm-7"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 613b614a5ba421c1a602e2c4c880fa68af83592f Merge: e5a1179 733e247 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:58 2014 +0200 Merge branch 'release/2.0-alpha-2' pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 6 +- pollen-services/pom.xml | 2 +- .../pollen/services/bean/PollenUserBean.java | 11 +++ pollen-ui-angular/bower.json | 4 +- pollen-ui-angular/pom.xml | 7 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 20 ++++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 94 ++++++++++--------- pollen-ui-angular/src/main/webapp/img/pollen.png | Bin 28557 -> 610 bytes pollen-ui-angular/src/main/webapp/index.html | 14 +-- .../src/main/webapp/js/conf.js.example | 2 +- .../src/main/webapp/js/controllers/alertCtrl.js | 100 ++++++++++++++++----- .../src/main/webapp/js/controllers/pollCtrl.js | 53 +++++++++-- .../src/main/webapp/js/controllers/userCtrl.js | 57 +++++++++--- pollen-ui-angular/src/main/webapp/js/directives.js | 8 +- pollen-ui-angular/src/main/webapp/less/style.less | 94 +++++++++++-------- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 10 +-- .../src/main/webapp/partials/poll-comment.html | 83 ++++++++++------- .../src/main/webapp/partials/poll-info.html | 4 +- .../src/main/webapp/partials/poll-link.html | 14 ++- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll.html | 20 ++--- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../{user-edit.html => user-edit-editProfile.html} | 47 +--------- .../{user-edit.html => user-edit-password.html} | 42 --------- .../webapp/partials/user-edit-viewProfile.html | 46 ++++++++++ .../src/main/webapp/partials/user-edit.html | 94 ++----------------- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 40 files changed, 489 insertions(+), 379 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 fea63eee6b63e197bba3ca4901b8b2cb56abe499 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:03 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-angular/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index cb8cc02..2d20a77 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 1bb11c5..ec21e91 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 71345de..04dddbf 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 452bab5..cb3f6a8 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 5012b50..943b881 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index dfbb715..fbd7301 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index fba3fd7..69d3f84 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 345fe66..2c2bee2 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index eb73702..424bb8e 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index aaa023b..529678a 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index f60484d..eacfdc3 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index c734203..802d93b 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 2db0b26..235dbff 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 0c40527..cac1762 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 dc6fdef72617b13a1774042a8533c2c3e47298a7 Merge: fea63ee 613b614 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:04 2014 +0200 Merge branch 'master' into develop pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- .../main/webapp/partials/user-edit-viewProfile.html | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 d302d01a5066fec4848df0724241c0bca38978ac Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:05 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-angular/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index 2d20a77..cb8cc02 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index ec21e91..1bb11c5 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 04dddbf..71345de 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index cb3f6a8..452bab5 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 943b881..5012b50 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index fbd7301..dfbb715 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 69d3f84..fba3fd7 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 2c2bee2..345fe66 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 424bb8e..eb73702 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 529678a..aaa023b 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index eacfdc3..f60484d 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index 802d93b..c734203 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 235dbff..2db0b26 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index cac1762..0c40527 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-alpha-2</version> + <version>2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm