Merge remote-tracking branch 'framadate/develop' into develop (f9c3cde7) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

f9c3cde7

Commit f9c3cde7 authored 6 years ago by m

Downloads
- Plain Diff

Merge remote-tracking branch 'framadate/develop' into develop

parents cb03c5c0 a0927776

No related branches found

No related tags found

No related merge requests found

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

adminstuds.php 20 additions, 0 deletions

adminstuds.php
app/classes/Framadate/Repositories/VoteRepository.php 15 additions, 0 deletions

app/classes/Framadate/Repositories/VoteRepository.php
app/classes/Framadate/Services/PollService.php 40 additions, 24 deletions

app/classes/Framadate/Services/PollService.php
create_classic_poll.php 5 additions, 0 deletions

create_classic_poll.php
create_date_poll.php 5 additions, 0 deletions

create_date_poll.php
locale/ar.json 1 addition, 0 deletions

locale/ar.json
locale/br.json 1 addition, 0 deletions

locale/br.json
locale/de.json 1 addition, 0 deletions

locale/de.json
locale/en.json 1 addition, 0 deletions

locale/en.json
locale/es.json 1 addition, 0 deletions

locale/es.json
locale/fr.json 1 addition, 0 deletions

locale/fr.json
locale/it.json 1 addition, 0 deletions

locale/it.json
locale/nl.json 1 addition, 0 deletions

locale/nl.json
locale/oc.json 1 addition, 0 deletions

locale/oc.json
studs.php 6 additions, 1 deletion

studs.php
tpl/part/vote_table_classic.tpl 13 additions, 5 deletions

tpl/part/vote_table_classic.tpl
tpl/part/vote_table_date.tpl 14 additions, 11 deletions

tpl/part/vote_table_date.tpl

with 127 additions and 41 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