Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Projekt+Hack-n-Fun
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Model experiments

Snippets Groups Projects

88abc61e

Commit 88abc61e authored 3 years ago by Nik | Klampfradler

Downloads
- Plain Diff

Merge branch '17-info-mailing' into 'master'

Resolve "Info mailing"

Closes #17

See merge request Teckids/hacknfun/AlekSIS-App-Paweljong!9

parents 48d10ec7 12a79e75

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.rst 5 additions, 0 deletions

CHANGELOG.rst
aleksis/apps/paweljong/forms.py 21 additions, 1 deletion

aleksis/apps/paweljong/forms.py
aleksis/apps/paweljong/menus.py 11 additions, 0 deletions

aleksis/apps/paweljong/menus.py
aleksis/apps/paweljong/migrations/0013_info_mailings.py 50 additions, 0 deletions

aleksis/apps/paweljong/migrations/0013_info_mailings.py
aleksis/apps/paweljong/models.py 77 additions, 2 deletions

aleksis/apps/paweljong/models.py
aleksis/apps/paweljong/rules.py 8 additions, 0 deletions

aleksis/apps/paweljong/rules.py
aleksis/apps/paweljong/tables.py 20 additions, 0 deletions

aleksis/apps/paweljong/tables.py
aleksis/apps/paweljong/tasks.py 11 additions, 0 deletions

aleksis/apps/paweljong/tasks.py
aleksis/apps/paweljong/templates/paweljong/info_mailing/create.html 19 additions, 0 deletions

...ps/paweljong/templates/paweljong/info_mailing/create.html
aleksis/apps/paweljong/templates/paweljong/info_mailing/edit.html 18 additions, 0 deletions

...apps/paweljong/templates/paweljong/info_mailing/edit.html
aleksis/apps/paweljong/templates/paweljong/info_mailing/list.html 14 additions, 0 deletions

...apps/paweljong/templates/paweljong/info_mailing/list.html
aleksis/apps/paweljong/templates/templated_email/info_mailing.email 3 additions, 0 deletions

...ps/paweljong/templates/templated_email/info_mailing.email
aleksis/apps/paweljong/urls.py 20 additions, 0 deletions

aleksis/apps/paweljong/urls.py
aleksis/apps/paweljong/views.py 52 additions, 2 deletions

aleksis/apps/paweljong/views.py

with 329 additions and 5 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