Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MAIL configuration for 3rd party mail service. #46

Merged
merged 27 commits into from
Oct 8, 2020
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
41fcaa9
stub out index html
MekWarrior Jul 24, 2020
0449fba
remove duplicates at wrong level and add partials
MekWarrior Jul 29, 2020
ec899cb
Merge branch 'master' into html_buildout
MekWarrior Jul 29, 2020
83241be
move static files to correct level and start forms for experiments
MekWarrior Jul 29, 2020
96211bb
move files to match preferred layout
MekWarrior Jul 30, 2020
48e949a
first attempt at data entry page
MekWarrior Jul 30, 2020
5b6051f
refining connections for the new form
MekWarrior Jul 31, 2020
4d965b0
Fix template routing and PEP8 changes (#34)
willgraf Jul 31, 2020
f9edbfd
change form format
MekWarrior Jul 31, 2020
e6373e7
Merge branch 'html_buildout' of https://github.com/vanvalenlab/deepce…
MekWarrior Jul 31, 2020
3404a88
Override flask-security login templates and add links to navbar. (#35)
willgraf Aug 3, 2020
5493227
experiement with different data entry layouts
MekWarrior Aug 3, 2020
9db6fb0
Merge branch 'html_buildout' of https://github.com/vanvalenlab/deepce…
MekWarrior Aug 3, 2020
c6daa5d
add back in changes lost in merge conflicts
MekWarrior Aug 3, 2020
74a36a1
initialize the mail application
willgraf Aug 3, 2020
2059d51
add all flask-mail configuration settings as environment variables to…
willgraf Aug 3, 2020
6284bbb
add a mailserver container to docker-compose.
willgraf Aug 3, 2020
299964e
enable flask-security settings that use the mail client.
willgraf Aug 3, 2020
cb31b62
Merge branch 'master' into flask-mail
willgraf Oct 2, 2020
6fca8c9
remove outdated routes
willgraf Oct 2, 2020
a9d24d7
set MAIL_TLS to True by default, and MAIL_PORT to 587 for TLS.
willgraf Oct 2, 2020
addf116
Remove docker-compose mailserver (didn't work)
willgraf Oct 2, 2020
dd7b17e
Include default MAIL_USERNAME and MAIL_PASSWORD in docker-compose
willgraf Oct 2, 2020
0f299cd
Updaet domain of default sender.
willgraf Oct 2, 2020
5d7e0e7
turn on email features if MAIL_SERVER is not the default value.
willgraf Oct 2, 2020
1c38f34
remove unwanted changes.
willgraf Oct 2, 2020
9a0915a
pin pytest<6 to fix compatibility with pytest-pep8
willgraf Oct 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove duplicates at wrong level and add partials
MekWarrior committed Jul 29, 2020
commit 0449fbae3853e03319835be032eb05bf3c28903c
10 changes: 6 additions & 4 deletions deepcell_datasets/general/templates/general/index.html
Original file line number Diff line number Diff line change
@@ -6,12 +6,14 @@

<div class="section center-align">
<h5>
Welcome to DeepCell Datasets
Select an experiment to load available samples and metadata
</h5>
<p>
Each sample contains all the relevant information related to dimensions and imaging parameters.
It also contains links to the associated image stack. While an experiment can contain multiple
samples, each sample belongs to only one experiment.
</p>
</div>

</main>
{% endblock %}

{% block extraJs %}
{% endblock %}
File renamed without changes.
File renamed without changes.
26 changes: 13 additions & 13 deletions static/css/materialize.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/css/normalize.css
Original file line number Diff line number Diff line change
@@ -346,4 +346,4 @@ template {

[hidden] {
display: none;
}
}
71 changes: 0 additions & 71 deletions templates/base.html

This file was deleted.

72 changes: 0 additions & 72 deletions templates/index.html

This file was deleted.