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

[pollen] branch feature/homePage created (now 17426f2)
by chorem.org scm 31 Jul '14

31 Jul '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/homePage in repository pollen. See http://git.chorem.org/pollen.git at 17426f2 Edit homePage and add footer This branch includes the following new commits: new 17426f2 Edit homePage and add footer 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 17426f238c643aa351aa4619fdd815defb3c9580 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 18:50:02 2014 +0200 Edit homePage and add footer -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] 01/01: add version.txt file with application version in root path of the war
by chorem.org scm 31 Jul '14

31 Jul '14

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 5d1b9c1967da3f6b867d95e47a8ed8a4216c9825 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jul 31 18:44:26 2014 +0200 add version.txt file with application version in root path of the war --- pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/pom.xml | 25 +++++++++++++++++++++++++ pollen-ui-angular/src/main/version.txt | 1 + 3 files changed, 27 insertions(+) diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore index 09447a5..c3551f4 100644 --- a/pollen-ui-angular/.gitignore +++ b/pollen-ui-angular/.gitignore @@ -3,4 +3,5 @@ node_modules/* src/main/webapp/lib src/main/webapp/css/style.css src/main/webapp/js/conf.js +src/main/webapp/version.txt diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 5f53bc8..3fc9403 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -107,6 +107,31 @@ <reporters>dots,junit</reporters> </configuration> </plugin> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-version-file</id> + <goals><goal>copy-resources</goal></goals> + <phase>generate-resources</phase> + <configuration> + <outputDirectory>src/main/webapp</outputDirectory> + <resources> + <resource> + <directory>src/main</directory> +  + <includes> + <include>version.txt</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/pollen-ui-angular/src/main/version.txt b/pollen-ui-angular/src/main/version.txt new file mode 100644 index 0000000..f2ab45c --- /dev/null +++ b/pollen-ui-angular/src/main/version.txt @@ -0,0 +1 @@ +${project.version} \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch develop updated (56797b3 -> 5d1b9c1)
by chorem.org scm 31 Jul '14

31 Jul '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 56797b3 Merge branch 'feature/editVote' into develop new 5d1b9c1 add version.txt file with application version in root path of the war 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 5d1b9c1967da3f6b867d95e47a8ed8a4216c9825 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jul 31 18:44:26 2014 +0200 add version.txt file with application version in root path of the war Summary of changes: pollen-ui-angular/.gitignore | 1 + pollen-ui-angular/pom.xml | 25 +++++++++++++++++++++++++ pollen-ui-angular/src/main/version.txt | 1 + 3 files changed, 27 insertions(+) create mode 100644 pollen-ui-angular/src/main/version.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch feature/editVote deleted (was 9f703a7)
by chorem.org scm 31 Jul '14

31 Jul '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git was 9f703a7 fix doublons when edit vote and add choice 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] branch develop updated (ee49fd5 -> 56797b3)
by chorem.org scm 31 Jul '14

31 Jul '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 ee49fd5 anonymizeUser set vote to anonyme adds 3962d70 generate editVote permission and deleteVote permission for connected user or by url permission adds 7cadb32 fix all-delete-orphan when editVote adds 7b8c002 fix edit Choice : if error you can edit or delete the choice adds b43ea8c improve message with url for edit vote adds 0e8eb23 improve message with url for edit comment adds 587c4a0 improve message with url for edit poll adds 0778ebc add message with url for clone poll and change order alert adds 9f703a7 fix doublons when edit vote and add choice new 56797b3 Merge branch 'feature/editVote' 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 56797b336136f5d15186d866e89055b979925e13 Merge: ee49fd5 9f703a7 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 15:04:18 2014 +0200 Merge branch 'feature/editVote' into develop Summary of changes: .../pollen/services/service/VoteService.java | 57 +++++++++-------- .../services/service/security/SecurityService.java | 4 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 3 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/controllers/pollCtrl.js | 72 ++++++++++++++-------- .../src/main/webapp/partials/inline-poll.html | 14 ++--- .../src/main/webapp/partials/poll-list.html | 2 +- 7 files changed, 99 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/editVote updated (0778ebc -> 9f703a7)
by chorem.org scm 31 Jul '14

31 Jul '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git from 0778ebc add message with url for clone poll and change order alert new 9f703a7 fix doublons when edit vote and add choice 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 9f703a72d36656247fdf9624f05dc796abbdae39 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 14:33:45 2014 +0200 fix doublons when edit vote and add choice Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/editVote updated (7b8c002 -> 0778ebc)
by chorem.org scm 31 Jul '14

31 Jul '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git from 7b8c002 fix edit Choice : if error you can edit or delete the choice new b43ea8c improve message with url for edit vote new 0e8eb23 improve message with url for edit comment new 587c4a0 improve message with url for edit poll new 0778ebc add message with url for clone poll and change order alert The 4 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 0778ebc7e923cef53e2ea2e764e572635a9d40b9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 14:21:38 2014 +0200 add message with url for clone poll and change order alert commit 587c4a0796392e3d658cb767fa61df15ceb727ce Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 14:13:25 2014 +0200 improve message with url for edit poll commit 0e8eb23ada431de88beeaeec9310a2fe1ed88d7c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 13:57:45 2014 +0200 improve message with url for edit comment commit b43ea8ca4f29b450d67112bbebcf3b4ce89b3d3c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 13:51:29 2014 +0200 improve message with url for edit vote Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 63 ++++++++++++++-------- .../src/main/webapp/partials/poll-list.html | 2 +- 4 files changed, 48 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

[pollen] branch develop updated (bd6baae -> ee49fd5)
by chorem.org scm 31 Jul '14

31 Jul '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 bd6baae fix poll controller test : rename getChoiceValue to getVoteValue new ee49fd5 anonymizeUser set vote to anonyme 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 ee49fd56efa091c58d57448c6a9e4861cd06c90e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 13:19:46 2014 +0200 anonymizeUser set vote to anonyme Summary of changes: .../main/java/org/chorem/pollen/services/service/PollenUserService.java | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/editVote created (now 7b8c002)
by chorem.org scm 31 Jul '14

31 Jul '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git at 7b8c002 fix edit Choice : if error you can edit or delete the choice This branch includes the following new commits: new 3962d70 generate editVote permission and deleteVote permission for connected user or by url permission new 7cadb32 fix all-delete-orphan when editVote new 7b8c002 fix edit Choice : if error you can edit or delete the choice The 3 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 7b8c0028892ea31ac548a56b416fa94f240d97d8 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 11:39:53 2014 +0200 fix edit Choice : if error you can edit or delete the choice commit 3962d700b22855b1a7c4f218408ec6c68fc5a693 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 30 17:40:15 2014 +0200 generate editVote permission and deleteVote permission for connected user or by url permission commit 7cadb32f89c3293f479eb3d44ae29bd46039f8da Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Jul 31 11:29:54 2014 +0200 fix all-delete-orphan when editVote -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

[pollen] branch feature/editVote deleted (was eb1d745)
by chorem.org scm 31 Jul '14

31 Jul '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/editVote in repository pollen. See http://git.chorem.org/pollen.git was eb1d745 generate editVote permission and deleteVote permission for connected user or by url permission This change permanently discards the following revisions: discards eb1d745 generate editVote permission and deleteVote permission for connected user or by url permission -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0