Project creation summary view: uncommitted html file
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into latest-quota
Change sorting
Changing the name from feedback to contact in menu
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/notifications.py snf-astakos-app/astakos/im/urls.py snf-astakos-app/astakos/im/views.py
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
New style for table sorting
Auth providers messages updates
Auth providers fixes
handle is_available_for_{create, add}
Display create prompt only if provider is available for create
Login methods wording
Force login when adding third party auth providers
use proper oauth parameters to force user to login and confirm his thirdparty account every time he adds a new login method
Remember last login method
when multiple login methods are enabled in settings only the primary oneis visible by default in the login page. Keeping last successful loginmethod in a cookie allows us to override that behaviour and improve userexperience for users that login using secondary login methods.
Force secondary login methods display
in third party account assigment to existing account process
Modal box style fix
Google and LinkedIn oauth support
Conflicts: snf-astakos-app/astakos/im/templates/im/auth/local_login_prompt.html
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/management/commands/service-add.py snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/models.py...
Remove definition from project creation notification text
Single model for ProjectApplication & Definition - Membership sync
Remove deprecated template
Additional auth providers messages
New login method templates
Third party providers fixes
- Proper third party user getter. Do not include info in queryset.- Fix signup_url. key param only needed for login
Additional messages in third party registration/login process
Undo local login prompt bug fix
Local login prompt bug fix
CSS selector fix
Proper visibility handling of local login form
force display of local login form after invalid form submissions
Bug fix
- Form visible when there is error in submit
Allow follower application with same deifinition name approvement
Project Notifications
Fix third party signup template
extend from local signup to keep them in sync on template/styles changes
Split profile authentication methods in separate file
Minor fixes
Merge commit
Style fixes
- Grey image- Link "back to login"
Fix sequence of project applications & project search
Progress VII
Progress VI
Progress V
Progress IV
Progress III
Progress II
Progress I
Text fixesStyle fixes
Resource usage new % style
Uniform text in group details/group list
Text changes
Limit usage ratioFix link in how-it-works page
- Update user/project activation status- Fix float bug
Moderation fix
Interactivity in how-it-works page
Conflicts: snf-astakos-app/astakos/im/api/__init__.py snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
Style fixesNew menu
Dynamic third party signup url
Merge branch 'twitterauth' into devel-0.13
Change menu ``Report`` to ``Usage``
Remove forgotten merge mark
Update snf-manage commands in email templates.
Update snf-manage commands in email templates. Fix authentication token renewal.
Conflicts: snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html snf-astakos-app/astakos/im/templates/im/profile.html
Bug fixesStyle improventsAuthorisation methods page
Do not show default groups in project lists
Twitter authentication backend
Remove unused template
Configurable auth providers templates/titles
Extend/Update management commands
Fix group detail template: specify post targets
Enable group owner to modify moderation
Enable group owner to disapprove already approved members
Remove obsolete strip_http from the templates
Validate sorting request parameter in group views
Remove obsolete rcut filter in templates
Remove explicit link to change password view
Conflicts: snf-astakos-app/astakos/im/urls.py snf-astakos-app/astakos/im/views.py
How it works page
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
Restore im/admin_notification.txt
Merge branch '0.6.4' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/views.py
Fixes- Rename group to project in ui- Different pagination for groups search result page- Truncatechars filter
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...
Flush other user sessions during password/token change
Refs: #3007
Style improvements
- New styles for select- new Class ResourcePresentation- Group add form javascript validation
Updated shibboleth workflow (enable user change email before activation)
Refs: #3041
Bug fixes- Custom select- Units etc for group details- General fixes
Add change password link to my account page
Group create- Complete form- Fix data presentation
Refine shibboleth signup mechanism
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Group create form bug fixes ( preliminary effors )
Fix group list view
Mergind two lists into one ( preliminary efforts )
Conflicts: snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.BACKUP.21131.html
Delete
Merge