History | View | Annotate | Download (31.6 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
Case insensitive email checks
#2883
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
- New styles for select- new Class ResourcePresentation- Group add form javascript validation
Enable inactive shibboleth users to change email
Refs: #3041
Updated shibboleth workflow (enable user change email before activation)
Bug fixes- Custom select- Units etc for group details- General fixes
Special handling for login failure messages
Customize third party signup form fields
Adding placeholder to forms
Refine shibboleth signup mechanism
Group create form bug fixes ( preliminary effors )
Back up file
Group create form bug fixes:- Remove radio buttons limited/unlimited- Human readable bytes size input
Separate safely service and resource name (in case resource name contains the RESOURCE_SEPARATOR)
Fix group creation summary view
Bug fixes
Backend implementation of group creation summary
User create_groups api call in group creation
Merged demo
Rewrite ExtendedSetPasswordForm & ExtendedPasswordChangeForm save methods
Refs: #2612
Change setting name
Optionally enforce token renewal via settings. Set initial value to True in the forms.
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
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
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
commit dev84 changes
Add sorting parameter validation
Bug fixes for pagination and select
Merge remote-tracking branch 'origin' into dev
Conflicts: snf-astakos-app/Changelog snf-astakos-app/README snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js...
Group changes
- Pagination set to 8- Extra fields in sorting select- X to close widjets
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/views.py
merge with 0.6.4
Add group tables sorting & decrease interaction with database
enhance timeline form, traffic charging support
enhance mock timeline form and listing
Change Timeline date field format
Manipulate Timeline form fields
New timeline tab
Enable group owner to add members
Style changes in group_edit and show_all_groups
Group owner can update group description & homepage
merge with origin 0.6.4
Fix code formatting to conform to the PEP 8 style guide
- Homepage field appearing in form- Fix for search_group page
Configurable subjects for all emails send by astakos
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts: snf-astakos-app/astakos/im/forms.py
Minor fixes
- Help text for modearation_enabled field- Terms of use=> Terms of service
Add group homepage field
use django ADMIN & SERVER_EMAIL settings instead of DEFAULT_ADMIN_EMAIL & DEFAULT_FROM_EMAIL
Style changes in create group form
remove unused imports & code refinement
fix group join view
Progress VII
if moderation is not enabled approve immediately user membership
Progress IV
Progress II
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
fix astakosgroup creation form
Progress I
Merge branch 'master' of https://code.grnet.gr/git/astakos
Fix LoginForm clean incase of login failure
Bug #2535
Remove print statement
Merge branch 'newstyles'
Optionally renew token on password reset
Preserve local password for shibboleth users
register email returned by shibboleth (either as a primary or additional email)
Refs: #2416
Log main astakos functions
Refs: #2448
Provide email change mechanism
Refs: #2363
delete obsolete files
shibboleth signup form throughs validation error in case of an inactive account with conflicting email
password reset breaks in django 1.2.3
keyword argument request is not passed in PasswordResetForm.save(), use BASEURL setting instead of building it from the request
remove ApprovalTermsWidget
do not show inviter in invitation signup forms
remove has_signed_terms utility, introduce AstakosUser signed_terms function instead
fix third-party signup form email validation sequence
ask acknowledgment for switching local account to shibboleth one
Ratelimit login attempts
Refs: #2267
Prevent non local users (not having usable password) from reseting their password.
Refs: #2167
support shibboleth with invitations & enable modifyuser command to remove a user group
add support for groups
change authentication methods: progress I
do not show approval terms checkbox if there are no terms
Refs: #2019
configurable recaptcha disable
Refs: #2260
Force user to accept service terms
more changes in email templates
fix email templates
change email templates
Automatically activate users whose email matches specific email patterns defined in settings (ASTAKOS_RE_USER_EMAIL_PATTERNS) & minor other fixes: