Merge branch 'merge-develop' into 'master' (01dc2312) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

01dc2312

Commit 01dc2312 authored 7 years ago by Thomas Citharel

Downloads
- Plain Diff

Merge branch 'merge-develop' into 'master'

Merge develop

Closes #205 and #190

See merge request framasoft/framadate!222

parents e6ed7121 77f05b1c

No related branches found

No related tags found

No related merge requests found

Changes 36

Hide whitespace changes

Inline Side-by-side

Showing

INSTALL.md 9 additions, 2 deletions

INSTALL.md
README.md 4 additions, 5 deletions

README.md
adminstuds.php 1 addition, 0 deletions

adminstuds.php
app/classes/Framadate/Services/NotificationService.php 1 addition, 1 deletion

app/classes/Framadate/Services/NotificationService.php
app/classes/Framadate/Services/PollService.php 6 additions, 2 deletions

app/classes/Framadate/Services/PollService.php
app/classes/Framadate/Utils.php 23 additions, 16 deletions

app/classes/Framadate/Utils.php
app/inc/config.template.php 6 additions, 1 deletion

app/inc/config.template.php
app/inc/smarty.php 9 additions, 3 deletions

app/inc/smarty.php
composer.json 2 additions, 1 deletion

composer.json
composer.lock 47 additions, 6 deletions

composer.lock
create_poll.php 2 additions, 1 deletion

create_poll.php
css/app/create_poll.css 1 addition, 1 deletion

css/app/create_poll.css
css/simplemde.min.css 7 additions, 0 deletions

css/simplemde.min.css
css/style.css 13 additions, 1 deletion

css/style.css
js/app/adminstuds.js 143 additions, 0 deletions

js/app/adminstuds.js
js/app/classic_poll.js 12 additions, 7 deletions

js/app/classic_poll.js
js/app/create_poll.js 5 additions, 0 deletions

js/app/create_poll.js
js/app/date_poll.js 44 additions, 33 deletions

js/app/date_poll.js
js/core.js 0 additions, 131 deletions

js/core.js
js/mde-wrapper.js 62 additions, 0 deletions

js/mde-wrapper.js

with 397 additions and 211 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