Merge branch 'allow-smtp-config' into 'develop' (129dcba6) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

129dcba6

Commit 129dcba6 authored 7 years ago by Thomas Citharel

Downloads
- Plain Diff

Merge branch 'allow-smtp-config' into 'develop'

Allow setting SMTP config

Closes #192 and #150

See merge request framasoft/framadate!224

parents 2991b9e1 87205958

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

action/add_comment.php 1 addition, 1 deletion

action/add_comment.php
action/send_edit_link_by_email_action.php 2 additions, 2 deletions

action/send_edit_link_by_email_action.php
adminstuds.php 1 addition, 1 deletion

adminstuds.php
app/classes/Framadate/Services/MailService.php 33 additions, 5 deletions

app/classes/Framadate/Services/MailService.php
app/inc/config.template.php 9 additions, 1 deletion

app/inc/config.template.php
create_classic_poll.php 2 additions, 2 deletions

create_classic_poll.php
create_date_poll.php 1 addition, 1 deletion

create_date_poll.php
find_polls.php 4 additions, 4 deletions

find_polls.php
studs.php 1 addition, 1 deletion

studs.php

with 54 additions and 18 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