Statistics
| Branch: | Tag: | Revision:

root @ 1f3ad141

Name Size
  snf-astakos-app
.gitignore 185 Bytes

Latest revisions

# Date Author Comment
1f3ad141 11/05/2012 06:01 pm Sofia Papagiannaki

Fix default resource groups
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

View all revisions | View revisions

Also available in: Atom