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.

Sign up for GitHub

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

Jump to bottom

Rest email notification #2015

Merged
merged 36 commits into from
Oct 3, 2018
Merged

Rest email notification #2015

merged 36 commits into from
Oct 3, 2018

Conversation

noliveleger
Copy link
Contributor

@noliveleger noliveleger commented Sep 28, 2018 •
edited
Loading

Based on #1864.

Adds 2 features:

  • Email notification
  • Allow admins to block (or not) unsecured remote endpoints (with Constance)

There are FE and BE changes.

noliveleger and others added 30 commits August 24, 2018 13:16
@noliveleger
Added validation for unsecured endpoints
93804fd
@noliveleger
Celery upgrade to 4.x
686b289
@noliveleger
Fixed hook serialization bug on first attempt with Celery 4 - retry a…
7fb1940 
…ll still fails
@noliveleger
Added django celery beat for cronjob in admin
989032d
@noliveleger
Updated requirements.txt for django-celery-beat
039fcc9
@magicznyleszek
add checkbox for receiving emails about errors
ec07af5
@magicznyleszek
add input for selecting fields
091d29c
@magicznyleszek
Merge branch 'REST-UI' into rest-services-further-work
4218cd5
@magicznyleszek
remove unneeded modifiers
e5d7d5e
@noliveleger
Bug fixes for Celery 4.x and draft code to report e-mailing
4d1a868
@noliveleger
Model changed and migrations for email notification
2ede23d
@noliveleger
Merge branch 'REST-UI' into rest_new_features
b832321
@noliveleger
Merge branch 'master' into rest_new_features
cc94bef
@magicznyleszek
Merge branch 'REST-UI' into rest_new_features
22f8411
@magicznyleszek
Merge branch 'rest-services-further-work' into rest_new_features
2b3aa13
@noliveleger
Email failures reports with HTML and plaintext templates
bf3facf
@noliveleger
Merge branch 'rest_new_features' of github.com:kobotoolbox/kpi into r…
c5e63f8 
…est_new_features
@noliveleger
Added whole folder jsapp/fonts to .gitignore
b0168bf
@noliveleger
Changed some texts in email templates
74f445a
@noliveleger
Merge branch 'master' into rest_new_features
a72acc9
@noliveleger
Merge REST-UI branch into rest_new_features
720ee36
@noliveleger
Added a unittest for posting duplicate submission
4f817ea
@noliveleger
Added more unittests
c9c2942
@magicznyleszek
use final property name
6a1cdc7
@noliveleger
Fixed bad variable name for Celery 4
616fa0d
@noliveleger
Merge REST-UI branch into rest_email_notification
36cfd64
@noliveleger
Fixed permissions for non-owner and anonymous users
66a55b1
@noliveleger
Updated comments
18cb79d
@noliveleger
Merge branch 'REST-UI' into rest_email_notification
27306c3
@noliveleger
Fixed bad merge with REST-UI
3761419
@noliveleger noliveleger changed the base branch from master to REST-UI September 28, 2018 17:05
This was referenced Sep 28, 2018
Merged
Closed
jnm
jnm requested changes Oct 3, 2018
View reviewed changes
Copy link
Member

@jnm jnm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good; I just noted some minor changes. Thanks 👍

docker/run_celery_sync_kobocat_xforms.bash Outdated Show resolved Hide resolved
jsapp/js/components/RESTServices/RESTServicesForm.es6 Outdated Show resolved Hide resolved
kobo/apps/hook/tasks.py Outdated Show resolved Hide resolved
kobo/apps/hook/tasks.py Outdated Show resolved Hide resolved
kobo/apps/hook/tasks.py Outdated Show resolved Hide resolved
kobo/apps/hook/tests/test_api_hook.py Outdated Show resolved Hide resolved
kobo/apps/hook/tests/test_api_hook.py Outdated Show resolved Hide resolved
kobo/apps/hook/tests/test_api_hook.py Outdated Show resolved Hide resolved
kpi/permissions.py Outdated Show resolved Hide resolved
kpi/permissions.py Show resolved Hide resolved
jnm
jnm reviewed Oct 3, 2018
View reviewed changes
kobo/apps/hook/tasks.py
msg = EmailMultiAlternatives(translation.ugettext("Hooks failures report"), text_content,
"support@kobotoolbox.org",
msg = EmailMultiAlternatives(translation.ugettext("REST Services Failure Report"), text_content,
constance.config.SUPPORT_EMAIL,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch, @noliveleger 👍

@jnm jnm merged commit 789219d into REST-UI Oct 3, 2018
@jnm jnm mentioned this pull request Oct 9, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnm jnm jnm approved these changes

@pmusaraj pmusaraj Awaiting requested review from pmusaraj

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@noliveleger @jnm @magicznyleszek