Merge branch 'release' into develop (e79a0bf6) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

e79a0bf6

Commit e79a0bf6 authored 8 years ago by Antonin

Downloads
- Plain Diff

Merge branch 'release' into develop

parents 5c11e5fe 1d5af5de

Loading

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 25 additions, 6 deletions

CHANGELOG.md
adminstuds.php 1 addition, 2 deletions

adminstuds.php
app/classes/Framadate/Form.php 7 additions, 1 deletion

app/classes/Framadate/Form.php
app/classes/Framadate/Services/AdminPollService.php 2 additions, 1 deletion

app/classes/Framadate/Services/AdminPollService.php
app/classes/Framadate/Services/InputService.php 7 additions, 1 deletion

app/classes/Framadate/Services/InputService.php
app/classes/Framadate/Utils.php 7 additions, 3 deletions

app/classes/Framadate/Utils.php
create_poll.php 19 additions, 17 deletions

create_poll.php
index.php 1 addition, 1 deletion

index.php
js/app/create_poll.js 5 additions, 19 deletions

js/app/create_poll.js
locale/br.json 1 addition, 92 deletions

locale/br.json
locale/de.json 78 additions, 76 deletions

locale/de.json
locale/en.json 6 additions, 3 deletions

locale/en.json
locale/es.json 4 additions, 1 deletion

locale/es.json
locale/fr.json 10 additions, 7 deletions

locale/fr.json
locale/it.json 4 additions, 1 deletion

locale/it.json
locale/oc.json 5 additions, 2 deletions

locale/oc.json
tpl/create_poll.tpl 129 additions, 101 deletions

tpl/create_poll.tpl
tpl/page.tpl 2 additions, 0 deletions

tpl/page.tpl
tpl/part/poll_info.tpl 12 additions, 7 deletions

tpl/part/poll_info.tpl

with 325 additions and 341 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