Merge branch 'mach-task-7544' into devel
Conflicts: lib/hawat/blueprints/reports/__init__.py
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- MANIFEST.in 0 additions, 1 deletionMANIFEST.in
- conf/mentat-hawat-dev.py.conf 5 additions, 5 deletionsconf/mentat-hawat-dev.py.conf
- conf/mentat-hawat.py.conf 5 additions, 5 deletionsconf/mentat-hawat.py.conf
- conf/requirements.pip 2 additions, 0 deletionsconf/requirements.pip
- conf/scripts/sqldb-init.sh 1 addition, 1 deletionconf/scripts/sqldb-init.sh
- doc/sphinx/_doclib/development.rst 1 addition, 1 deletiondoc/sphinx/_doclib/development.rst
- hawat.local.conf 5 additions, 5 deletionshawat.local.conf
- lib/hawat/__init__.py 4 additions, 4 deletionslib/hawat/__init__.py
- lib/hawat/acl.py 9 additions, 9 deletionslib/hawat/acl.py
- lib/hawat/app.py 33 additions, 26 deletionslib/hawat/app.py
- lib/hawat/babel.cfg 0 additions, 1 deletionlib/hawat/babel.cfg
- lib/hawat/base.py 1027 additions, 46 deletionslib/hawat/base.py
- lib/hawat/blueprints/auth/__init__.py 33 additions, 29 deletionslib/hawat/blueprints/auth/__init__.py
- lib/hawat/blueprints/auth/templates/auth/login.html 2 additions, 2 deletionslib/hawat/blueprints/auth/templates/auth/login.html
- lib/hawat/blueprints/auth/templates/auth/register.html 2 additions, 2 deletionslib/hawat/blueprints/auth/templates/auth/register.html
- lib/hawat/blueprints/auth/templates/registration/email_admins.txt 2 additions, 2 deletions...t/blueprints/auth/templates/registration/email_admins.txt
- lib/hawat/blueprints/auth/templates/registration/email_managers.txt 2 additions, 2 deletions...blueprints/auth/templates/registration/email_managers.txt
- lib/hawat/blueprints/auth/templates/registration/email_user.txt 2 additions, 2 deletions...wat/blueprints/auth/templates/registration/email_user.txt
- lib/hawat/blueprints/auth/test/__init__.py 62 additions, 0 deletionslib/hawat/blueprints/auth/test/__init__.py
Loading
Please register or sign in to comment