Merge branch 'master', remote-tracking branch 'origin' into aquarium
Repo refactor and webproject hooks fixes
Merge branch 'master' into packaging
Merge branch 'master' of https://code.grnet.gr/git/astakos
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.
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.
Bump version.
Fix in synnefo specific settings
Add LOGGING_SETUP setting in synnefo default settings
Initial commit for webproject integration
- Add entry points for snf-webproject- Python packaging improvements
Fix okeanos page.
Add file logger.
Drop redundant horizontal menu from pages.
Merge branch 'cloudbar'
Configurable cloudbar settings in base.html
Initial commit of cloudbar static files
enable moderation in SimpleBackend
Refs: #1990
employ new logging mechanism
fix logging
add support for renew in redirect target
propagate next parameter in case of invalid login form
Change logging mechanism.
Refs #2016
Proper cloudbar configuration
Remove duplicate jquery import in base.html
Add top bar to template.
Remove parentheses.
Remove reference to TEST variable.
change word `consumed` in `used`
Resolve.
fix LOGIN_URL setting
Refs: #1997
Hide service description.
change IM_MEDIA_URL to IM_STATIC_URL
Refs: #1993
change settings namespace
fix tab activation
restructure templates
copy pithos queue lib
change api faults
Refs: #1958
Merge branch 'grnetstyles'
fix logout
Feedback submit button label fix
Improved invitations sent styles
- display YES/NO labels/styles in `consumed` column
Display page global messages
Removed debug statement
Apply styles for selected/current profile page
Updated password reset html and styles
Several styles fixes/additions
- minor css fixes- invitations 2 cols layout- locally served html5shim- new form error styles
change email templates
Template changes
- created one column full width base template- applied new styles to logged_out and sign up complete templates
Merge branch 'master' into grnetstyles
Conflicts: astakos/im/context_processors.py astakos/im/templates/account_base.html astakos/im/templates/invitations.html astakos/im/templates/registration/password_change_form.html astakos/im/views.py
Fixed admin base template to use old bootstrap styles
Applied grnet theme for user pages
fix edit profile
remove ACTIVATION_LOGIN_TARGET & SIGNUP_TARGET settings
fix thank you page
render thank you page upon successful in active user creation
Change user object in invitations template.
Remove accepted flag (change to consumed) and invitation login target.
Fix interface details.
fix admin logout
fix logout view
Fix prepare response function.
Set cookie and delete cookie and other minor changes.
Several minor changes
db migration script for adding third party