Merge branch 'JMarlow/framadate-Justine/Issue2' into 'develop' (96495243) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

96495243

Commit 96495243 authored 6 years ago by Thomas Citharel

Downloads
- Plain Diff

Merge branch 'JMarlow/framadate-Justine/Issue2' into 'develop'

J marlow/framadate justine/issue2

Closes #324

See merge request framasoft/framadate!319

parents bcd5acde 4c0c2a16

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/classes/Framadate/CollectMail.php 35 additions, 0 deletions

app/classes/Framadate/CollectMail.php
app/classes/Framadate/Form.php 5 additions, 3 deletions

app/classes/Framadate/Form.php
app/classes/Framadate/Repositories/PollRepository.php 1 addition, 1 deletion

app/classes/Framadate/Repositories/PollRepository.php
app/classes/Framadate/Services/InputService.php 11 additions, 7 deletions

app/classes/Framadate/Services/InputService.php
app/inc/constants.php 1 addition, 0 deletions

app/inc/constants.php
create_poll.php 1 addition, 3 deletions

create_poll.php
js/app/create_poll.js 3 additions, 3 deletions

js/app/create_poll.js
locale/en.json 22 additions, 8 deletions

locale/en.json
tpl/create_poll.tpl 24 additions, 13 deletions

tpl/create_poll.tpl
tpl/part/poll_info.tpl 13 additions, 3 deletions

tpl/part/poll_info.tpl
tpl/part/vote_table_classic.tpl 7 additions, 7 deletions

tpl/part/vote_table_classic.tpl
tpl/part/vote_table_date.tpl 8 additions, 8 deletions

tpl/part/vote_table_date.tpl

with 131 additions and 56 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment