integration with aquarium progress I
Refs: #1824
Merge branch 'master', remote-tracking branch 'origin' into aquarium
Configurable captcha options
Merge branch 'master' of https://code.grnet.gr/git/astakos
fix README
not send admin notification email if ASTAKOS_DEFAULT_ADMIN_EMAIL is not set
Refs: #2116
fix README settings
Include additional settings in sample .conf file
updated Changelog for v0.3.1
Updated css styles
- removed autocomplete for non-login forms- proper recaptcha placement/styles
Fallback on HTTP_X_REAL_IP meta to retrieve client ip
thats where nginx sets the client ip
Updated default snf-common conf file
Updated required snf-common version
Cloudbar IE fix
fixed cloudbar to display properly on pithos app with IE
Convert cloudbar api responses to JSONP
if callback parameter is set on url use it and set the appropriateresponse mimetype.
Cloudbar fix
proper callback parameter
notify administrator by email when an inactive account is created
Ref: #2116
add captcha field in local user creation form
Ref: #2117
Fix cloudbar.
add cloudbar settings in README
Refs: #2102
Remove admin guide.
Fix README.
Merge branch 'cloudbar', remote-tracking branch 'origin'
fix activateuser command
Document used settings
Refs: #2103
use Astakos's external URL to prepend all links
Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar
Clear out management command descriptions.
Proper README.
remove hardcoded urls to the astakos api services from the cloudar
change cloudbar to contain dynamic links
Include images in package.
fix bugs
Fix package.
Fix loggers webproject entry point
Fixed im static files configuration
Add astakos/urls.py
Default settings configuration file
Merge branch 'master' into packaging
Repo refactor and webproject hooks fixes
Conflicts: astakos/im/util.py
Use option for secure cookie.
Refs #2069
secure cookies
Refs: #2069
Merge branch 'packaging'
Bump version.
fix reset password email template
fix reset password link in email template
add welcome_email template
Fix reference to external js.
Bring top elements a little bit closer.
Updated styles.css
fix functions.py
Update styles and minor html fixes
- Update styles.less and styles.css- Add checkbox styles and jquery plugin- Fix google font import (use https)
remove sites
No parameter in email addresses.
Bring back admin functions.
Remove invite script.
Merge branch 'admin'
Remove custom web admin.
Refs #1996
Move common code to _common.py
Delete cookie with path and domain.
Fixes #2080
Hide service descriptions.
Remove obsolete import.
Remove site fixture.
Add inviteuser command
Send an email to user when activating
enable user to renew token
Refs: #2047
Use the correct year in copyright clauses
Merge branch 'master' of https://code.grnet.gr/git/astakos into admin
Enable cloudbar context processor
Add auth and sessions contrib apps for synnefo hooks
remove site framework, introduce invite function
Add admin management commands
introduce ``activate`` function
Use relative paths in cloudbar.
Fix in synnefo specific settings
Add LOGGING_SETUP setting in synnefo default settings
Remove console_script entry point
Initial commit for webproject integration
- Add entry points for snf-webproject- Python packaging improvements
Fix okeanos page.
Add file logger.