Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos @ adaf6800

# Date Author Comment
adaf6800 11/16/2012 04:08 pm Olga Brani

bug fix

53c768d3 11/16/2012 03:36 pm Olga Brani

Add change password link to my account page

bdc1c103 11/16/2012 03:36 pm Olga Brani

Group create
- Complete form
- Fix data presentation

c3a905e7 11/16/2012 03:34 pm Olga Brani

Adding placeholder to forms

ca7eb408 11/16/2012 03:34 pm Olga Brani

Bug fix

a3e77c69 11/16/2012 03:34 pm Olga Brani

Alter main menu

e786fbc2 11/14/2012 03:55 pm Olga Brani

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

6abd262c 11/14/2012 03:55 pm Olga Brani

Group create form bug fixes ( preliminary effors )

f2a4ce70 11/14/2012 01:35 pm Sofia Papagiannaki

Fix group list view

7bb6bd0e 11/14/2012 12:41 pm Olga Brani

Mergind two lists into one ( preliminary efforts )

d1a767f7 11/14/2012 12:27 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/astakosgroup_form.html
snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.BACKUP.21131.html

509d894e 11/14/2012 12:13 pm Olga Brani

Delete

2a997e5f 11/14/2012 12:11 pm Olga Brani

Merge

50dce93a 11/14/2012 10:42 am Olga Brani

Temp commit to switch to new branch ( based on dcd1c38335966c77df02c49f39ef7224b91ed8b3 )

269e2e22 11/13/2012 05:46 pm Olga Brani

Style fixes

ae497612 11/13/2012 05:45 pm Olga Brani

Back up file

dcd1c383 11/13/2012 05:37 pm Olga Brani

Group create form bug fixes:
- Remove radio buttons limited/unlimited
- Human readable bytes size input

26087fb9 11/13/2012 01:58 pm Sofia Papagiannaki

rename astakosgroup_form_demo.html to astakosgroup_form.html

e60ea36c 11/13/2012 01:57 pm Sofia Papagiannaki

Enforce maximum group participant number checking

674f9a52 11/13/2012 01:56 pm Sofia Papagiannaki

Isolate astakos messages in separate module

62540a36 11/13/2012 01:44 pm Sofia Papagiannaki

change user-modify command name to conform with the rest patterns

cde06a7c 11/12/2012 05:03 pm root

Fix bugs: require_http_methods & send None uplimit incase of inlimited resource

639e0352 11/09/2012 01:41 pm Olga Brani

Fix division by zero

dc419c7d 11/09/2012 01:00 pm Olga Brani

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

44c296ac 11/09/2012 12:59 pm Olga Brani

style fixes

930f09ba 11/09/2012 12:58 pm Sofia Papagiannaki

Separate safely service and resource name (in case resource name contains the RESOURCE_SEPARATOR)

075f43f2 11/09/2012 12:56 pm Olga Brani

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

c042a458 11/09/2012 12:55 pm Olga Brani

Style fixes

b47bdc71 11/09/2012 12:47 pm root

remove lorem ipsum, fix wrong join link

31886905 11/09/2012 12:41 pm Olga Brani

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

ec1819c3 11/09/2012 12:41 pm Olga Brani

Style fixes

cd1e1513 11/09/2012 12:37 pm root

Change default resource names

c8152897 11/09/2012 12:10 pm Sofia Papagiannaki

More changes in default resource limits

0fad7b08 11/09/2012 12:07 pm Olga Brani

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

93b6cb50 11/09/2012 12:06 pm Olga Brani

Bug fix for group create radios

efb70adf 11/09/2012 11:55 am Sofia Papagiannaki

Change default resource limits

a3637508 11/09/2012 10:31 am Sofia Papagiannaki

Fix user activation

40a0cd8b 11/09/2012 09:56 am Sofia Papagiannaki

Fix signup

3b99d2d6 11/09/2012 01:19 am Sofia Papagiannaki

Fix management commands

5e05921c 11/08/2012 07:18 pm Sofia Papagiannaki

Display inf in case of unlimited group resource in the admin notification email text.

9ee0c6a2 11/08/2012 06:49 pm Sofia Papagiannaki

Fix quota in case of unlimited

ed1496b7 11/08/2012 05:53 pm Sofia Papagiannaki

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

29b87e7c 11/08/2012 05:53 pm Sofia Papagiannaki

Fix group creation summary view

ce182d6b 11/08/2012 04:32 pm Olga Brani

Style changes in group list page

12269b45 11/08/2012 03:23 pm Olga Brani

Fixes for report page
Bypass group list page

7c4980e1 11/08/2012 02:09 pm Olga Brani

Group summary page

7c76af95 11/08/2012 12:44 pm Olga Brani

Bug fixes

8c804c12 11/07/2012 04:17 pm Sofia Papagiannaki

Backend implementation of group creation summary

a9aba6b9 11/07/2012 11:58 am Olga Brani

Fix for selected resources group

d84d925f 11/07/2012 11:06 am Olga Brani

Group create summary page static

820b18e0 11/07/2012 02:53 am Sofia Papagiannaki

User create_groups api call in group creation

f4091dfb 11/06/2012 06:19 pm Olga Brani

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

ed2f0452 11/06/2012 06:18 pm Olga Brani

- Help_text for group create form
- Resource_presentation dict

1f3ad141 11/05/2012 06:01 pm Sofia Papagiannaki

Fix default resource groups

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