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

[pollen] branch release/2.0-alpha-2 deleted (was 733e247)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/2.0-alpha-2 in repository pollen. See http://git.chorem.org/pollen.git was 733e247 fix license headers 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-2 created (now 06e3a98)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

This is an automated email from the git hooks/post-receive script. New change to annotated tag pollen-2.0-alpha-2 in repository pollen. See http://git.chorem.org/pollen.git at 06e3a98 (tag) tagging 613b614a5ba421c1a602e2c4c880fa68af83592f (commit) replaces pollen-2.0-alpha-1 tagged by Maven Release on Fri Aug 29 18:22:59 2014 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.0-alpha-2 ----------------------------------------------------------------------- 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 updated (e5a1179 -> 613b614)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

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 e5a1179 Merge branch 'release/2.0-alpha-1' adds 2ed75b2 fixes #1060 Comment page layout adds 1f0dd60 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 761e793 Merge branch 'master' into develop adds 3fab593 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3ece749 Merge remote-tracking branch 'origin/develop' into develop adds 216c9e7 add release files to redmine adds da6637e add error when vote not started adds 3b56ff7 fixes #1069 add favicon adds c936c1b fixes #1076 change bottom links adds 68dbf56 fixes #1089 icon on error alert adds 6868130 fixes #1087 remove ng-click on tabs (conflit between ng-click and $locationChangeSuccess) adds 2379138 fixes #1085 add an action of sidebar to comment poll fixes #1086 add tooltips for minify and maxify sidebar adds cf021ef minify sidebar by default adds aa8e297 change cursor for input have selectOnClick and improve transition for comments page adds ec745a5 refs #1075 add notification when email not validate adds a2aa2e5 add translate poll.noComment, fix link comment in sidebar adds bd05eab fix name of defaultAlertTimeWarning adds 4161687 for cursor pointer on input readonly adds c5a2a28 add trigger to hide alert adds b716058 remove alert when can remove it adds bb5a0b3 fixes #1068 redirect to home when logout and delete all alert, and delete all data in session storage without locale adds 4e502e2 remove debug code adds 77569dc fixes #1088 remove invalid date message adds af95052 Fix choices tables border style adds 4fa505d separate differente form in user profile page adds 6f8d6e6 add view Profile adds beb223b fixes #1065 adds 850b979 change icon delete adds 354d32b Merge branch 'develop' of https://git.chorem.org/pollen into develop adds f023936 Fix typos, case and some anglicisms in the french i18nbundle adds fb29704 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop adds f9965bc no fixed height for print vote, and action for vote on one line adds 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions adds 113d23d [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions adds 733e247 fix license headers adds 613b614 Merge branch 'release/2.0-alpha-2' No new revisions were added by this update. Summary of changes: 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 --------- ...intResource.html => user-edit-viewProfile.html} | 30 ++++--- .../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, 461 insertions(+), 391 deletions(-) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-editProfile.html} (56%) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-password.html} (67%) copy pollen-ui-angular/src/main/webapp/partials/{printResource.html => user-edit-viewProfile.html} (54%) -- 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-2 updated (2e5a2c7 -> 733e247)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/2.0-alpha-2 in repository pollen. See http://git.chorem.org/pollen.git from 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions adds 113d23d [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-2' with non-snapshot versions adds 733e247 fix license headers 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-ui-angular/src/main/webapp/i18n/fr.js | 4 ++-- .../main/webapp/partials/user-edit-viewProfile.html | 20 ++++++++++++++++++++ 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 +- 16 files changed, 36 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[ANN] - Pollen 2.0-alpha-2 released
by chorem.org Release Notification Aug. 29, 2014

Aug. 29, 2014

The Pollen team is pleased to announce the pollen-2.0-alpha-2 release! Application de vote Pollen Documentation of the project can be found here: http://doc.chorem.org/pollen/v2 Changes ------- Changes in this version include: New features: o Add notification til you don't have validate your account Issue: 1075. Thanks to Tony Chemit. Resolved by garandel. o one page for edit profile with tab Issue: 1065. Thanks to Adrien Garandel. Resolved by garandel. o Comment page layout Issue: 1060. Thanks to Kevin Morin. Resolved by garandel. o Add a favicon Issue: 1069. Thanks to Tony Chemit. Resolved by garandel. o Edit poll : add missing tooltips Issue: 1086. Thanks to Tony Chemit. Resolved by garandel. o Review bottom links Issue: 1076. Thanks to Tony Chemit. Resolved by garandel. o Change the icon of error notification Issue: 1089. Thanks to Tony Chemit. Resolved by garandel. o Edit poll : add a action of sidebar to comment poll Issue: 1085. Thanks to Tony Chemit. Resolved by garandel. Fixed Bugs: o Review the end date of a poll Issue: 1088. Thanks to Tony Chemit. Resolved by garandel. o Can logout admin account, got a Access forbidden notification Issue: 1068. Thanks to Tony Chemit. Resolved by garandel. o Edit poll : Actions on sidebar does not work all the time Issue: 1087. Thanks to Tony Chemit. Resolved by garandel. Downloads --------- For a manual installation, you can download files here: http://forge.chorem.org/projects/pollen/files * pollen-rest-api-2.0-alpha-2.war - http://forge.chorem.org/attachments/download/179 * pollen-ui-angular-2.0-alpha-2.war - http://forge.chorem.org/attachments/download/180 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Pollen team

1 0

[pollen] branch release/2.0-alpha-2 created (now 2e5a2c7)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/2.0-alpha-2 in repository pollen. See http://git.chorem.org/pollen.git at 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions This branch includes the following new commits: new 2e5a2c7 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions 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 2e5a2c7f31e515f629b3f2e958f8c583c537f327 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Aug 29 16:56:48 2014 +0200 [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-2' with snapshot versions -- 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 (fb29704 -> f9965bc)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

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 fb29704 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop new f9965bc no fixed height for print vote, and action for vote on one line 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 f9965bc96516b19e2d99dec304eafce9fcd12351 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 29 16:17:16 2014 +0200 no fixed height for print vote, and action for vote on one line Summary of changes: pollen-ui-angular/src/main/webapp/less/style.less | 96 +++++++++++----------- .../src/main/webapp/partials/inline-poll.html | 8 +- 2 files changed, 53 insertions(+), 51 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 updated (354d32b -> fb29704)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

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 354d32b Merge branch 'develop' of https://git.chorem.org/pollen into develop adds f023936 Fix typos, case and some anglicisms in the french i18nbundle new fb29704 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop 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 fb297041573d929a6f613150d194d2a2680f5af4 Merge: 354d32b f023936 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 29 15:49:39 2014 +0200 Merge remote-tracking branch 'origin/feature/capello-master-on-fire' into develop Conflicts: pollen-ui-angular/src/main/webapp/i18n/fr.js Summary of changes: pollen-ui-angular/src/main/webapp/i18n/fr.js | 81 ++++++++++++++-------------- 1 file changed, 40 insertions(+), 41 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 updated (850b979 -> 354d32b)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

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 850b979 change icon delete new af95052 Fix choices tables border style new 354d32b Merge branch 'develop' of https://git.chorem.org/pollen into develop 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 354d32b16acc61e6116f1ed2894b43b18c628da9 Merge: af95052 850b979 Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Fri Aug 29 12:22:43 2014 +0200 Merge branch 'develop' of https://git.chorem.org/pollen into develop commit af950522c68f7032960869aad262a0434a40d9cf Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Fri Aug 29 12:22:39 2014 +0200 Fix choices tables border style Summary of changes: pollen-ui-angular/src/main/webapp/less/style.less | 50 ++++++++++++++--------- 1 file changed, 31 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch develop updated (77569dc -> 850b979)
by chorem.org scm Aug. 29, 2014

Aug. 29, 2014

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 77569dc fixes #1088 remove invalid date message adds 4fa505d separate differente form in user profile page adds 6f8d6e6 add view Profile new beb223b fixes #1065 new 850b979 change icon delete 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 850b9795aa67e5ec6c3e2194ae21570fac4bbc8e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 29 11:43:42 2014 +0200 change icon delete commit beb223be8083c4c2c25cf8273f9b371642d678c5 Merge: 77569dc 6f8d6e6 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 29 11:32:58 2014 +0200 fixes #1065 Merge branch 'feature/1065-editUserPage' into develop Conflicts: pollen-ui-angular/src/main/webapp/i18n/en.js pollen-ui-angular/src/main/webapp/i18n/fr.js Summary of changes: pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +- .../src/main/webapp/js/controllers/userCtrl.js | 18 +++-- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-link.html | 2 +- .../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/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 | 26 ++++++ .../src/main/webapp/partials/user-edit.html | 94 ++-------------------- 16 files changed, 69 insertions(+), 192 deletions(-) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-editProfile.html} (56%) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-password.html} (67%) create mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2