astakos: Update activation email content
astakos: Clean up user-list filter options
removed deprecated options `-p` and `-n`. Admins should use`--pending-moderation` and `--pending-verification` instead.
astakos: Allow admin to verify user from command line
using the new option `--verify` added in `user-modify` command
Merge branch 'feature-branding' into develop
Conflicts: snf-astakos-app/astakos/im/templates/im/account_pending_moderation_notification.txt snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt snf-astakos-app/astakos/im/views.py
Catch QuotaLimit exception when reconciling resources
This can happen, if the actual usage registered by a service exceedsthe quota limit.Advise the user to try the --force option.
astakos: Let qh errors through when issuing commission
When registering pending apps, catch only NoCapacityError. No otherQuotaholderError is expected and should not be treated here.
astakos: Do not show obsolete user settings
Also fix printing user quota.
quotaholder: Ignore force option when releasing
Since negative usage makes no sense, we always check this lowerboundary when issuing a commission.
astakos: Force query eval when used in __in filter
Related to commit aee9a38
Also fix call of qh_sync_users in migration script.
astakos: Allow submitting application with no resources
astakos: check that request.user is a 'User'
Update astakos 'get_menu' API method, to check if request.user is aninstance of django User model. This view function called by astakoscontext processor. However, if astakos and helpdesk are installedtogether, the request.user will not hold an AnonymousUser, but a...
astakos: Update tests
Enforce Group entries flush. As a fix to strange errors raised while runningtests using sqlite database. The driver doesn't seem to be able to properlycleanup related database entries, a procedure that takes place after eachexecution of a TransactionTestCase test.
astakos: Typo fix
astakos: Fix provider_login_url template tag
Synnefo branding: Documentation correction & minor fixes
Merge branch 'develop' into feature-astakos-userflow
astakos: Adapt tests to 2.6-style unittest
Define assertGreater, assertIn, assertRaises in snf_django.utils.testing
common: Disable proxy in tests
Do not follow redirections in im tests.
astakos: User activation flow improvements
Major refactoring on user email verification/activation process---------------------------------------------------------------Activation logic moved from dispersed code in functions/view modules toActivationBackend methods. All user activation handling code in astakos views...
- In sync with new AstakosUser model- Remove nested settings wrappers to slightly increase tests performance
astakos: Remove deprecated AstakosUser fields
astakos: Avoid using dicts as default arguments
astakos: Remove obsolete code
Remove project_tests.py, empty package im.endpoints and fixtures
astakos: Remove membership policy settings
Available join and leave policies are internally defined and shouldnot be changed by settings. Move policy descriptions to presentation.py.
Do not convert to string the lookup key in templatetags/filters.py
astakos: Remove obsolete keyword argument ctx
astakos: Improve quota syncing
- Split code that lists and syncs quotas - Merge the latter with qh_sync_users - Move qh_sync_projects in quotas.py; sync only active members - Add missing select for update in project suspend - Clean up quotas.py
astakos: Remove two options from resource-import
--service: We do not support automatic importing of resources--conf: Use resource-modify to configure resource limit
Use custom method for joining urls
Implement 'join_urls' method for joining a base URL with a path,without worrying about redundant or missing "/". Do not use'urlparse.urljoin', since it has different semantics.
astakos: keep top level api urls for this version
astakos: change authenticate api call
``/astakos/api/authenticate`` calldoes not include any more resource usage in the reply.(``usage`` request parameter has become obsolete)The services in order to get the resource usage should call``/astakos/api/quotas`` instead.
astakos: Rename astakos-quota command to quota
Also replace `quotas' with `quota' in strings and command line options.
astakos: Tests for quota API calls
astakos: Return empty dict when no user quotas found
astakos: Return resource object upon creation
astakos: Indent json output of resource export
branding: correct snf-branding-app dependencies
Merge branch 'develop' into feature-branding
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/landing.html snf-astakos-app/astakos/im/views.py...
Synnefo branding: Remove greek text & verbal fixes
Emails sent to Astakos Users do not contain greek translations any more.Minor verbal corrections are made and title attribute are added to logoslinks.
astakos: Fix call to util function send_feedback
quotaholder: Unify included data in overLimit errors
Replace `available' with `usage' and `limit' in NoQuantityErrorto make it similar to NoCapacityError.
astakos: Remove command user-set-initial-quota
To change base quota for a specified user: snf-manage user-modify user --set-base-quota resource limit
To import base quota in batch from a file: snf-manage astakos-quota --import-base-quota filename
Rename `initial' to `base quota' in command output....
astakos: remove obsolete code
astakos: update commands in README
astakos: List quotas in user-show with `--quotas'
Refs #3530
Use the same utility function as astakos-quota. Update the latterto a SynnefoCommand.
astakos: Use DateTimeField for enhanced precision
Refs #3717
Replace instances of DateField in ProjectMembership andProjectMembershipHistory.
Revert "astakos: Fix bug in getting membership"
This reverts commit 7ce770be9fd9668fff4088eff2421cbeb0cc311e.
Update astakos tests to use membership id.
astakos: Remove an obsolete function
astakos: include resource presentation info in authenticate response
If option parameter ``usage`` is passed then the response shouldcontain also the resource presentation information(as it used to be in the past)
astakos: remove astakos.im.api module
Replace all AstakosCallpoint references
astakos: remove user argument from the api methods
User request.user field (set by user_for_token decorator)
astakos: WIP move all api calls under ``/astakos/api``
Refs: #3340
astakos: Change user_for_token decorator
user_for_token after successful user authenticationsets the request user attributeThe wrapped methods no more need the ``user`` argument:they can get the token holder by the request object
astakos: rename api utility methods
astakos: fix user api utility calls
fix typo
astakos: Fix one test
Fix race condition in one of Astakos tests.
astakos: Various fixes to tests
Do not user 'assertItemsEqual' method of unittest is only supported inpython 2.7.
Also, some arguments have been renamed.
astakos: Fix bug in getting membership
Search based on 'person__id' and not 'id'.
Further improvents to branding settings
astakos: Remove deprecated Project methods
add_member, remove_member were not used.
astakos: Visually separate apps in project-show
Synnefo branding: settings improvements
astakos: Handle prompt for additional login methods
astakos: Exclude non existing services form Service.catalog
Always return services that exist in database. If a known service existsuse the predefined presentation data as base dict upon which we build upthe returned info by merging the data stored in service model and the...
astakos: Proper string type check
using basestring also handles unicode objects
astakos: Control project members by membership id
astakos: Add reason for all actions on applications
For cancel and dismiss, it is for now just a placeholder.
astakos: Cleanup some project methods
astakos: Make submit_application arguments explicit
astakos: Remove unneeded import of a constant
astakos: Cleanup input of submit_application
Form passes only a tuple (name, limit) for each selected resource,omitting presentational data.
astakos: Handle pair of exceptions properly
astakos: Remove unused project_error_view
Merge branch 'tmp-allow-in-projects' into feature-quotas
astakos: Resources metadata improvements
- Allow admin to overwrite default resources presentation data using ASTAKOS_RESROUCES_META setting. dict_merge is used to accomodate admin from declaring all available metadata parameters.- Enforce allow_in_projects resource policy in project application...
Synnefo branding images & retina.js
quotaholder: Allow resolving empty commissions
When resolving a pending commission, handle the case where the commissionhas been issued with no provisions.
Merge branch 'develop' into feature-quotas
astakos: Control exposing resources in projects
Add attribute `allow_in_projects' in Resource model (True by default).Set this flag for astakos.pending_app to False in the descriptionof astakos resources.
astakos: Migrate user settings for pendings_app limit
Provide console script astakos-migrate-0.14.Also update related upgrade notes.
astakos: Reconcile resources
Sync number of pending applications to quotaholder.
astakos: accept commission immediately after issue
Unify these operations when registering a pending application,in order to make sure no commission can be left pending.
quotaholder: Add migrations
Migration 0001 should be faked on an existing database.Migration 0002 adds new fields.Migration 0003 populates the new fields based on the old ones.Migration 0004 deletes unneeded fields and tables.
Merge remote-tracking branch 'origin/develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/templates/im/footer.html snf-cyclades-app/setup.py
Revert quotaholder's name to quotaholder_app
In order to facilitate migrations.
quotaholder: Rename counters to usage_min, usage_max
quotaholder: Explicitly set commission's issue_time
Avoid function call as a default value in model.
quotaholder: Impose non-null commission name
Default to empty string
astakos: remove unwanted logging
astakos: Fix twitter access token request failure
The oauth_verifier received from the executed callback has to be passedto the access_token request (it is no more optional)https://dev.twitter.com/discussions/16443#comment-36666
Updated twitter oath service urls
astakos: Migrate service and resource names
- Rename 'pithos+' to 'pithos'- Prepend resource names with 'service_name.'
Merge branch 'feature-change-astakos-commands' into feature-quotas
Conflicts: snf-astakos-app/astakos/im/management/commands/resource-list.py snf-astakos-app/astakos/im/management/commands/service-list.py snf-astakos-app/astakos/im/management/commands/service-modify.py...
astakos: Set and return commission names in API calls
Support issue_commission's `name' parameter for an optional descriptionof the commission. Include this field in the dict returned byget_commission.
Change astakosclient accordingly.
Conflicts: astakosclient/astakosclient/__init__.py astakosclient/astakosclient/errors.py astakosclient/astakosclient/tests.py docs/index.rst
astakos: Separate importing resources from setting limits
`snf-manage resource-import' does not provide a way to change thedefault base quota any more. When importing a resource for the firsttime, it sets the limit to zero.
Use `snf-manage resource-modify' to change limits. It supports both...
astakos: Correct qh call to auto accept commissions
quotaholder: Delete unused helper functions
quotaholder: Remove unused Holding flags
quotaholder: Remove default values in required args
Also remove unused `context' argument and replace empty list defaultvalues with None.
astakos: Further validate input in quota API calls