[Pollen-commits] [pollen] branch develop updated (90e6c7c -> 5d56b2d)

11 Aug 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  90e6c7c   add form creator information in poll-settings
       new  118da7b   upgrade bootstrap datetimepicker and use momentjs 2.8.1
       new  d3cb162   add information of poll in UI
       new  95b5038   update dateTimePicker
       new  057498f   print info conflit between endChoiceDate and beginDate
       new  036512a   stop event for popup editChoice, edit transition popup
       new  47eddd1   update style with new import from bootstrap for transition and opacity
       new  97c1cf9   remove unused parameter and add end statement
       new  53376be   Merge branch 'feature/printPollInformation' into develop
       new  d4bb26c   PollService verify date
       new  2bdb75d   translate VoteService error message
       new  a8446d8   translate comment error message
       new  5d56b2d   translate voterlist error messages, add somme test for VoterListService

The 12 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 5d56b2d902e584b7e2252dc2b4dbf5ae3bedcb13
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Aug 11 15:26:56 2014 +0200

    translate voterlist error messages, add somme test for VoterListService

commit a8446d8f171ade6292b8dcba9da502e33e219287
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Aug 11 14:26:30 2014 +0200

    translate comment error message

commit 2bdb75d0936199c44d387ce3594695c90aa4c11f
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Aug 11 14:20:43 2014 +0200

    translate VoteService error message

commit d4bb26cd5d176c63fe7ad7b9add4c8f89dafaed0
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Aug 11 13:42:27 2014 +0200

    PollService verify date

commit 53376bef11c0e990192b42c869b5e9099ee549c8
Merge: 90e6c7c 97c1cf9
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Aug 11 15:31:23 2014 +0200

    Merge branch 'feature/printPollInformation' into develop

commit 97c1cf9aa56dafb384f7bb153b31c82277f2a381
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Mon Aug 11 11:35:37 2014 +0200

    remove unused parameter and add end statement

commit 47eddd178662b86763fb408cecdb351697284cda
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Fri Aug 8 17:00:55 2014 +0200

    update style with new import from bootstrap for transition and opacity

commit 036512a2c647c1d7695b1edcc8fa16cca4cf2a39
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Fri Aug 8 16:55:31 2014 +0200

    stop event for popup editChoice, edit transition popup

commit 057498f4c8a8a2cb43e09f719e77d6f165155e61
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Fri Aug 8 16:08:40 2014 +0200

    print info conflit between endChoiceDate and beginDate

commit 95b50385033f0c9eb19945bc8f23c02e2cfa3cac
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Fri Aug 8 16:07:28 2014 +0200

    update dateTimePicker

commit d3cb162294cff9532d815c909675fc7e04c5e633
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Thu Aug 7 17:26:44 2014 +0200

    add information of poll in UI

commit 118da7b7f46d271c82f121952cb00f363b6dbecc
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Thu Aug 7 12:57:07 2014 +0200

    upgrade bootstrap datetimepicker and use momentjs 2.8.1

Summary of changes:
 .../pollen/services/service/CommentService.java    |   6 +-
 .../pollen/services/service/PollService.java       |  56 +++++-
 .../services/service/VoteCountingService.java      |   6 +-
 .../pollen/services/service/VoteService.java       |  12 +-
 .../pollen/services/service/VoterListService.java  |  27 ++-
 .../services/service/security/SecurityService.java |   5 +-
 .../i18n/pollen-services_en_GB.properties          |  21 ++
 .../i18n/pollen-services_fr_FR.properties          |  21 ++
 .../services/service/VoterListServiceTest.java     |  74 ++++++-
 pollen-ui-angular/bower.json                       |   3 +-
 pollen-ui-angular/src/main/webapp/index.html       |   6 +-
 pollen-ui-angular/src/main/webapp/js/app.js        |   2 +-
 .../src/main/webapp/js/conf.js.exemple             |   3 +-
 .../src/main/webapp/js/controllers/alertCtrl.js    |  14 +-
 .../main/webapp/js/controllers/favoriteListCtrl.js |  22 +--
 .../src/main/webapp/js/controllers/localeCtrl.js   |   6 +-
 .../src/main/webapp/js/controllers/mainCtrl.js     |   2 +-
 .../src/main/webapp/js/controllers/pollCtrl.js     | 214 +++++++++++++--------
 .../src/main/webapp/js/controllers/userCtrl.js     |  30 +--
 pollen-ui-angular/src/main/webapp/js/directives.js |  98 +++++-----
 pollen-ui-angular/src/main/webapp/js/services.js   |  54 +++---
 pollen-ui-angular/src/main/webapp/less/style.less  |  73 +++++--
 .../src/main/webapp/less/variables.less            |  26 +--
 .../src/main/webapp/partials/dateTimePicker.html   |   6 +-
 .../src/main/webapp/partials/inline-poll.html      |  10 +-
 .../src/main/webapp/partials/poll-info.html        |  33 ++++
 .../src/main/webapp/partials/poll-settings.html    |   3 +-
 .../src/main/webapp/partials/poll.html             |   2 +
 28 files changed, 562 insertions(+), 273 deletions(-)
 create mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-info.html

-- 
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

[Pollen-commits] [pollen] branch develop updated (90e6c7c -> 5d56b2d)

chorem.org scm