Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos @ ed2f0452

# Date Author Comment
ed2f0452 11/06/2012 06:18 pm Olga Brani

- Help_text for group create form
- Resource_presentation dict
2095ba0f 11/05/2012 04:04 pm Olga Brani

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
8e0575ee 11/05/2012 04:00 pm Olga Brani

Merge billing
9a06d96f 11/05/2012 03:38 pm Olga Brani

Merged demo
f932b578 11/05/2012 03:29 pm Olga Brani

Radio button fixes
Bug fixes
952c0979 11/05/2012 03:08 pm Sofia Papagiannaki

Set additional default resource information (description, unit)
10b31d34 11/05/2012 01:58 pm Sofia Papagiannaki

Merge branch 'future' into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py
snf-astakos-app/astakos/im/api/spec.py
snf-astakos-app/astakos/im/endpoints/quotaholder.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py...
f46c95c4 11/05/2012 12:52 pm Sofia Papagiannaki

Merge with future branch
55a845c0 11/02/2012 05:25 pm Olga Brani

Style bug fixes
24976f0d 11/02/2012 02:23 pm Sofia Papagiannaki

Merge branch '0.6.4' into future
bdd76c50 11/02/2012 02:22 pm Sofia Papagiannaki

Merge branch '0.6.4' into future

Conflicts:
snf-astakos-app/astakos/im/synnefo_settings.py
a2fca5ba 11/02/2012 02:14 pm Olga Brani

Correct id, name in create_group_demo form
1b866d9e 11/02/2012 12:50 pm Olga Brani

New create group page.
Changes in resources page.
Style fixes
9f663ff7 10/28/2012 05:30 pm Sofia Papagiannaki

Resolve conflict after merge
54b86775 10/28/2012 05:25 pm Sofia Papagiannaki

Merge branch '0.6.4' into future
1ff7fe17 10/25/2012 07:11 pm Sofia Papagiannaki

Fix undefined variable
288bab1f 10/25/2012 07:10 pm Sofia Papagiannaki

Minor changes (mainly formatting)
b0d54088 10/25/2012 07:06 pm Sofia Papagiannaki

Fix undefined variable
a5373d5f 10/25/2012 07:04 pm Sofia Papagiannaki

Changes in the format
1876378f 10/25/2012 07:02 pm Sofia Papagiannaki

Remove duplicate command
52343ac8 10/25/2012 01:29 pm Olga Brani

Resources statistic page
133b2afe 10/23/2012 12:26 pm Olga Brani

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

Conflicts:
snf-astakos-app/astakos/im/static/im/css/modules.css
snf-astakos-app/astakos/im/static/im/js/common.js
snf-astakos-app/astakos/im/templates/im/astakosuserquota_list.html
snf-astakos-app/astakos/im/views.py
bde71886 10/23/2012 12:11 pm Olga Brani

astakos_group_form_demo page
astakos_group_ressources_statistics page
485c713e 10/22/2012 05:31 pm Sofia Papagiannaki

Merge remote-tracking branch 'origin' into future

Conflicts:
snf-astakos-app/README
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/js/forms.js
snf-astakos-app/astakos/im/target/redirect.py...
5dbfd71e 10/22/2012 04:56 pm Sofia Papagiannaki

Merge remote-tracking branch 'origin' into future

Conflicts:
snf-astakos-app/astakos/im/management/commands/group-list.py
snf-astakos-app/astakos/im/management/commands/group-permissions-add.py
snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py...
ee210d1d 10/16/2012 06:53 pm Sofia Papagiannaki

Change setting name

Refs: #2612
48e9f076 10/16/2012 06:23 pm Sofia Papagiannaki

Optionally enforce token renewal via settings. Set initial value to True in the forms.

Refs: #2612
318f44d9 10/12/2012 06:44 pm Sofia Papagiannaki

Remove obsolete import
dda2e499 10/12/2012 06:43 pm Sofia Papagiannaki

Explicitly allow only POST and GET requests
77fc637a 10/12/2012 06:39 pm Sofia Papagiannaki

Handle AttributeError in case of other than GET or POST method
3d2e5537 10/09/2012 12:13 pm Vangelis Koukis

Rename user-update mgmt command to user-modify
dab9c43c 10/04/2012 01:21 pm Sofia Papagiannaki

Change saved emails to lowercase

Refs: #2883
29816137 10/04/2012 01:20 pm Sofia Papagiannaki

Turn emails to case-insensitive.

Refs: #2883
c9015cf6 10/04/2012 12:53 pm Sofia Papagiannaki

Merge branch 'dev' into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
9eafaa32 10/04/2012 12:42 pm Sofia Papagiannaki

View and management commands for adding/removing user resource quota

Refs: #2793
4f1bdccd 10/03/2012 01:34 pm Sofia Papagiannaki

Rename management commands
6bdf0aa3 10/03/2012 12:50 pm Sofia Papagiannaki

Rename management commands
7507ea03 10/02/2012 02:59 pm root

Set obsolete user and group limit field nullable
51945a9e 10/02/2012 01:13 pm Olga Brani

Anchor to select
28c06e75 10/02/2012 12:06 pm root

Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
3bb604eb 10/02/2012 12:05 pm Sofia Papagiannaki

Merge branch '0.6.4' into dev

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/views.py
d129db21 10/01/2012 05:45 pm root

Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
88305cf0 10/01/2012 05:44 pm root

commit dev84 changes
dfdc64d2 09/28/2012 06:41 pm Sofia Papagiannaki

Display resource limit details
3208aa1c 09/28/2012 05:25 pm Sofia Papagiannaki

Fix group search
25b51727 09/28/2012 05:14 pm Sofia Papagiannaki

Catch EmptyPage exception in paginate empty tag
801be7a3 09/28/2012 05:13 pm Sofia Papagiannaki

Add sorting parameter validation
77aaed51 09/28/2012 04:37 pm Sofia Papagiannaki

Change pagination in group list
2c4b2a96 09/28/2012 03:48 pm Sofia Papagiannaki

Fix members sorting in group detail
572194d0 09/28/2012 03:17 pm Sofia Papagiannaki

Add erroneously deleted line
56b1281c 09/28/2012 03:14 pm Sofia Papagiannaki

Fix bugs in views
032ade79 09/28/2012 01:19 pm Sofia Papagiannaki

Reduce database interaction in group_detail
701118f4 09/28/2012 12:04 pm Sofia Papagiannaki

Do now allow owner to leave group: remove link from group search
0f225db4 09/28/2012 11:54 am Sofia Papagiannaki

Minor changes in group list
661c4479 09/27/2012 08:00 pm Sofia Papagiannaki

Add group_detail members table pagination
04febd09 09/27/2012 02:01 pm Olga Brani

Bug fixes for pagination and select
9d5eb7a7 09/27/2012 11:37 am Sofia Papagiannaki

Fix group_list
8cc49f4d 09/27/2012 11:34 am Sofia Papagiannaki

Merge remote-tracking branch 'origin' into dev

Conflicts:
snf-astakos-app/Changelog
snf-astakos-app/README
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js...
2be26b73 09/26/2012 03:54 pm Olga Brani

Group changes

- Pagination set to 8
- Extra fields in sorting select
- X to close widjets
66c90acd 09/26/2012 12:37 pm Vangelis Koukis

Rename Astakos management commands for uniformity
574264f8 09/25/2012 04:33 pm root

Fix group_list view in case current user is not of any group
or does not participate in any group
1b3db4f0 09/25/2012 04:15 pm root

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

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py
39cd6c92 09/25/2012 04:12 pm Sofia Papagiannaki

Merge branch '0.6.4' into dev

Conflicts:
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/views.py
a2436cb6 09/25/2012 04:07 pm Sofia Papagiannaki

merge with 0.6.4
789bcaf9 09/25/2012 02:27 pm Sofia Papagiannaki

Add group tables sorting & decrease interaction with database
c8ec7233 09/21/2012 04:34 pm Olga Brani

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
fc9ce5b3 09/21/2012 04:30 pm Olga Brani

Sorting + Pagination bug
bce67d66 09/21/2012 03:17 pm Sofia Papagiannaki

Fix migration integrity error
476fdba1 09/21/2012 03:05 pm root

handle limit conditions in timeline charging
82b05401 09/21/2012 03:05 pm root

enhance timeline form, traffic charging support
5cb31e51 09/21/2012 03:05 pm root

fetch form in GET (by spapagian)
2925e285 09/21/2012 03:05 pm root

timeline charging hello world
c3f6cdf1 09/21/2012 03:05 pm root

enhance mock timeline form and listing
c48ab3c4 09/21/2012 02:32 pm Sofia Papagiannaki

Fix pagination in search group view
0f42ee35 09/21/2012 12:59 pm Sofia Papagiannaki

Change resource representation
ddc2cc6f 09/21/2012 12:55 pm Olga Brani

- Pagination style change
- Extra select for sorting table
3bcad004 09/21/2012 12:00 pm Sofia Papagiannaki

Add signed_terms_required & login_required decorators in timeline view.
421bb1f6 09/20/2012 06:19 pm Sofia Papagiannaki

Change Timeline date field format
6d1a8c43 09/20/2012 06:11 pm Sofia Papagiannaki

Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
6e52912b 09/20/2012 06:10 pm Sofia Papagiannaki

Manipulate Timeline form fields
d5e09ca7 09/20/2012 05:12 pm root

Remove email validation
85a5c699 09/20/2012 05:10 pm root

Fix migration 0023. Supply limit default value.
6e7afad5 09/20/2012 05:03 pm Sofia Papagiannaki

Display calendar in timeline date fields
01ad84e9 09/20/2012 04:12 pm Sofia Papagiannaki

Add timeline tab
54213d7a 09/20/2012 03:53 pm Sofia Papagiannaki

New timeline tab
d220292f 09/20/2012 01:33 pm Sofia Papagiannaki

Add pagination
7eadb924 09/20/2012 01:28 pm Sofia Papagiannaki

Merge branch '0.6.4' into dev
4de59eac 09/19/2012 03:23 pm Olga Brani

Addcredits
670de92a 09/18/2012 07:32 pm Sofia Papagiannaki

Change rename and change quota limit field to bigint
ec7778db 09/18/2012 03:35 pm Sofia Papagiannaki

Merge branch '0.6.4' into dev
c3a00daf 09/18/2012 03:30 pm Olga Brani

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

Conflicts:
snf-astakos-app/astakos/im/templates/im/billing.html
snf-astakos-app/astakos/im/templatetags/filters.py
snf-astakos-app/astakos/im/views.py
0c1f6cdb 09/18/2012 03:20 pm Sofia Papagiannaki

Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
5056da3d 09/18/2012 03:14 pm Olga Brani

Billing json
d0991b92 09/18/2012 02:52 pm Sofia Papagiannaki

Alter limit column type to bigint
48121481 09/18/2012 12:40 pm root

Fix transaction management in signup views
1eaeb5b6 09/17/2012 06:47 pm Sofia Papagiannaki

Change handle membership wrapper
de4ed385 09/17/2012 06:46 pm Sofia Papagiannaki

Alter billing view to accepted another start date instead of today()
bee0bf32 09/17/2012 06:44 pm Sofia Papagiannaki

Custom template tag for months since a specific date
bd4f356c 09/17/2012 06:36 pm Sofia Papagiannaki

Register resources in quota holder
bd004149 09/17/2012 10:51 am Olga Brani

Align actions in table (groups)