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

branch pollen-udpate-1.6 updated (a9fe826 -> 31e8426)
by chorem.org scm 20 Mar '17

20 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git discards a9fe826 refs #1308: Update mockito discards 85dc30b refs #1308: Update postgres discards 530a8ae refs #1308: Update selenium discards c5b5a1b refs #1308: Update shiro discards ae812b3 refs #1308: Update c3p0 discards e9dcf3f refs #1308: Update struts to 2.5.5 discards e6b82e3 refs #1308: Replace deprecated apis discards 03c1b05 refs #1308: Replace deprecated apis discards cd74edf refs #1308: Update javamail discards e6576be refs #1308: Update log4j discards 60759d0 refs #1308: Update nuiton-validator discards 7eaf183 refs #1308: Update nuiton-config discards 434338b refs #1308: Update guava discards e5b5c45 refs #1308: Update commons-io discards 9372b32 refs #1308: Update commons-lang discards d4969ac refs #1308: Update commons-collections4 discards 900d716 refs #1308: Update log4j discards af27a15 refs #1308: Update nuiton-i18n & nuiton-utils discards d69b8fb refs #1308: Update nuiton-i18n discards 0cd46aa refs #1308: Update parent pom discards 23c7976 fixes #1301: [Comment] Add anti spam filter vote vote and comments discards 231943b Add <strong> on link discards 8a01ba7 Replace invalid "image" tag discards 7f3e6ca Fix invalid location of html element discards c4cffda Fix deprecated method discards b4ef665 Import discards c3e47af Fix java8 javadoc, deps... discards e75e861 Remove profil (too complicated) discards 77fa61f Update to log4j2 discards 9618a34 Oups discards 14ec9d2 Never in update mode discards b6d29d7 Fix struts internal change related to action button discards 0ae534a Fix jetty config for integration tests discards 3dd4b09 Fix : char in uri (struts update) discards 8c1a569 Strange: all migration queries are not working :( discards 12a68bb Update jfreechart discards 124bd37 Fix jquery attr/prop change (1.6+) discards b4a95b9 Update struts, struts-jquery-plugin discards 53ec7cc Update postgresql discards b2970d9 Replace deprecated i18n methods discards 28290a9 Update postgresql discards 730e259 Update topia, eugene, hibernate (4.3) discards f84fd99 Copy TransactionFilter for compatibility with topia 2 discards 7ff845d fixes #1307: Drop tomcat 6 support Update nuiton-web, nuiton-utils, nuiton-i18n (nightmare :( ) discards db013f6 Update junit discards a730c1d Update mockito discards 038eccd Update javax.mail discards fd2f225 Fix hibernate-c3p0 as runtime discards 966dbf6 Update hibernate discards 699a3c4 Update commons-collections4 discards 6e0be32 Update guava discards 6b590d2 Update commons-lang3 discards b045c28 Update commons-email discards ebffdd4 Update shiro discards 6dd7118 Update slf4j discards ffbb889 Udpate selenium discards 20ce604 Update h2 discards 132c8cb Fix javadoc discards 50c50d5 Add dev mode case for i18n init adds 6d26882 Update parent pom adds 49c9fba fixes #1230 Can't add choice date in poll with message 'Date obligatoire', but date is correct adds deec9ce fixes #1385 The poll administration links do not work anymore adds 78341f5 fixes #1300 [Vote] End vote time is not diplayed on vote page adds 3fc0d79 fixes #1301: [Comment] Add anti spam filter vote vote and comments adds 3dee9e3 fixes #1301 [Comment] Add anti spam filter vote vote and comments adds 9bc5b8e Update footer adds 96dc837 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e04c97c [jgitflow-maven-plugin]updating poms for 1.5.10 branch with snapshot versions adds edf716d [jgitflow-maven-plugin]updating poms for branch'release/1.5.10' with non-snapshot versions adds 65d6b4c [jgitflow-maven-plugin]merging 'release/1.5.10' into 'master' adds 0b1d454 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 200032f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a14aa2a Update parent pom new de064cc Add dev mode case for i18n init new fc9cca8 Fix javadoc new aacf11c Update h2 new cdc8829 Udpate selenium new 5b00d43 Update slf4j new ef871fe Update shiro new 6be020f Update commons-email new 351affb Update commons-lang3 new f0eb399 Update guava new 840bfb7 Update commons-collections4 new 218eba6 Update hibernate new 1f0e626 Fix hibernate-c3p0 as runtime new 90b8cd2 Update javax.mail new 8eb6d06 Update mockito new aac7f61 Update junit new 4e01770 fixes #1307: Drop tomcat 6 support Update nuiton-web, nuiton-utils, nuiton-i18n (nightmare :( ) new e17fcdb Copy TransactionFilter for compatibility with topia 2 new 24669c3 Update topia, eugene, hibernate (4.3) new 0f6d16b Update postgresql new 99587ba Replace deprecated i18n methods new af1afb5 Update postgresql new 651729c Update struts, struts-jquery-plugin new 851f470 Fix jquery attr/prop change (1.6+) new 341c89b Update jfreechart new f7898c2 Strange: all migration queries are not working :( new 45add36 Fix : char in uri (struts update) new 6c2b9f8 Fix jetty config for integration tests new 80adf8b Fix struts internal change related to action button new 336ddfe Never in update mode new d72c9b5 Oups new 7f81723 Update to log4j2 new e6a1b6c Remove profil (too complicated) new 7ea9dc2 Fix java8 javadoc, deps... new a76aae3 Import new 7df1dd3 Fix deprecated method new 621b9da Fix invalid location of html element new d021e6c Replace invalid "image" tag new 4b87e8d Add <strong> on link new 89a001c fixes #1301: [Comment] Add anti spam filter vote vote and comments new 7e8c35c refs #1308: Update parent pom new 15685b9 refs #1308: Update nuiton-i18n new 07220ce refs #1308: Update nuiton-i18n & nuiton-utils new 84de8a6 refs #1308: Update log4j new b00f9fe refs #1308: Update commons-collections4 new 78a069e refs #1308: Update commons-lang new 5f13b38 refs #1308: Update commons-io new f4d43fa refs #1308: Update guava new 0f3765e refs #1308: Update nuiton-config new 22ba5e6 refs #1308: Update nuiton-validator new 9a9f901 refs #1308: Update log4j new 23e00c3 refs #1308: Update javamail new 3c5bccb refs #1308: Replace deprecated apis new 342fdc3 refs #1308: Replace deprecated apis new 0eae94b refs #1308: Update struts to 2.5.5 new 5dc1930 refs #1308: Update c3p0 new 9ad323d refs #1308: Update shiro new 46cc3e3 refs #1308: Update selenium new 4e62990 refs #1308: Update postgres new 31e8426 refs #1308: Update mockito This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a9fe826) \ N -- N -- N refs/heads/pollen-udpate-1.6 (31e8426) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 59 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 31e842662347a31429b80a2cf4d966863caeeeb6 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 23:13:06 2016 +0100 refs #1308: Update mockito commit 4e62990647a00221a720a1c0d70e6334322b1d15 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:49:10 2016 +0100 refs #1308: Update postgres commit 46cc3e323495243861b91dd7bfa8e4ca308faf1c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:48:12 2016 +0100 refs #1308: Update selenium commit 9ad323d2ae5ca249f8de3c02e2eb2c6fb7ef5eec Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:36:45 2016 +0100 refs #1308: Update shiro commit 5dc1930b026e4911a2b990a70abf1cb46fd2c503 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:01:13 2016 +0100 refs #1308: Update c3p0 commit 0eae94bf49e2559bd4134832a68d470085815b50 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Tue Dec 13 22:00:03 2016 +0100 refs #1308: Update struts to 2.5.5 commit 342fdc37a8a911df362a823a51b220861980ce2c Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 22:39:58 2016 +0100 refs #1308: Replace deprecated apis commit 3c5bccbf78ca426459c9e8378715be752ebaf379 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 22:39:39 2016 +0100 refs #1308: Replace deprecated apis commit 23e00c399ea22d7df48d9b61fb6b55b39c7d8cda Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:54:04 2016 +0100 refs #1308: Update javamail commit 9a9f9014728d71a4ec1833c175aeea4719af1cc6 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:53:49 2016 +0100 refs #1308: Update log4j commit 22ba5e6b9ba44c1521c0ebc79ff8ee5325dac032 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:52:49 2016 +0100 refs #1308: Update nuiton-validator commit 0f3765ea52baab2b0f076b9374cf2cb90058cef2 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:52:34 2016 +0100 refs #1308: Update nuiton-config commit f4d43fa433b2b78c5e19f41ae047828b082f9b1f Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:58 2016 +0100 refs #1308: Update guava commit 5f13b384bc5e115b7b479af776a33f0ef4b456f3 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:42 2016 +0100 refs #1308: Update commons-io commit 78a069e634fb1d88231216f81d066fce7114c09d Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:29 2016 +0100 refs #1308: Update commons-lang commit b00f9fea32baf05184f1abfce8236d4346c069b6 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:51:16 2016 +0100 refs #1308: Update commons-collections4 commit 84de8a60066cccde7aca17decda5bed402fb61ed Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:50:34 2016 +0100 refs #1308: Update log4j commit 07220ced113b5226b54d0c5647fa8b98a06e6f09 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:50:08 2016 +0100 refs #1308: Update nuiton-i18n & nuiton-utils commit 15685b9b8697a62629b5a1e02d5db32d21f03b3f Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:47:21 2016 +0100 refs #1308: Update nuiton-i18n commit 7e8c35cf9a9d5d0daba3256e23d9da0f8176adee Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Mon Dec 12 20:43:34 2016 +0100 refs #1308: Update parent pom commit 89a001cfc881474f24191a0515c65553bb220f7f Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 22:22:19 2015 +0100 fixes #1301: [Comment] Add anti spam filter vote vote and comments commit 4b87e8dde286b579d9037e959ded072cecbd6ce6 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:39:35 2015 +0100 Add <strong> on link commit d021e6c415b05deed15ac63eac44df647b87b5bc Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:26:24 2015 +0100 Replace invalid "image" tag commit 621b9da0683e0610c964080f013b9b9c22947a18 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:22:55 2015 +0100 Fix invalid location of html element commit 7df1dd333b4494771bc43e4f15516771ff03652d Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:22:40 2015 +0100 Fix deprecated method commit a76aae31e7ddd111faddb94f83abe7f8ba5fddb3 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Wed Nov 18 21:22:22 2015 +0100 Import commit 7ea9dc2bf075a60688dc861f1a2eacff14f4fedf Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Nov 16 15:05:01 2015 +0100 Fix java8 javadoc, deps... commit e6a1b6c90d7e63897d8a086d71ae5f1d6435b2ef Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Nov 16 15:04:26 2015 +0100 Remove profil (too complicated) commit 7f81723d19393edcb032f7382741a21cd608818e Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 23:03:16 2015 +0100 Update to log4j2 commit d72c9b53e9a52214244312a6da23bc4b95b0d0b0 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 22:00:21 2015 +0100 Oups commit 336ddfea9d731a9844484c27dd17b655ff7a0920 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:56:06 2015 +0100 Never in update mode commit 80adf8bb6cedfbe22edcb722b382e66dfec943d1 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:55:51 2015 +0100 Fix struts internal change related to action button commit 6c2b9f8a917c1333c221f22c323f39ab8cf1604e Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:55:19 2015 +0100 Fix jetty config for integration tests commit 45add3670c7ab10683cfbda39b129018e80e4a76 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 21:53:00 2015 +0100 Fix : char in uri (struts update) commit f7898c202c3985f8d247009318e37bc621696cbd Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sun Nov 15 18:36:45 2015 +0100 Strange: all migration queries are not working :( commit 341c89b102cdfd103f0742f748f3e9a003f31640 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 11:21:40 2015 +0100 Update jfreechart commit 851f4705b125ea447a9209cb7dbb0928fa792a16 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 11:16:18 2015 +0100 Fix jquery attr/prop change (1.6+) commit 651729c348380ef220fd3f0504d1b3eb701fba97 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 11:06:09 2015 +0100 Update struts, struts-jquery-plugin commit af1afb5352386fed7de3f1581300018d8b561482 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:38:42 2015 +0100 Update postgresql commit 99587ba6672e589f1154d0f74340a362a3cdcf2b Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:36:37 2015 +0100 Replace deprecated i18n methods commit 0f6d16ba9db44c583a617e8ec4f12cdba8354f61 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:27:48 2015 +0100 Update postgresql commit 24669c3905e53380702aff7b59be39c52d28cceb Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Sat Nov 14 09:22:54 2015 +0100 Update topia, eugene, hibernate (4.3) commit e17fcdbcb1f7828cb05d5ad8eb16fe51d879e614 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 23:37:00 2015 +0100 Copy TransactionFilter for compatibility with topia 2 commit 4e0177017b3f96681fe2d1fc7e6f8db72f867738 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 23:36:00 2015 +0100 fixes #1307: Drop tomcat 6 support Update nuiton-web, nuiton-utils, nuiton-i18n (nightmare :( ) commit aac7f6120e351f1202721ed857643e08c10c84a7 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:18:21 2015 +0100 Update junit commit 8eb6d064bdc58f3410d950caf705d7387d30b8da Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:17:41 2015 +0100 Update mockito commit 90b8cd2d8b85b29e74fd13e1fa4b157774de37e8 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:15:40 2015 +0100 Update javax.mail commit 1f0e626d7ecb5796b9733cc171e1396ece8f8042 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:06:26 2015 +0100 Fix hibernate-c3p0 as runtime commit 218eba6fae1e98a065ca166be5ec7c3202717c10 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 21:00:13 2015 +0100 Update hibernate commit 840bfb7745afdf165abbb97aef4b3d4268d7047a Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:48:52 2015 +0100 Update commons-collections4 commit f0eb399ad88dc7f8c3ddd54c58c0a69c8935baaf Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:27:26 2015 +0100 Update guava commit 351affb5adfa0d6381b9f196798643c8f0d8d9c1 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:23:22 2015 +0100 Update commons-lang3 commit 6be020f0e49749ae95cc7aa968e4836107b1be53 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:22:51 2015 +0100 Update commons-email commit ef871fe16ec0a81c5a7ad60161ba799ac6396de5 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 20:00:03 2015 +0100 Update shiro commit 5b00d43333e92faf3cacb731c2de6389478a049b Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:52:08 2015 +0100 Update slf4j commit cdc88297c2064b51ead88c710ff3be4269423ede Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:48:21 2015 +0100 Udpate selenium commit aacf11c1bc39a9c4792cb346affc63bcf07e2a45 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:42:20 2015 +0100 Update h2 commit fc9cca87d92ea6050e7b2b5c38240e0966fa47d2 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:38:08 2015 +0100 Fix javadoc commit de064ccc022f95f4a2a5cfa2440a29d5133cf303 Author: Eric Chatellier <eric.chatellier(a)gmail.com> Date: Fri Nov 13 19:37:55 2015 +0100 Add dev mode case for i18n init Summary of changes: changelog.txt | 40 ---------------------- pollen-persistence/changelog.txt | 4 --- .../pollen/business/persistence/PollImpl.java | 2 +- .../chorem/pollen/business/persistence/Polls.java | 5 +++ pollen-services/changelog.txt | 4 --- .../main/java/org/chorem/pollen/bean/PollUri.java | 5 +-- pollen-ui-struts2/changelog.txt | 0 .../pollen/ui/actions/poll/ResultForPoll.java | 4 +-- .../ui/actions/poll/vote/AbstractVoteAction.java | 4 +-- .../pollen/ui/actions/poll/vote/AddChoice.java | 23 +++++++++---- .../i18n/pollen-ui-struts2_en_GB.properties | 1 + .../i18n/pollen-ui-struts2_fr_FR.properties | 1 + .../webapp/WEB-INF/decorators/layout-default.jsp | 4 +-- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 2 +- pollen-votecounting-aggregator/changelog.txt | 0 pollen-votecounting-api/changelog.txt | 0 pollen-votecounting-borda/changelog.txt | 0 pollen-votecounting-condorcet/changelog.txt | 0 pollen-votecounting-coombs/changelog.txt | 0 pollen-votecounting-instant-runoff/changelog.txt | 0 pollen-votecounting-normal/changelog.txt | 0 pollen-votecounting-number/changelog.txt | 0 pollen-votecounting-percentage/changelog.txt | 0 pom.xml | 4 ++- 24 files changed, 38 insertions(+), 65 deletions(-) delete mode 100644 changelog.txt delete mode 100644 pollen-persistence/changelog.txt delete mode 100644 pollen-services/changelog.txt delete mode 100644 pollen-ui-struts2/changelog.txt delete mode 100644 pollen-votecounting-aggregator/changelog.txt delete mode 100644 pollen-votecounting-api/changelog.txt delete mode 100644 pollen-votecounting-borda/changelog.txt delete mode 100644 pollen-votecounting-condorcet/changelog.txt delete mode 100644 pollen-votecounting-coombs/changelog.txt delete mode 100644 pollen-votecounting-instant-runoff/changelog.txt delete mode 100644 pollen-votecounting-normal/changelog.txt delete mode 100644 pollen-votecounting-number/changelog.txt delete mode 100644 pollen-votecounting-percentage/changelog.txt -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 59

branch develop updated (63db587 -> 90b6e07)
by chorem.org scm 17 Mar '17

17 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 63db587 Adaptation de l'écran des listes de sondages new 90b6e07 réutilisation de l'écran de création de sondage pour l'edition + tooltips 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 90b6e077dd4a79ea29b1824f6d1376e8c15fbf72 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Mar 17 11:44:25 2017 +0100 réutilisation de l'écran de création de sondage pour l'edition + tooltips Summary of changes: pollen-ui-riot-js/src/main/web/css/main.css | 25 +++ pollen-ui-riot-js/src/main/web/i18n.json | 38 ++-- pollen-ui-riot-js/src/main/web/js/PollForm.js | 126 ++++--------- pollen-ui-riot-js/src/main/web/tag/Home.tag.html | 4 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 9 +- .../src/main/web/tag/PollenHeader.tag.html | 4 +- .../src/main/web/tag/poll/Choice.tag.html | 19 +- .../src/main/web/tag/poll/Choices.tag.html | 14 +- .../src/main/web/tag/poll/CreatePoll.tag.html | 161 ----------------- .../src/main/web/tag/poll/Description.tag.html | 3 +- .../src/main/web/tag/poll/EditPoll.tag.html | 198 +++++++++++++++++++++ .../src/main/web/tag/poll/Settings.tag.html | 25 ++- .../src/main/web/tag/poll/Voters.tag.html | 3 +- .../src/main/web/tag/poll/editPoll.tag.html | 127 ------------- 14 files changed, 333 insertions(+), 423 deletions(-) delete mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/CreatePoll.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html delete mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/editPoll.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (bf62850 -> 63db587)
by chorem.org scm 16 Mar '17

16 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from bf62850 Adaptation de l'écran de de connexion, d'inscription et de confirmation de mail + correction de l'expiration du token de session new 63db587 Adaptation de l'écran des listes de sondages 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 63db587d41fc3de6e62244ec32911d601552a221 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Mar 16 15:39:38 2017 +0100 Adaptation de l'écran des listes de sondages Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 60 +++-- pollen-ui-riot-js/src/main/web/js/UIHelper.js | 11 + .../src/main/web/tag/Pagination.tag.html | 235 +++++++++++--------- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 3 +- .../src/main/web/tag/poll/PollCard.tag.html | 92 ++++++++ .../src/main/web/tag/poll/Polls.tag.html | 245 ++++++--------------- 6 files changed, 337 insertions(+), 309 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/PollCard.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (c968dc0 -> bf62850)
by chorem.org scm 15 Mar '17

15 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from c968dc0 Ajout de choix et des info du sondage dans l'écran de vote, new bf62850 Adaptation de l'écran de de connexion, d'inscription et de confirmation de mail + correction de l'expiration du token de session 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 bf6285093d90576220ffb4b32904262ae5fd3f1b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Mar 15 14:50:48 2017 +0100 Adaptation de l'écran de de connexion, d'inscription et de confirmation de mail + correction de l'expiration du token de session Summary of changes: .../chorem/pollen/rest/api/PollenRenderError.java | 46 ++++++ .../rest/api/PollenRestApiRequestFilter.java | 10 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 23 +-- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 17 +- pollen-ui-riot-js/src/main/web/css/main.css | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 12 +- pollen-ui-riot-js/src/main/web/index.html | 4 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 3 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 22 ++- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 8 +- .../tag/{Footer.tag.html => PollenFooter.tag.html} | 12 +- .../tag/{Header.tag.html => PollenHeader.tag.html} | 8 +- .../src/main/web/tag/SignCheck.tag.html | 105 +++++-------- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 85 +++++----- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 173 +++++++++++++-------- .../src/main/web/tag/popup/AccountCreated.tag.html | 131 +++++----------- .../src/main/web/tag/popup/NewPassword.tag.html | 160 +++++-------------- .../main/web/tag/popup/ResendValidation.tag.html | 160 +++++-------------- 18 files changed, 421 insertions(+), 560 deletions(-) create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRenderError.java rename pollen-ui-riot-js/src/main/web/tag/{Footer.tag.html => PollenFooter.tag.html} (93%) rename pollen-ui-riot-js/src/main/web/tag/{Header.tag.html => PollenHeader.tag.html} (98%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (54d4138 -> c968dc0)
by chorem.org scm 14 Mar '17

14 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 54d4138 modification d'un sondage new c968dc0 Ajout de choix et des info du sondage dans l'écran de vote, 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 c968dc0c67aa552e1889c34f8bae233f143f05fb Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Mar 14 11:36:53 2017 +0100 Ajout de choix et des info du sondage dans l'écran de vote, Summary of changes: pollen-ui-riot-js/src/main/web/i18n.json | 2 + pollen-ui-riot-js/src/main/web/js/Poll.js | 22 ++++++ pollen-ui-riot-js/src/main/web/js/PollForm.js | 17 +++-- .../src/main/web/tag/poll/Choice.tag.html | 6 ++ .../src/main/web/tag/poll/Poll.tag.html | 11 ++- .../src/main/web/tag/poll/Votes.tag.html | 82 ++++++++++++++++------ 6 files changed, 110 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (e2c8fa0 -> 54d4138)
by chorem.org scm 13 Mar '17

13 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from e2c8fa0 Merge branch 'feature/component_choice_editor' into 'develop' adds 54d4138 modification d'un sondage No new revisions were added by this update. Summary of changes: pollen-ui-riot-js/src/main/web/css/main.css | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 4 + pollen-ui-riot-js/src/main/web/js/Poll.js | 21 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 61 ++++- pollen-ui-riot-js/src/main/web/js/PollService.js | 5 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 5 +- .../src/main/web/tag/poll/Choice.tag.html | 296 +++++++++++---------- .../src/main/web/tag/poll/Choices.tag.html | 33 ++- .../src/main/web/tag/poll/Description.tag.html | 7 +- .../src/main/web/tag/poll/Poll.tag.html | 79 +++++- .../src/main/web/tag/poll/Settings.tag.html | 57 ++-- .../src/main/web/tag/poll/Voters.tag.html | 5 +- .../src/main/web/tag/poll/Votes.tag.html | 36 +-- .../src/main/web/tag/poll/editPoll.tag.html | 127 +++++++++ 14 files changed, 541 insertions(+), 197 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/editPoll.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/options-de-vote deleted (was 54d4138)
by chorem.org scm 13 Mar '17

13 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/options-de-vote in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 54d4138 modification d'un sondage 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

branch feature/options-de-vote updated (e2c8fa0 -> 54d4138)
by chorem.org scm 13 Mar '17

13 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/options-de-vote in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from e2c8fa0 Merge branch 'feature/component_choice_editor' into 'develop' new 54d4138 modification d'un sondage 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 54d41384a1c7fb8fa839f54127cca6c4a7b3d6d4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Mar 13 17:35:01 2017 +0100 modification d'un sondage Summary of changes: pollen-ui-riot-js/src/main/web/css/main.css | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 4 + pollen-ui-riot-js/src/main/web/js/Poll.js | 21 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 61 ++++- pollen-ui-riot-js/src/main/web/js/PollService.js | 5 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 5 +- .../src/main/web/tag/poll/Choice.tag.html | 296 +++++++++++---------- .../src/main/web/tag/poll/Choices.tag.html | 33 ++- .../src/main/web/tag/poll/Description.tag.html | 7 +- .../src/main/web/tag/poll/Poll.tag.html | 79 +++++- .../src/main/web/tag/poll/Settings.tag.html | 57 ++-- .../src/main/web/tag/poll/Voters.tag.html | 5 +- .../src/main/web/tag/poll/Votes.tag.html | 36 +-- .../src/main/web/tag/poll/editPoll.tag.html | 127 +++++++++ 14 files changed, 541 insertions(+), 197 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/editPoll.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/options-de-vote updated (14536b4 -> e2c8fa0)
by chorem.org scm 13 Mar '17

13 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/options-de-vote in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 14536b4 Merge branch 'feature/votes-screen' into 'develop' adds 23a5ddb debut du composant d'édition de choix adds d94a8fa - ajout du type datetime dans le modele pour les choix - utilisation du composant de choix dans le formulaire - utilisation des input de type date et time quand supportés adds 177e153 modification du parsing des dates : maintenant on attend le timestamp pour les types date et datetime adds 38c722b - enrgistrement des choix de type date, datetime et resource - affichage des choix de types resources adds 8f6b10d gestion de l'édition des choix de type resource adds 1fd5df6 ajout de la description adds 1bad9bf gestion des images adds d425029 enlarge time editor adds 0890755 remove dead code + replace syntax adds e2c8fa0 Merge branch 'feature/component_choice_editor' into 'develop' No new revisions were added by this update. Summary of changes: pollen-persistence/src/main/xmi/pollen.zargo | Bin 21327 -> 21426 bytes .../chorem/pollen/services/bean/ChoiceBean.java | 54 +----- .../pollen/services/service/ChoiceService.java | 49 ++--- pollen-ui-riot-js/package.json | 1 + pollen-ui-riot-js/src/main/web/css/main.css | 5 +- pollen-ui-riot-js/src/main/web/i18n.json | 6 +- pollen-ui-riot-js/src/main/web/index.js | 1 + pollen-ui-riot-js/src/main/web/js/FetchService.js | 4 +- pollen-ui-riot-js/src/main/web/js/I18nHelper.js | 4 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 142 ++++++-------- ...teCountingTypeService.js => ResourceService.js} | 20 +- pollen-ui-riot-js/src/main/web/js/Session.js | 15 ++ pollen-ui-riot-js/src/main/web/js/UIHelper.js | 38 ++++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 - .../main/web/tag/components/date-picker.tag.html | 194 +++++++++++++++++++ .../main/web/tag/components/time-picker.tag.html | 207 +++++++++++++++++++++ .../src/main/web/tag/poll/Choice.tag.html | 207 +++++++++++++++++++++ .../src/main/web/tag/poll/ChoiceText.tag.html | 176 ------------------ .../src/main/web/tag/poll/Choices.tag.html | 15 +- .../src/main/web/tag/poll/CreatePoll.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 35 +++- 21 files changed, 793 insertions(+), 384 deletions(-) copy pollen-ui-riot-js/src/main/web/js/{VoteCountingTypeService.js => ResourceService.js} (63%) create mode 100644 pollen-ui-riot-js/src/main/web/js/UIHelper.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/date-picker.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/time-picker.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html delete mode 100644 pollen-ui-riot-js/src/main/web/tag/poll/ChoiceText.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/component_choice_editor deleted (was 0890755)
by chorem.org scm 13 Mar '17

13 Mar '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/component_choice_editor in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git was 0890755 remove dead code + replace syntax 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