remove merge trash
Merge branch 'dev' of https://github.com/grnet/flowspy into dev
Conflicts: ChangeLog _version.py doc/index.md flowspec/models.py flowspec/views.py flowspy/settings.py.dist
code cleanup, signals
generate the rule name in junos
Switch to GPLv3
set up django rest framework
Fix issue with Greek peer name
Switch to longerusername patching
Introduce optional username slugif-ication
Patch user model to include user peer in unicode
Enhancements to json routes export
Include timeout handling in tasks
Switch peer related messages display to peer tag
Minor updates plus dashboard view
Fix import error
Alignment of application with Django 1.4
Update initial data with fragment types
Add port checks plus a minor IP validation scheme
Add fragment type in views. Minor wording changes
Add fragment type in form clean
Add fragment type in RouteForm clean method. Not used yet but itcould be used in future checks for fragment type clashing
Add fragment type in admin
Add fragment type model
Fixed encoding statements
Minor change in the user activation procedure
Added copyright info plus updated the README file
Added alternate view for Helpdesk
Added view for Helpdesk with an "overview" perms attribute. This closes #2063,closes #2046, closes #1898.
Patch that fixes multiple mail atributes returned by shib
New layout and UI in place
Changed the user registration proccess. Admins now validate institution
Added an attribute map to settings. Eases the parsing of Headers sent back by Shibboleth
Brought back flatpages. Templates refinement
More translation fixes plus a cleanup of error.html file
Aligned branch internationalization with latest changes in master
Added all objects during form cleaning for same rules
Merged all email files into one to make it easier to manage. Changed code accordingly
Addressed issue where rule with ERROR status kept on being checked. Closes #2322
Added a moving dot gif to response to indicate ongoing activity
Prevented a possible tool abuse where the user could alter the applier's id
Refined administrator privileges and actions on users' rules
Superuser can create and edit rules on behalf of other peers. Added smart edit
Superuser can interact with all networks from all peers
Bug fixes related to Shib auth
Moved flatpages to templates
Added more translations...
Added more translations and translation tags
User monkeypatching (longer username) now works for admin as well
Fixed bug with protected networks form cleaning
Added a protocol check mechanism to form cleaning
DB migration to protocol addition
Merge branch 'dev/add_protocol' into dev/master_merge_protocol
Results of convert_to_south for flowspec. Initial migration
Added a protocol field restriction for plain users
Added protocol to match conditions
Prevented a bug that would cause the rule application to throw exception
Turned expiration notification cron job into celery job
Added FQDN resolving in mail notification templates to denote the host that an action originated
Wording fix in form Exceptions
Added source address to required fields
Altered tech_c mail fetch in views
Replaced simplejson imports with json
Removed utils/beanstalkc as it is now a deb package
Fixed minor issue with rule owner on removal
Another admin file cleanup. Moved user profile into new file under accounts
Admin files cleanup and reordering
Replaced sql init files with fixtures
Moved peer lookup and user profile creation into custom user_login function
Fixed issue with missing mail address list from abuse notification
Altered user pending activation message
Added custom admin actions to User model
Added a dict element to denote missing shib attributes
Added administrator's and tech-c notification mechanism upon new user creation
Replaced mailing mechanism with custom mail function to include bcc addresses
Turned announcement into function. Added ignore result to speed up tasks
Added peer plus techc into admin interface
Minor techc_mail retrieval function reformatting
Added INACTIVE in excluded from expiration
Error page fixes and additions
Minor fixes. Added expiration date to admin interface. Distinguish between add and edit in admin. Different handling
Moved user update info into middleware
Minor issue handling with invalid html escaping
Better wording. Replaced 'route' with rule for console messages
Minor wording fixes
Expiration mechanism and messages refinement
Added details to alert mails
Added protected networks with validation and admins alert
Fixed a bug with subnetting that could cause conflicts to Junipers. Closes #1805
Fixed a bug where rate limiting values were not checked against the lowest value. Closes #1804
Restricted non-admin user choices in then field
Added IP logging in mails and logs
Implemented admin add/edit functionality. Closes #1795
Code cleanup in views
Implemented NOC, Helpdesk and tech-c notification via mail upon rule changes. Closes #1794
Fixed file logging mechanism bug. Added prefix_length restriction
Added file logging. Closes #1796
This commit refs #1793. If no feedback is received, issue will close
Removed accept from then action bootstrap sql script
Code cleanup. New implementation of long polling timeout. Done by server. Client has a backup mechanism to reconciliate failed
Fixed an expiration date issue in templates