History | View | Annotate | Download (46.8 kB)
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
New create group page.Changes in resources page.Style fixes
Resources statistic page
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
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 remote-tracking branch 'origin' into future
Conflicts: snf-astakos-app/README snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/static/im/js/forms.js snf-astakos-app/astakos/im/target/redirect.py...
Explicitly allow only POST and GET requests
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
Display resource limit details
Add sorting parameter validation
Change pagination in group list
Add erroneously deleted line
Fix bugs in views
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
Fix group_list
Fix group_list view in case current user is not of any groupor does not participate in any group
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
fetch form in GET (by spapagian)
timeline charging hello world
enhance mock timeline form and listing
Fix pagination in search group view
Add signed_terms_required & login_required decorators in timeline view.
Manipulate Timeline form fields
New timeline tab
Add pagination
Addcredits
Change rename and change quota limit field to bigint
:Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/billing.html snf-astakos-app/astakos/im/templatetags/filters.py snf-astakos-app/astakos/im/views.py
Billing json
Fix transaction management in signup views
Change handle membership wrapper
Alter billing view to accepted another start date instead of today()
Enable group owner to add members
Rollback transaction in case signup failure
Add button show all in group search page
Group owner can update group description & homepage
remove obsolete view
Various presentation fixes
Fix code formatting to conform to the PEP 8 style guide
Bug fixes
- Homepage field appearing in form- Fix for search_group page
Display only enabled groups in group search
Not exact group search
AstakosUser signed_terms property instead of function
Add billing tab
Indermediate page for create group
Progress VIII
remove unused imports & code refinement
fix group join view
send admin notification upon group creation
Progress VII
do not show "No groups found!" message when group search form loads
do not save instance in edit_profile GET if user is already verified
Progress V
Progress IV
Progress III
fix AnonymousUser logout
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
use status specific wrappers for adding messages
named reverse urls
Progress I
Merge branch 'newstyles'
Optionally renew token on password reset
Refs: #2612
call ``send_greeting`` from ``switch_account_to_shibboleth`` instead of ``activate`` view
rewrite ``activate`` view
Send helpdesk notification on account activation
Refs: #2674
Merge branch 'master' into newstyles
log cookie deletion
add logging for additional mail
in signup view, if user is logged in redirect to edit_profile instead of index view
fix unusable password issue
In edit_profile view set is_verified also in GET requests
Fix send feedback view
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
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
New html styles
fix activate view in case of failure
handle AstakosUser model validation error
fix activate in case of dublicate accounts
remove has_signed_terms utility, introduce AstakosUser signed_terms function instead