[Pollen-commits] [pollen] branch develop updated (27ffc1f -> 269a05b)

30 Jul 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  27ffc1f   hover alert reset timeout
       new  28a498b   add permission addChoice, check choice type DATE no fail if choiceValue == null fix pollBeanFunction
       new  5deacbb   can edit and add choice in page of vote
       new  e94a143   auto complet input vote and old vote when you add choice
       new  59e2c4b   Improve permission for delete choice
       new  269a05b   Merge branch 'feature/addChoiceInVote' into develop

The 5 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 269a05bffec74bd2cf9ad3e84f9bc20e76b63d5e
Merge: 27ffc1f 59e2c4b
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed Jul 30 17:23:32 2014 +0200

    Merge branch 'feature/addChoiceInVote' into develop

commit 59e2c4b70cf1a9e9a8d1327195ab8693aa6049f9
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed Jul 30 17:05:14 2014 +0200

    Improve permission for delete choice

commit e94a143742a009504f00d6cec5ca32998bcbb127
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed Jul 30 16:27:12 2014 +0200

    auto complet input vote and old vote when you add choice

commit 5deacbbbec104a36ae359d8cb6599b6d2f6f37bd
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed Jul 30 15:32:46 2014 +0200

    can edit and add choice in page of vote

commit 28a498bdfe832c1fd4136f58e4e4a0f063473288
Author: Adrien Garandel <a.garandel@dralagen.fr>
Date:   Wed Jul 30 15:30:00 2014 +0200

    add permission addChoice,
    check choice type DATE no fail if choiceValue == null
    fix pollBeanFunction

Summary of changes:
 .../chorem/pollen/services/bean/ChoiceBean.java    |  10 +
 .../pollen/services/service/ChoiceService.java     |  14 +-
 .../pollen/services/service/PollService.java       |  16 -
 .../services/service/security/SecurityService.java |  27 +-
 .../src/main/webapp/js/controllers/pollCtrl.js     | 359 ++++++++++++---------
 .../src/main/webapp/partials/inline-poll.html      |  16 +-
 .../src/main/webapp/partials/poll-popupChoice.html |   2 +-
 7 files changed, 245 insertions(+), 199 deletions(-)

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

[Pollen-commits] [pollen] branch develop updated (27ffc1f -> 269a05b)

chorem.org scm