History | View | Annotate | Download (1.4 kB)
merge with origin 0.6.4
Add submenu
Merge remote-tracking branch 'origin/newstyles' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/invitations.html snf-astakos-app/astakos/im/templates/im/login_base.html snf-astakos-app/astakos/im/templates/im/profile.html snf-astakos-app/astakos/im/views.py
named reverse urls
Style fixes
Merge branch 'master' into newstyles
Conflicts: snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/templates/im/login_base.html
Improved user notifications
additional settings to set messages that get displayed on differentim pages (signin, signup, profile pages).
New html styles
merge with master
Repo refactor and webproject hooks fixes