Merge branch 'dev/add_protocol' into dev/master_merge_protocol (00957db3) · Commits · itminedu / flowspy · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

flowspy
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

00957db3

Commit 00957db3 authored 13 years ago by Leonidas Poulopoulos

Downloads
- Plain Diff

Merge branch 'dev/add_protocol' into dev/master_merge_protocol

parents f874b20f 94fa54a3

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

flowspec/admin.py 1 addition, 0 deletions

flowspec/admin.py
flowspec/fixtures/initial_data.json 22 additions, 0 deletions

flowspec/fixtures/initial_data.json
flowspec/models.py 29 additions, 4 deletions

flowspec/models.py
flowspec/views.py 2 additions, 0 deletions

flowspec/views.py
settings.py.dist 2 additions, 1 deletion

settings.py.dist
templates/apply.html 8 additions, 0 deletions

templates/apply.html
templates/rule_add_mail.txt 3 additions, 0 deletions

templates/rule_add_mail.txt
templates/rule_delete_mail.txt 2 additions, 3 deletions

templates/rule_delete_mail.txt
templates/rule_edit_mail.txt 2 additions, 3 deletions

templates/rule_edit_mail.txt
templates/rule_expiration.txt 2 additions, 3 deletions

templates/rule_expiration.txt
utils/proxy.py 6 additions, 2 deletions

utils/proxy.py

with 79 additions and 16 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