[pollen] branch develop updated (e699210 -> 066c248)
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 e699210 after post a comment, print the url for editing post adds 54f37c7 add directive dateTimePicker adds 1bee25b Improve directive dateTimePicker adds c32d90c add dateTimePicker in poll settings new d6e133b fix label for poll-settings new 066c248 Merge branch 'feature/dateTimePicker' into develop The 2 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 066c248050915e0b2fba324996d17de73b95def3 Merge: e699210 d6e133b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 11:57:08 2014 +0200 Merge branch 'feature/dateTimePicker' into develop commit d6e133b621fc16243fc9d01a5607b190feb0c120 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 11:56:00 2014 +0200 fix label for poll-settings Summary of changes: pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 6 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 5 +- pollen-ui-angular/src/main/webapp/js/directives.js | 84 ++++++++++++++++++++++ .../src/main/webapp/partials/dateTimePicker.html | 6 ++ .../src/main/webapp/partials/inline-poll.html | 7 +- .../src/main/webapp/partials/poll-popupChoice.html | 7 +- .../src/main/webapp/partials/poll-settings.html | 61 +++++++--------- 8 files changed, 130 insertions(+), 49 deletions(-) create mode 100644 pollen-ui-angular/src/main/webapp/partials/dateTimePicker.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 d6e133b621fc16243fc9d01a5607b190feb0c120 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 11:56:00 2014 +0200 fix label for poll-settings --- pollen-ui-angular/src/main/webapp/partials/poll-settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index 8369256..33c1fb5 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -113,7 +113,7 @@ </div> <div class="form-group row"> - <label class="col-sm-4 control-label">{{ 'poll.config.label.limitedVote' | translate }}</label> + <label class="col-sm-4 control-label" for="formLimitedVote">{{ 'poll.config.label.limitedVote' | translate }}</label> <div class="col-sm-8"> <input type="checkbox" id="formLimitedVote" ng-model="data.poll.limitedVote" auto-save="autoSavePoll()" /> </div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 066c248050915e0b2fba324996d17de73b95def3 Merge: e699210 d6e133b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 11:57:08 2014 +0200 Merge branch 'feature/dateTimePicker' into develop pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 6 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 5 +- pollen-ui-angular/src/main/webapp/js/directives.js | 84 ++++++++++++++++++++++ .../src/main/webapp/partials/dateTimePicker.html | 6 ++ .../src/main/webapp/partials/inline-poll.html | 7 +- .../src/main/webapp/partials/poll-popupChoice.html | 7 +- .../src/main/webapp/partials/poll-settings.html | 61 +++++++--------- 8 files changed, 130 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm