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

[pollen] branch master created (now b1a38ac)
by chorem.org scm Oct. 16, 2014

Oct. 16, 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 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 deleted (was b1a38ac)
by chorem.org scm Oct. 16, 2014

Oct. 16, 2014

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 was b1a38ac add .gitignore 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 deleted (was 7df4145)
by chorem.org scm Oct. 16, 2014

Oct. 16, 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 was 7df4145 fixes #1067 Need to click twice on menu to open them refs #1097 Display the number of comments in the comments tab title This change permanently discards the following revisions: discards 7df4145 fixes #1067 Need to click twice on menu to open them refs #1097 Display the number of comments in the comments tab title discards 2bb2997 refs #1111 Replace the auto-save of the poll form by a "Save" button discards 0663b64 [jgitflow-maven-plugin]Updating develop poms back to pre merge state discards 4299ac5 Merge branch 'master' into develop discards 6736cf7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch master deleted (was ba5e600)
by chorem.org scm Oct. 16, 2014

Oct. 16, 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 was ba5e600 Merge branch 'release/2.0-alpha-3' 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 (2bb2997 -> 7df4145)
by chorem.org scm Oct. 10, 2014

Oct. 10, 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 2bb2997 refs #1111 Replace the auto-save of the poll form by a "Save" button new 7df4145 fixes #1067 Need to click twice on menu to open them refs #1097 Display the number of comments in the comments tab title 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 7df41458f4adb184bfa34ef51497f2a1d248bdf4 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Oct 10 18:30:30 2014 +0200 fixes #1067 Need to click twice on menu to open them refs #1097 Display the number of comments in the comments tab title Summary of changes: .../pollen/services/bean/PaginationResultBean.java | 6 +++ .../chorem/pollen/services/bean/PollenBeans.java | 1 + pollen-ui-angular/src/main/webapp/index.html | 4 +- .../src/main/webapp/partials/poll.html | 62 ++++++++++++++++++---- 4 files changed, 61 insertions(+), 12 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/1112 updated (a955a64 -> 68590fb)
by chorem.org scm Sept. 22, 2014

Sept. 22, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/1112 in repository pollen. See http://git.chorem.org/pollen.git from a955a64 refs #1112 : complete Export service new 68590fb refs #1110 introduce admin action 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 68590fb4e6c9b196c4ea0dd85eaedcff7e16d787 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 22 10:41:58 2014 +0200 refs #1110 introduce admin action Summary of changes: .../pollen/ui/actions/admin/ExportDatabase.java | 86 ++++++++++++++++++++++ .../ui/actions/admin/ExportDatabaseInput.java | 64 ++++++++++++++++ .../src/main/resources/config/struts-admin.xml | 34 +++++++++ .../i18n/pollen-ui-struts2_en_GB.properties | 9 ++- .../i18n/pollen-ui-struts2_fr_FR.properties | 7 ++ .../webapp/WEB-INF/decorators/layout-default.jsp | 5 ++ .../exportDatabase-wait.jsp} | 28 +++++-- .../exportDatabase.jsp} | 44 +++++------ 8 files changed, 248 insertions(+), 29 deletions(-) create mode 100644 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ExportDatabase.java create mode 100644 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ExportDatabaseInput.java copy pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/{poll/displayVote_CHECKBOX.jsp => admin/exportDatabase-wait.jsp} (64%) copy pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/{poll/displayPollComment.jsp => admin/exportDatabase.jsp} (57%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/1112 updated (c65d74b -> a955a64)
by chorem.org scm Sept. 21, 2014

Sept. 21, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/1112 in repository pollen. See http://git.chorem.org/pollen.git from c65d74b refs #1112 : introduce the Export service new a955a64 refs #1112 : complete Export service 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 a955a64e038ef215e198d84c61d69413d2fcd319 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 21 07:25:06 2014 +0200 refs #1112 : complete Export service Summary of changes: .../pollen/services/impl/PollenExportService.java | 128 +++++++++++---------- 1 file changed, 66 insertions(+), 62 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/1110 updated (cbcdfbe -> 98c6494)
by chorem.org scm Sept. 21, 2014

Sept. 21, 2014

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 from cbcdfbe refs #1110 store and load are ok new 98c6494 refs #1110 clean dto (remove unecessary links + add more test data) 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 98c6494a966cd461825e32c890e34947c92ff0c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Sep 21 07:22:03 2014 +0200 refs #1110 clean dto (remove unecessary links + add more test data) Summary of changes: .../org/chorem/pollen/io/PollenDataStorage.java | 29 +- .../org/chorem/pollen/io/dto/PollenPrincipal.java | 12 - .../main/java/org/chorem/pollen/io/dto/Vote.java | 21 +- .../org/chorem/pollen/io/dto/VoteToChoice.java | 18 +- .../chorem/pollen/io/PollenDataStorageTest.java | 331 ++++++++++++++++++++- pollen-io-api/src/test/resources/store.zip | Bin 1572 -> 2956 bytes 6 files changed, 349 insertions(+), 62 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/1112 created (now c65d74b)
by chorem.org scm Sept. 20, 2014

Sept. 20, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/1112 in repository pollen. See http://git.chorem.org/pollen.git at c65d74b refs #1112 : introduce the Export service This branch includes the following new commits: new c65d74b refs #1112 : introduce the Export service 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 c65d74b4a42fc08d2bc266a511c9ff39ddfea310 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Sep 20 12:22:18 2014 +0200 refs #1112 : introduce the Export service -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/1110 updated (de9b945 -> cbcdfbe)
by chorem.org scm Sept. 20, 2014

Sept. 20, 2014

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 from de9b945 refs #1110 introduce to new module and deal with storages new cbcdfbe refs #1110 store and load are ok 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 cbcdfbef7e7e4d6bd995cc180bbf6950ebde5e9a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Sep 20 12:18:20 2014 +0200 refs #1110 store and load are ok Summary of changes: pollen-io-api/pom.xml | 6 + .../org/chorem/pollen/io/ExportServiceApi.java | 14 -- .../org/chorem/pollen/io/ImportServiceApi.java | 11 -- .../org/chorem/pollen/io/PollenDataStorage.java | 198 ++++++++++++++++++--- .../main/java/org/chorem/pollen/io/dto/Poll.java | 13 +- .../java/org/chorem/pollen/io/dto/PollenData.java | 44 ++++- .../org/chorem/pollen/io/dto/PollenResource.java | 13 +- .../chorem/pollen/io/dto/PollenResourceFile.java | 28 +++ .../pollen/io/dto/PollenResourceZipEntry.java | 35 ++++ .../main/java/org/chorem/pollen/io/dto/Vote.java | 10 +- .../org/chorem/pollen/io/dto/VoterListMember.java | 10 -- .../chorem/pollen/io/PollenDataStorageTest.java | 33 +++- pollen-io-api/src/test/resources/resource1.txt | 1 + .../src/test/resources/resource2.properties | 1 + pollen-io-api/src/test/resources/store.zip | Bin 604 -> 1572 bytes 15 files changed, 338 insertions(+), 79 deletions(-) delete mode 100644 pollen-io-api/src/main/java/org/chorem/pollen/io/ExportServiceApi.java delete mode 100644 pollen-io-api/src/main/java/org/chorem/pollen/io/ImportServiceApi.java create mode 100644 pollen-io-api/src/main/java/org/chorem/pollen/io/dto/PollenResourceFile.java create mode 100644 pollen-io-api/src/main/java/org/chorem/pollen/io/dto/PollenResourceZipEntry.java create mode 100644 pollen-io-api/src/test/resources/resource1.txt create mode 100644 pollen-io-api/src/test/resources/resource2.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1