root [Tue, 21 Feb 2012 14:15:17 +0000 (16:15 +0200)]
Bring top elements a little bit closer.
Kostas Papadimitriou [Tue, 21 Feb 2012 14:08:46 +0000 (16:08 +0200)]
Updated styles.css
Sofia Papagiannaki [Tue, 21 Feb 2012 14:05:45 +0000 (16:05 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Tue, 21 Feb 2012 14:05:30 +0000 (16:05 +0200)]
fix functions.py
Kostas Papadimitriou [Tue, 21 Feb 2012 13:56:25 +0000 (15:56 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Kostas Papadimitriou [Tue, 21 Feb 2012 13:55:04 +0000 (15:55 +0200)]
Update styles and minor html fixes
- Update styles.less and styles.css
- Add checkbox styles and jquery plugin
- Fix google font import (use https)
Sofia Papagiannaki [Tue, 21 Feb 2012 13:52:24 +0000 (15:52 +0200)]
remove sites
Antony Chazapis [Tue, 21 Feb 2012 13:48:57 +0000 (15:48 +0200)]
No parameter in email addresses.
Antony Chazapis [Tue, 21 Feb 2012 13:35:38 +0000 (15:35 +0200)]
Bring back admin functions.
Antony Chazapis [Tue, 21 Feb 2012 13:25:57 +0000 (15:25 +0200)]
Remove invite script.
Antony Chazapis [Tue, 21 Feb 2012 13:17:44 +0000 (15:17 +0200)]
Merge branch 'admin'
Antony Chazapis [Tue, 21 Feb 2012 13:16:44 +0000 (15:16 +0200)]
Remove custom web admin.
Refs #1996
Giorgos Verigakis [Tue, 21 Feb 2012 13:15:06 +0000 (15:15 +0200)]
Move common code to _common.py
Antony Chazapis [Tue, 21 Feb 2012 13:06:51 +0000 (15:06 +0200)]
Delete cookie with path and domain.
Fixes #2080
Antony Chazapis [Tue, 21 Feb 2012 13:05:16 +0000 (15:05 +0200)]
Hide service descriptions.
Antony Chazapis [Tue, 21 Feb 2012 13:04:50 +0000 (15:04 +0200)]
Remove obsolete import.
Antony Chazapis [Tue, 21 Feb 2012 12:51:56 +0000 (14:51 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Antony Chazapis [Tue, 21 Feb 2012 12:51:32 +0000 (14:51 +0200)]
Remove site fixture.
Giorgos Verigakis [Tue, 21 Feb 2012 12:50:06 +0000 (14:50 +0200)]
Add inviteuser command
Giorgos Verigakis [Tue, 21 Feb 2012 12:49:17 +0000 (14:49 +0200)]
Send an email to user when activating
Sofia Papagiannaki [Tue, 21 Feb 2012 12:08:50 +0000 (14:08 +0200)]
enable user to renew token
Refs: #2047
Giorgos Verigakis [Tue, 21 Feb 2012 11:43:55 +0000 (13:43 +0200)]
Use the correct year in copyright clauses
Giorgos Verigakis [Tue, 21 Feb 2012 11:38:14 +0000 (13:38 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos into admin
Sofia Papagiannaki [Mon, 20 Feb 2012 14:08:51 +0000 (16:08 +0200)]
remove site framework, introduce invite function
Giorgos Verigakis [Fri, 17 Feb 2012 16:33:37 +0000 (18:33 +0200)]
Add admin management commands
Added the following commands:
* activate user
* create user
* list invitations
* list users
* modify user
* show invitation
* show user
Sofia Papagiannaki [Fri, 17 Feb 2012 14:20:12 +0000 (16:20 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Fri, 17 Feb 2012 14:19:49 +0000 (16:19 +0200)]
introduce ``activate`` function
root [Fri, 17 Feb 2012 14:02:37 +0000 (16:02 +0200)]
Use relative paths in cloudbar.
Antony Chazapis [Wed, 15 Feb 2012 12:25:17 +0000 (14:25 +0200)]
Bump version.
root [Tue, 14 Feb 2012 13:48:35 +0000 (15:48 +0200)]
Fix okeanos page.
root [Tue, 14 Feb 2012 13:18:16 +0000 (15:18 +0200)]
Add file logger.
Antony Chazapis [Tue, 14 Feb 2012 11:50:16 +0000 (13:50 +0200)]
Drop redundant horizontal menu from pages.
Antony Chazapis [Tue, 14 Feb 2012 11:16:55 +0000 (13:16 +0200)]
Merge branch 'cloudbar'
Antony Chazapis [Tue, 14 Feb 2012 11:12:18 +0000 (13:12 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Kostas Papadimitriou [Mon, 13 Feb 2012 14:49:59 +0000 (16:49 +0200)]
Configurable cloudbar settings in base.html
Kostas Papadimitriou [Mon, 13 Feb 2012 14:49:29 +0000 (16:49 +0200)]
Initial commit of cloudbar static files
root [Fri, 10 Feb 2012 11:35:11 +0000 (13:35 +0200)]
Fix docs.
Antony Chazapis [Fri, 10 Feb 2012 10:59:54 +0000 (12:59 +0200)]
Merge branch 'moderation'
Sofia Papagiannaki [Thu, 9 Feb 2012 14:09:47 +0000 (16:09 +0200)]
enable moderation in SimpleBackend
Refs: #1990
Sofia Papagiannaki [Thu, 9 Feb 2012 13:23:23 +0000 (15:23 +0200)]
commit documentation images
Refs: #1928
Sofia Papagiannaki [Thu, 9 Feb 2012 12:04:02 +0000 (14:04 +0200)]
employ new logging mechanism
Sofia Papagiannaki [Thu, 9 Feb 2012 10:10:54 +0000 (12:10 +0200)]
fix logging
Sofia Papagiannaki [Thu, 9 Feb 2012 10:10:10 +0000 (12:10 +0200)]
more documentation
Refs: #1928
Sofia Papagiannaki [Thu, 9 Feb 2012 09:49:05 +0000 (11:49 +0200)]
add support for renew in redirect target
Sofia Papagiannaki [Thu, 9 Feb 2012 09:47:52 +0000 (11:47 +0200)]
propagate next parameter in case of invalid login form
Antony Chazapis [Wed, 8 Feb 2012 14:55:26 +0000 (16:55 +0200)]
Change logging mechanism.
Refs #2016
Kostas Papadimitriou [Tue, 7 Feb 2012 15:38:41 +0000 (17:38 +0200)]
Proper cloudbar configuration
Kostas Papadimitriou [Tue, 7 Feb 2012 15:36:27 +0000 (17:36 +0200)]
Remove duplicate jquery import in base.html
root [Tue, 7 Feb 2012 14:54:07 +0000 (16:54 +0200)]
Add top bar to template.
Antony Chazapis [Mon, 6 Feb 2012 18:03:44 +0000 (20:03 +0200)]
Remove parentheses.
Antony Chazapis [Mon, 6 Feb 2012 18:01:45 +0000 (20:01 +0200)]
Remove reference to TEST variable.
Sofia Papagiannaki [Mon, 6 Feb 2012 16:13:50 +0000 (18:13 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Mon, 6 Feb 2012 16:13:40 +0000 (18:13 +0200)]
change word `consumed` in `used`
root [Mon, 6 Feb 2012 15:19:59 +0000 (17:19 +0200)]
Resolve.
Sofia Papagiannaki [Mon, 6 Feb 2012 15:12:56 +0000 (17:12 +0200)]
fix LOGIN_URL setting
Refs: #1997
Sofia Papagiannaki [Mon, 6 Feb 2012 14:23:13 +0000 (16:23 +0200)]
Hide service description.
Sofia Papagiannaki [Mon, 6 Feb 2012 14:19:19 +0000 (16:19 +0200)]
change IM_MEDIA_URL to IM_STATIC_URL
Refs: #1993
Sofia Papagiannaki [Mon, 6 Feb 2012 14:11:46 +0000 (16:11 +0200)]
change settings namespace
Refs: #1997
Sofia Papagiannaki [Mon, 6 Feb 2012 11:36:32 +0000 (13:36 +0200)]
fix tab activation
Sofia Papagiannaki [Mon, 6 Feb 2012 11:17:56 +0000 (13:17 +0200)]
restructure templates
Refs: #1993
Sofia Papagiannaki [Mon, 6 Feb 2012 10:39:39 +0000 (12:39 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Mon, 6 Feb 2012 10:39:20 +0000 (12:39 +0200)]
change api faults
Refs: #1958
Antony Chazapis [Mon, 6 Feb 2012 09:46:27 +0000 (11:46 +0200)]
Merge branch 'grnetstyles'
Sofia Papagiannaki [Fri, 3 Feb 2012 14:12:30 +0000 (16:12 +0200)]
fix logout
Kostas Papadimitriou [Fri, 3 Feb 2012 11:11:56 +0000 (13:11 +0200)]
Feedback submit button label fix
Kostas Papadimitriou [Fri, 3 Feb 2012 11:06:46 +0000 (13:06 +0200)]
Improved invitations sent styles
- display YES/NO labels/styles in `consumed` column
Kostas Papadimitriou [Fri, 3 Feb 2012 10:50:07 +0000 (12:50 +0200)]
Display page global messages
Kostas Papadimitriou [Fri, 3 Feb 2012 10:41:46 +0000 (12:41 +0200)]
Removed debug statement
Kostas Papadimitriou [Fri, 3 Feb 2012 10:40:16 +0000 (12:40 +0200)]
Apply styles for selected/current profile page
Kostas Papadimitriou [Fri, 3 Feb 2012 10:30:34 +0000 (12:30 +0200)]
Updated password reset html and styles
Kostas Papadimitriou [Fri, 3 Feb 2012 09:33:16 +0000 (11:33 +0200)]
Several styles fixes/additions
- minor css fixes
- invitations 2 cols layout
- locally served html5shim
- new form error styles
Sofia Papagiannaki [Fri, 3 Feb 2012 09:09:19 +0000 (11:09 +0200)]
change email templates
Kostas Papadimitriou [Fri, 3 Feb 2012 07:47:44 +0000 (09:47 +0200)]
Template changes
- created one column full width base template
- applied new styles to logged_out and sign up complete templates
Kostas Papadimitriou [Thu, 2 Feb 2012 17:36:47 +0000 (19:36 +0200)]
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
Kostas Papadimitriou [Thu, 2 Feb 2012 17:32:16 +0000 (19:32 +0200)]
Fixed admin base template to use old bootstrap styles
Kostas Papadimitriou [Thu, 2 Feb 2012 17:25:12 +0000 (19:25 +0200)]
Applied grnet theme for user pages
Sofia Papagiannaki [Thu, 2 Feb 2012 15:22:13 +0000 (17:22 +0200)]
fix edit profile
Sofia Papagiannaki [Thu, 2 Feb 2012 14:50:17 +0000 (16:50 +0200)]
remove ACTIVATION_LOGIN_TARGET & SIGNUP_TARGET settings
Sofia Papagiannaki [Thu, 2 Feb 2012 13:53:38 +0000 (15:53 +0200)]
fix thank you page
Sofia Papagiannaki [Thu, 2 Feb 2012 13:50:58 +0000 (15:50 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 2 Feb 2012 13:50:40 +0000 (15:50 +0200)]
render thank you page upon successful in active user creation
root [Thu, 2 Feb 2012 13:42:29 +0000 (15:42 +0200)]
Change user object in invitations template.
root [Thu, 2 Feb 2012 12:26:16 +0000 (14:26 +0200)]
Remove accepted flag (change to consumed) and invitation login target.
root [Thu, 2 Feb 2012 12:18:36 +0000 (14:18 +0200)]
Fix interface details.
Sofia Papagiannaki [Thu, 2 Feb 2012 11:37:18 +0000 (13:37 +0200)]
fix admin logout
Sofia Papagiannaki [Thu, 2 Feb 2012 11:08:46 +0000 (13:08 +0200)]
Merge branch 'master' of https://code.grnet.gr/git/astakos
Sofia Papagiannaki [Thu, 2 Feb 2012 11:08:14 +0000 (13:08 +0200)]
fix logout view
root [Thu, 2 Feb 2012 10:55:37 +0000 (12:55 +0200)]
Fix prepare response function.
Sofia Papagiannaki [Thu, 2 Feb 2012 10:31:24 +0000 (12:31 +0200)]
Set cookie and delete cookie and other minor changes.
* move login and setting cookie in one place (prepare_response)
* delete cookie in logout
* delete unused imports
* change requires_anonymous to redirect to logout with next
Sofia Papagiannaki [Wed, 1 Feb 2012 15:24:43 +0000 (17:24 +0200)]
Several minor changes
* change visible fields in user profile page
* change visible fields in user modification administrator page
* enable administrator to update user quota
* read default user level from settings
* show sent invitations and status in user invite page
* if no next request parameter after login redirect to index page
* after successful login set cookie (read cookie name & domain from settings)
* delete cookie in logout
* rename `dummy` target to `redirect` and change its functionality
Sofia Papagiannaki [Tue, 31 Jan 2012 13:59:13 +0000 (15:59 +0200)]
db migration script for adding third party
Sofia Papagiannaki [Mon, 30 Jan 2012 17:23:07 +0000 (19:23 +0200)]
Change twitter & shibboleth views to accept an email request parameter to associate with the user
Sofia Papagiannaki [Thu, 26 Jan 2012 14:57:25 +0000 (16:57 +0200)]
add email fields in auth_test_data fixture
Sofia Papagiannaki [Thu, 26 Jan 2012 14:30:42 +0000 (16:30 +0200)]
change auth_test_data fixture
Sofia Papagiannaki [Thu, 26 Jan 2012 09:41:54 +0000 (11:41 +0200)]
in edit profile redirect to next if exists
Sofia Papagiannaki [Thu, 26 Jan 2012 08:23:10 +0000 (10:23 +0200)]
prepare response set user email instead of username
Sofia Papagiannaki [Thu, 26 Jan 2012 06:48:17 +0000 (08:48 +0200)]
api authenticate return email for unique
Sofia Papagiannaki [Wed, 25 Jan 2012 21:23:23 +0000 (23:23 +0200)]
minor changes/fixes
Sofia Papagiannaki [Wed, 25 Jan 2012 18:42:34 +0000 (20:42 +0200)]
fix action in profile.html template
Refs: #1918
Sofia Papagiannaki [Wed, 25 Jan 2012 14:13:50 +0000 (16:13 +0200)]
change feedback view to render feedback page with success message in case of success