Merge branch 'feature/rework_poll_creation_1st_page' into 'release' (c50ca48e) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

c50ca48e

Commit c50ca48e authored 8 years ago by Antonin

Downloads
- Plain Diff

Merge branch 'feature/rework_poll_creation_1st_page' into 'release'

Rework on 1st page of poll creation



See merge request !142

parents 4b433bc1 9b39dd2f

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

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

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

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

js/app/create_poll.js
locale/de.json 3 additions, 1 deletion

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

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

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

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

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

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

tpl/create_poll.tpl

with 188 additions and 153 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