- Pollen-commits - mailman.cloud.codelutin.com

[pollen] branch feature/1110 created (now de9b945)
by chorem.org scm 19 Sep '14

19 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/1110 in repository pollen. See http://git.chorem.org/pollen.git at de9b945 refs #1110 introduce to new module and deal with storages This branch includes the following new commits: new de9b945 refs #1110 introduce to new module and deal with storages The 1 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 de9b945cba528a225e2f886ad3d92661e44ec1a5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 19 18:22:07 2014 +0200 refs #1110 introduce to new module and deal with storages -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (0663b64 -> 2bb2997)
by chorem.org scm 19 Sep '14

19 Sep '14

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 0663b64 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2bb2997 refs #1111 Replace the auto-save of the poll form by a "Save" button The 1 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 2bb2997f7b38ec83efbd23b24d0fa32700a55cd1 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 19 17:02:29 2014 +0200 refs #1111 Replace the auto-save of the poll form by a "Save" button Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 2 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 + .../src/main/webapp/js/controllers/pollCtrl.js | 74 ++++++++----- pollen-ui-angular/src/main/webapp/js/directives.js | 120 ++++++++++----------- .../src/main/webapp/partials/inline-poll.html | 18 +++- .../src/main/webapp/partials/poll-poll.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 + .../src/main/webapp/partials/poll.html | 8 ++ .../src/main/webapp/partials/user-login.html | 4 +- 9 files changed, 139 insertions(+), 95 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop-1.x updated (b1a38ac -> 09e4d9a)
by chorem.org scm 19 Sep '14

19 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch develop-1.x in repository pollen. See http://git.chorem.org/pollen.git from b1a38ac add .gitignore new 09e4d9a use chorempom 1.3 The 1 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 09e4d9aefdb46e5521820118a859fed9b3eddcd5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 19 15:16:05 2014 +0200 use chorempom 1.3 Summary of changes: pollen-persistence/pom.xml | 2 +- pom.xml | 281 ++++++++++++++++++++++----------------------- 2 files changed, 140 insertions(+), 143 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop-1.x created (now b1a38ac)
by chorem.org scm 19 Sep '14

19 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch develop-1.x in repository pollen. See http://git.chorem.org/pollen.git at b1a38ac add .gitignore No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch master-1.x created (now b1a38ac)
by chorem.org scm 19 Sep '14

19 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch master-1.x in repository pollen. See http://git.chorem.org/pollen.git at b1a38ac add .gitignore This branch includes the following new commits: new b1a38ac add .gitignore The 1 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 b1a38aca316aeaa5a4e03277e01b8045f81b0e9f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Sep 19 14:22:41 2014 +0200 add .gitignore -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (06e071c -> 0663b64)
by chorem.org scm 30 Aug '14

30 Aug '14

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 06e071c fixes #1102: Improve service configuration new 6736cf7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 900395e [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-3' with snapshot versions new 715dfd6 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-3' with non-snapshot versions new ba5e600 Merge branch 'release/2.0-alpha-3' new 4299ac5 Merge branch 'master' into develop new 0663b64 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 0663b646b55b38f0599598d87c06b54f76c2285c Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Aug 30 14:00:10 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4299ac5785dd4d43fc90d8cd4a3ccb15f5408135 Merge: 6736cf7 ba5e600 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Aug 30 14:00:09 2014 +0200 Merge branch 'master' into develop commit 6736cf7dd7e93946067789fb3e535afa14a9e066 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Aug 30 14:00:07 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ba5e6006c6756dcc0b8cab3692916f50ab7ae166 Merge: 613b614 715dfd6 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Aug 30 14:00:01 2014 +0200 Merge branch 'release/2.0-alpha-3' commit 715dfd6e4d8ee103bc2e4c1f025b953814a2d038 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Aug 30 13:57:00 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-3' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

[pollen] branch release/2.0-alpha-3 deleted (was 715dfd6)
by chorem.org scm 30 Aug '14

30 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch release/2.0-alpha-3 in repository pollen. See http://git.chorem.org/pollen.git was 715dfd6 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-3' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] annotated tag pollen-2.0-alpha-3 created (now 20fa32c)
by chorem.org scm 30 Aug '14

30 Aug '14

This is an automated email from the git hooks/post-receive script. New change to annotated tag pollen-2.0-alpha-3 in repository pollen. See http://git.chorem.org/pollen.git at 20fa32c (tag) tagging ba5e6006c6756dcc0b8cab3692916f50ab7ae166 (commit) replaces pollen-2.0-alpha-2 tagged by Maven Release on Sat Aug 30 14:00:02 2014 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.0-alpha-3 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch release/2.0-alpha-3 updated (900395e -> 715dfd6)
by chorem.org scm 30 Aug '14

30 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch release/2.0-alpha-3 in repository pollen. See http://git.chorem.org/pollen.git from 900395e [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-3' with snapshot versions adds 715dfd6 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-3' with non-snapshot versions No new revisions were added by this update. Summary of changes: 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(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch master updated (613b614 -> ba5e600)
by chorem.org scm 30 Aug '14

30 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See http://git.chorem.org/pollen.git from 613b614 Merge branch 'release/2.0-alpha-2' adds fea63ee [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds dc6fdef Merge branch 'master' into develop adds d302d01 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 86b2cf6 fixes #1100 error on load edit user profile page adds 06e071c fixes #1102: Improve service configuration adds 900395e [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-3' with snapshot versions adds 715dfd6 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-3' with non-snapshot versions adds ba5e600 Merge branch 'release/2.0-alpha-3' No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-rest-api/src/main/resources/pollen-rest-api.properties | 1 - pollen-services/pom.xml | 2 +- .../org/chorem/pollen/services/config/PollenServiceConfig.java | 9 ++------- .../chorem/pollen/services/config/PollenServiceConfigOption.java | 2 +- pollen-ui-angular/pom.xml | 2 +- pollen-ui-angular/src/main/webapp/partials/user-edit.html | 9 +++++---- 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 +- 18 files changed, 22 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0