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 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
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
- Pagination style change- Extra select for sorting table
Display calendar in timeline date fields
View revisions
Also available in: Atom