Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app @ 9f01cf1d

# Date Author Comment
9f01cf1d 12/10/2012 08:45 pm Sofia Papagiannaki

Fix membership reject & remove

97896995 12/10/2012 08:35 pm Sofia Papagiannaki

Fix membership views and other bugs

5eaef79b 12/10/2012 08:22 pm Sofia Papagiannaki

Manual transaction management in project application approve command

56eb807c 12/10/2012 08:20 pm Sofia Papagiannaki

Fix project definition resource grants registration

bfe23b13 12/10/2012 05:57 pm Sofia Papagiannaki

Progress VII

ccab6eb5 12/10/2012 12:04 am Sofia Papagiannaki

Progress VI

8327782d 12/08/2012 03:26 am Sofia Papagiannaki

Progress V

0cc22d47 12/07/2012 07:08 pm Sofia Papagiannaki

Several fixes

542e4ccd 12/07/2012 03:55 pm Sofia Papagiannaki

Merge branch 'projects' of https://code.grnet.gr/git/astakos into projects

b22de10a 12/07/2012 03:55 pm Sofia Papagiannaki

Update models

68f03797 12/07/2012 01:48 pm Georgios D. Tsoukalas

add project application status to specs

dfbf5c50 12/07/2012 01:00 pm Giorgos Korfiatis

Fix some typos

e65c21df 12/07/2012 11:52 am Georgios D. Tsoukalas

eliminate top-level queries that force db access on parse

07c87d4f 12/07/2012 11:08 am Georgios D. Tsoukalas

draft project specification documentation

2a965273 12/07/2012 01:21 am Sofia Papagiannaki

Progress IV

71a38edf 12/06/2012 08:44 pm Sofia Papagiannaki

Progress III

e8af89d0 12/06/2012 06:56 pm Sofia Papagiannaki

Merge branch 'projects' of https://code.grnet.gr/git/astakos into projects

Conflicts:
snf-astakos-app/astakos/im/models.py

Conflicts:
snf-astakos-app/astakos/im/models.py

f3342849 12/06/2012 06:49 pm Sofia Papagiannaki

Progress II

7ddc8a37 12/06/2012 04:59 pm Georgios D. Tsoukalas

add file for projects tests

8ed8ea10 12/06/2012 04:59 pm Georgios D. Tsoukalas

syntax fix

68977cc8 12/06/2012 04:58 pm Georgios D. Tsoukalas

whitespace tab fix

e1a80257 12/06/2012 03:52 pm Sofia Papagiannaki

Progress I

2db258bf 12/06/2012 12:25 pm Olga Brani

Text fixes
Style fixes

45ed7743 12/05/2012 03:23 pm Olga Brani

Resource usage new % style

0a63687f 12/05/2012 03:23 pm Olga Brani

Uniform text in group details/group list

67be1883 12/05/2012 01:15 pm Olga Brani

Text changes

d2a553dc 12/05/2012 01:15 pm Olga Brani

Style fixes

55c99c1c 12/05/2012 01:11 pm Sofia Papagiannaki

Change some default values in settings

48f1f1de 12/04/2012 03:43 pm Sofia Papagiannaki

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

775d5ad7 12/04/2012 03:43 pm Sofia Papagiannaki

Fix migrations

0ea1f32b 12/04/2012 02:38 pm Georgios D. Tsoukalas

fix tab

16cf0f73 12/04/2012 02:22 pm Sofia Papagiannaki

Fix migrations

edae77cd 12/04/2012 02:05 pm Olga Brani

Limit usage ratio
Fix link in how-it-works page

394c9834 12/04/2012 02:05 pm Olga Brani

- Flag is_active_member to group_details

65bd6c25 12/04/2012 02:05 pm Olga Brani

- Update user/project activation status
- Fix float bug

30a77ab5 12/04/2012 12:00 pm Olga Brani

Moderation fix

40d96a9c 12/04/2012 11:31 am Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

95c16e3c 12/04/2012 11:31 am Olga Brani

Interactivity in how-it-works page

33d969b0 12/04/2012 11:23 am Kostas Papadimitriou

Automatic local auth provider assignment

when a valid user with empty authentication providers list tries to
log in

d44f3f89 12/04/2012 11:20 am Kostas Papadimitriou

Create local auth provider for superadmin user

if one created after syncdb command

6c037281 12/04/2012 10:45 am Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/api/__init__.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html

632b6458 12/04/2012 10:10 am Olga Brani

Style fixes
New menu

db9083f9 12/04/2012 09:10 am Kostas Papadimitriou

Dynamic third party signup url

c1b47d7f 12/04/2012 09:05 am Kostas Papadimitriou

Merge branch 'twitterauth' into devel-0.13

666c7490 12/03/2012 06:28 pm Sofia Papagiannaki

Change menu ``Report`` to ``Usage``

289f8c2e 12/03/2012 06:04 pm Sofia Papagiannaki

Fix group list view working with sqlite

38879c8b 12/03/2012 06:03 pm Sofia Papagiannaki

Remove forgotten merge mark

7fa3d29f 12/03/2012 05:55 pm Sofia Papagiannaki

Update snf-manage commands in email templates.

f9aea9c8 12/03/2012 05:49 pm Sofia Papagiannaki

Update snf-manage commands in email templates. Fix authentication token renewal.

680a29ac 12/03/2012 03:37 pm Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/templates/im/profile.html

792c2f3b 12/03/2012 03:27 pm Olga Brani

Bug fixes
Style improvents
Authorisation methods page

74836e50 12/03/2012 02:46 pm Sofia Papagiannaki

Fix AttributeError invalid method name

29b0ec5a 12/03/2012 02:13 pm Sofia Papagiannaki

Do not show default groups in project lists

08621fa5 12/03/2012 01:53 pm Kostas Papadimitriou

auth_providers context processro fix

pass auth provider instances in templates

6012535a 12/03/2012 01:47 pm Kostas Papadimitriou

Include inactive auth providers in registry

c101b32b 12/03/2012 01:35 pm Kostas Papadimitriou

Twitter authentication backend

fbaa4f3c 12/03/2012 01:34 pm Kostas Papadimitriou

Handle empty third party email

698d5671 12/03/2012 01:33 pm Kostas Papadimitriou

Remove unused template

2b5a3efa 12/03/2012 01:30 pm root

More meaningful login failure explanations

4843aa6b 12/03/2012 01:00 pm root

Fix syntax in uls.py

f70da940 12/03/2012 12:59 pm root

Remove billing from urls

f8f86e83 12/03/2012 12:56 pm root

Remove celery tasks execution

c3c2212a 12/03/2012 12:40 pm Sofia Papagiannaki

Fix import error in astakos.im.functions

12285b4b 12/03/2012 12:30 pm Olga Brani

Fix legend margin bug

a2214bd1 12/03/2012 11:27 am Kostas Papadimitriou

Fix setting name case

081070a5 12/03/2012 11:20 am Kostas Papadimitriou

Configurable auth providers templates/titles

7233d542 12/03/2012 10:08 am Kostas Papadimitriou

Proper MODERATION_ENABLED check when invitations are enabled

3b01f38b 12/03/2012 10:04 am Kostas Papadimitriou

Set local login method for new users

b2033b58 12/03/2012 04:41 am Kostas Papadimitriou

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

07a1f977 12/02/2012 12:55 am Sofia Papagiannaki

Extend/Update management commands

a706ae94 12/01/2012 11:33 pm Sofia Papagiannaki

Fix infinite loop in case another user with the same email already exists

6b9a334b 12/01/2012 11:03 pm Sofia Papagiannaki

Change AstakosUserManager to inherit from django.contrib.auth.models.UserManager

49597874 12/01/2012 10:47 pm Sofia Papagiannaki

Fix group detail template: specify post targets

463a973c 12/01/2012 10:47 pm Sofia Papagiannaki

Enable group owner to modify moderation

666e1351 12/01/2012 10:34 pm Sofia Papagiannaki

Enable group owner to disapprove already approved members

bfaeedb6 12/01/2012 10:28 pm Sofia Papagiannaki

Fix sorting parameter validation in group detail

84d26d62 12/01/2012 10:06 pm Sofia Papagiannaki

Remove obsolete strip_http from the templates

513571c3 12/01/2012 08:20 pm Sofia Papagiannaki

Fixes in group creation

098f333b 12/01/2012 07:05 pm Sofia Papagiannaki

Validate sorting request parameter in group views

c6a8da37 12/01/2012 06:03 pm Sofia Papagiannaki

Remove obsolete rcut filter in templates

792fad7a 12/01/2012 06:02 pm Sofia Papagiannaki

Change email authentication backend to check username/password pair in any case if email/password authentication fails (not only if username does not match email regex)

caf70869 11/30/2012 09:15 pm Sofia Papagiannaki

Do not save url prefix in group names

4c32678b 11/30/2012 07:09 pm Kostas Papadimitriou

Remove explicit link to change password view

5156e663 11/30/2012 06:48 pm Kostas Papadimitriou

Reset password when removing local auth provider

8ab484ea 11/30/2012 06:29 pm Kostas Papadimitriou

Keep third party token between signup form errors

dc59b418 11/30/2012 05:44 pm Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/urls.py
snf-astakos-app/astakos/im/views.py

5ebebb20 11/30/2012 05:42 pm Olga Brani

How it works page

1dde22bd 11/30/2012 05:18 pm Kostas Papadimitriou

Proper commit files for b48b6a2

b778b6fa 11/30/2012 05:14 pm Kostas Papadimitriou

Update management commands

to conform with multiple auth providers feature

b48b6a26 11/30/2012 04:56 pm Kostas Papadimitriou

Multiple auth providers migration

a9c0cd9f 11/30/2012 04:56 pm Kostas Papadimitriou

is_local is no longer used

f432088a 11/30/2012 04:45 pm Kostas Papadimitriou

Additional multiple auth methods fixes and tests

215e87da 11/30/2012 03:41 pm Kostas Papadimitriou

Create missing migrations

895c0deb 11/30/2012 03:38 pm Kostas Papadimitriou

Remove conflicting migrations

e2581777 11/30/2012 03:36 pm Kostas Papadimitriou

Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods

2e90e3ec 11/30/2012 03:29 pm Kostas Papadimitriou

Merge branch 'devel-0.13' into multipleauthmethods

Conflicts:
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/target/local.py
snf-astakos-app/astakos/im/target/shibboleth.py...

30d92d1e 11/30/2012 03:23 pm Georgios D. Tsoukalas

add token to quotaholder client

also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings

d2633501 11/30/2012 02:42 pm Kostas Papadimitriou

Allow multiple login methods per account

421aeae8 11/30/2012 01:32 pm root

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

3b1912f4 11/30/2012 01:32 pm root

Change commissioning imports