History | View | Annotate | Download (3.7 kB)
Merge branch 'devel-0.13' into multipleauthmethods
Conflicts: snf-astakos-app/astakos/im/context_processors.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/models.py snf-astakos-app/astakos/im/target/local.py snf-astakos-app/astakos/im/target/shibboleth.py...
Allow multiple login methods per account
Merge remote-tracking branch 'origin/0.12' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/activation_backends.py snf-astakos-app/astakos/im/api/admin.py snf-astakos-app/astakos/im/auth_backends.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Merged demo
Merge branch 'dev' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
merge with origin 0.6.4
Fix code formatting to conform to the PEP 8 style guide
Add submenu
remove unused imports & code refinement
Progress VII
move get_menu and get_service out of api/admin
Page notification messages improvements
- New template tag {% display_messages %} which handles messages display, both for django.contrib.messages and ASTAKOS_*_MESSAGES.- Apply messages block class from python code (instead of js).- Changed format of ASTAKOS_*_MESSAGES to list of tuples, to allow...
User notifications context processor fix
Fix user notification display
also improved styling of "notice" message types
Improved user notifications
additional settings to set messages that get displayed on differentim pages (signin, signup, profile pages).
Provide an API call for the service clients to send user feedback
exception handling in get_menu
ask acknowledgment for switching local account to shibboleth one
merge with master
Force user to accept service terms
Refs: #2019
Improve get_menu view
Allow enabling/disabling some of the menus.Changed some of the titles.
Removed unused context processor
fix internal astakos menu & minor other changes:
use Astakos's external URL to prepend all links
Refs: #2102
remove hardcoded urls to the astakos api services from the cloudar
Repo refactor and webproject hooks fixes