Merge branch 'feature/create_interval_date' into 'develop' (64454f0f) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

64454f0f

Commit 64454f0f authored 8 years ago by Antonin

Downloads
- Plain Diff

Merge branch 'feature/create_interval_date' into 'develop'

Définition des dates par interval

Voilou, voilou

See merge request !106

parents b35aa242 c1026615

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 1 deletion

CHANGELOG.md
app/inc/config.template.php 3 additions, 0 deletions

app/inc/config.template.php
create_classic_poll.php 1 addition, 1 deletion

create_classic_poll.php
create_date_poll.php 17 additions, 2 deletions

create_date_poll.php
js/app/date_poll.js 120 additions, 18 deletions

js/app/date_poll.js
js/app/framadatepicker.js 1 addition, 1 deletion

js/app/framadatepicker.js
locale/de.json 10 additions, 3 deletions

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

locale/en.json
locale/es.json 12 additions, 2 deletions

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

locale/fr.json
locale/it.json 9 additions, 2 deletions

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

locale/oc.json
tpl/create_date_poll_step_2.tpl 60 additions, 1 deletion

tpl/create_date_poll_step_2.tpl
tpl/part/vote_table_classic.tpl 1 addition, 1 deletion

tpl/part/vote_table_classic.tpl

with 264 additions and 40 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