Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes
Fix redundant whitespace at end of lines
Remove all unecessary whitespace at end of lines.Seehttp://stackoverflow.com/questions/5257553/coloring-white-space-in-git-diffs-output
for a way to have git highlight redundant whitespace automatically.
Add support for users
Fixes #423
Merge branch 'auth-mechanism' of https://code.grnet.gr/git/synnefo into api-current
Code clean up
Merge branch 'master' into auth-mechanism
Conflicts: api/fixtures/api_test_data.json api/tests.py
Rename auth to aai and put all aai related stuff in it
manage.py had trouble running tests from auth (confirmed with[verigak]), and is also a good idea to have all aai stuff inone reusable place ([vkoukis]'s idea)
Make most tests pass
Add missing fixture file
Port tests to the new API
manage.py test api should work now
View revisions
Also available in: Atom