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.
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
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
Style 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
Temp commit to switch to new branch ( based on dcd1c38335966c77df02c49f39ef7224b91ed8b3 )
Back up file
Group create form bug fixes:- Remove radio buttons limited/unlimited- Human readable bytes size input
rename astakosgroup_form_demo.html to astakosgroup_form.html
Enforce maximum group participant number checking
remove lorem ipsum, fix wrong join link
Bug fix for group create radios
Display inf in case of unlimited group resource in the admin notification email text.
Fix group creation summary view
Style changes in group list page
Fixes for report pageBypass group list page
Group summary page
Bug fixes
Backend implementation of group creation summary
Fix for selected resources group
Group create summary page static
- Help_text for group create form- Resource_presentation dict
Merge billing
Merged demo
Radio button fixesBug fixes
Merge branch 'future' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py snf-astakos-app/astakos/im/api/spec.py snf-astakos-app/astakos/im/endpoints/quotaholder.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Merge with future branch
Merge branch '0.6.4' into future
Conflicts: snf-astakos-app/astakos/im/synnefo_settings.py
Correct id, name in create_group_demo form
New create group page.Changes in resources page.Style fixes
Resources statistic page
Conflicts: snf-astakos-app/astakos/im/static/im/css/modules.css snf-astakos-app/astakos/im/static/im/js/common.js snf-astakos-app/astakos/im/templates/im/astakosuserquota_list.html snf-astakos-app/astakos/im/views.py
astakos_group_form_demo pageastakos_group_ressources_statistics page
Merge branch 'dev' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
View and management commands for adding/removing user resource quota
Refs: #2793
Anchor to select
Merge branch '0.6.4' into dev
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/views.py
Display resource limit details
Fix group search
Add sorting parameter validation
Change pagination in group list
Fix members sorting in group detail
Reduce database interaction in group_detail
Do now allow owner to leave group: remove link from group search
Minor changes in group list
Add group_detail members table pagination
Bug fixes for pagination and select
Group changes
- Pagination set to 8- Extra fields in sorting select- X to close widjets
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/views.py
Add group tables sorting & decrease interaction with database
Sorting + Pagination bug
enhance mock timeline form and listing
Fix pagination in search group view
- Pagination style change- Extra select for sorting table
Add timeline tab