Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Fixes
- Rename group to project in ui
- Different pagination for groups search result page
- Truncatechars filter

Change resource cyclades.networks group

fix quotaholder imports

Icon for network (create group page)

Check if group member is already approved during approve procedure.

Add maximun participants number reached message.

Style improvements

- New styles for select
- new Class ResourcePresentation
- Group add form javascript validation

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py

Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py

Fixes

Bug fixes
- Custom select
- Units etc for group details
- General fixes

Fix user token creation

Integration with updated quotaholder component

Fix zero length field name in format in python 2.6

Style fixes

bug fix

Add change password link to  my account page

Group create
- Complete form
- Fix data presentation

Adding placeholder to forms

Bug fix

Alter main menu

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 )

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

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 )

Style fixes

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

Isolate astakos messages in separate module

change user-modify command name to conform with the rest patterns

Fix bugs: require_http_methods & send None uplimit incase of inlimited resource

Fix division by zero

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

style fixes

Separate safely service and resource name (in case resource name contains the RESOURCE_SEPARATOR)

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Style fixes

remove lorem ipsum, fix wrong join link

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Style fixes

Change default resource names

More changes in default resource limits

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Bug fix for group create radios

Change default resource limits

Fix user activation

Fix signup

Fix management commands

Display inf in case of unlimited group resource in the admin notification email text.

Fix quota in case of unlimited

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Fix group creation summary view

Style changes in group list page

Fixes for report page
Bypass group list page

Group summary page

Bug fixes

Backend implementation of group creation summary

Fix for selected resources group

Group create summary page static

User create_groups api call in group creation

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

- Help_text for group create form
- Resource_presentation dict

Fix default resource groups

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Merge billing

Merged demo

Radio button fixes
Bug 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
snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py
snf-astakos-app/astakos/im/management/commands/invitation-details.py
snf-astakos-app/astakos/im/management/commands/invitation-show.py
snf-astakos-app/astakos/im/management/commands/user-add.py
snf-astakos-app/astakos/im/management/commands/user-details.py
snf-astakos-app/astakos/im/migrations/0028_auto__add_field_resource_group.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/settings.py
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/synnefo_settings.py
snf-astakos-app/astakos/im/target/shibboleth.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/conf/20-snf-astakos-app-settings.conf

Merge with future branch

Style bug fixes

Merge branch '0.6.4' into future

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

Merge branch '0.6.4' into future

Fix undefined variable

Minor changes (mainly formatting)

Fix undefined variable

Changes in the format

Remove duplicate command

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 page
astakos_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
snf-astakos-app/astakos/im/target/shibboleth.py
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/util.py
snf-astakos-app/astakos/im/views.py
snf-astakos-app/conf/20-snf-astakos-app-settings.conf

Merge remote-tracking branch 'origin' into future

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
snf-astakos-app/astakos/im/management/commands/group_list.py
snf-astakos-app/astakos/im/management/commands/resource-list.py
snf-astakos-app/astakos/im/management/commands/sendactivation.py
snf-astakos-app/astakos/im/management/commands/service-renew-token.py
snf-astakos-app/astakos/im/management/commands/service-token-renew.py
snf-astakos-app/astakos/im/management/commands/service_renew_token.py
snf-astakos-app/astakos/im/management/commands/user-activation-send.py
snf-astakos-app/astakos/im/management/commands/user-modify.py
snf-astakos-app/astakos/im/management/commands/user-send-activation.py

Change setting name

Refs: #2612

Optionally enforce token renewal via settings. Set initial value to True in the forms.

Refs: #2612

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