- Help_text for group create form- Resource_presentation dict
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Merge billing
Merged demo
Radio button fixesBug fixes
Set additional default resource information (description, unit)
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
Style bug fixes
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
Resolve conflict after merge
Fix undefined variable
Minor changes (mainly formatting)
Changes in the format
Remove duplicate command
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 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...
Conflicts: snf-astakos-app/astakos/im/management/commands/group-list.py snf-astakos-app/astakos/im/management/commands/group-permissions-add.py snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py...
Change setting name
Refs: #2612
Optionally enforce token renewal via settings. Set initial value to True in the forms.
Remove obsolete import
Explicitly allow only POST and GET requests
Handle AttributeError in case of other than GET or POST method
Rename user-update mgmt command to user-modify
Change saved emails to lowercase
Refs: #2883
Turn emails to case-insensitive.
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
Rename management commands
Set obsolete user and group limit field nullable
Anchor to select
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
Fix group search
Catch EmptyPage exception in paginate empty tag
Add sorting parameter validation
Change pagination in group list
Fix members sorting in group detail
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
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
Rename Astakos management commands for uniformity
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
merge with 0.6.4
Add group tables sorting & decrease interaction with database
Sorting + Pagination bug
Fix migration integrity error
handle limit conditions in timeline charging
enhance timeline form, traffic charging support
fetch form in GET (by spapagian)
timeline charging hello world
enhance mock timeline form and listing
Fix pagination in search group view
Change resource representation
- Pagination style change- Extra select for sorting table
Add signed_terms_required & login_required decorators in timeline view.
Change Timeline date field format
Manipulate Timeline form fields
Remove email validation
Fix migration 0023. Supply limit default value.
Display calendar in timeline date fields
Add timeline tab
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
Alter limit column type to bigint
Fix transaction management in signup views
Change handle membership wrapper
Alter billing view to accepted another start date instead of today()
Custom template tag for months since a specific date
Register resources in quota holder
Align actions in table (groups)