Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / conf @ 3715f954

Latest revisions

# Date Author Comment
7d6c08c1 05/17/2013 05:25 pm Georgios D. Tsoukalas

astakos: remove okeanos reference from cloudbar settings

5aa83766 05/16/2013 06:57 pm Kostas Papadimitriou

Merge branch 'feature-branding' into develop

Conflicts:
snf-astakos-app/astakos/im/templates/im/account_pending_moderation_notification.txt
snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt
snf-astakos-app/astakos/im/views.py

251b83be 05/15/2013 06:49 pm Giorgos Korfiatis

astakos: Remove membership policy settings

Available join and leave policies are internally defined and should
not be changed by settings. Move policy descriptions to presentation.py.

Do not convert to string the lookup key in templatetags/filters.py

8b9e871d 05/14/2013 03:14 pm Olga Brani

Merge branch 'develop' into feature-branding

Conflicts:
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
snf-astakos-app/astakos/im/templates/im/base.html
snf-astakos-app/astakos/im/templates/im/landing.html
snf-astakos-app/astakos/im/views.py...

79b5d61b 05/10/2013 12:45 pm Sofia Papagiannaki

astakos: WIP move all api calls under ``/astakos/api``

Refs: #3340

67cd4980 04/29/2013 12:55 pm Kostas Papadimitriou

Merge remote-tracking branch 'origin/develop' into feature-branding

Conflicts:
snf-astakos-app/astakos/im/templates/im/footer.html
snf-cyclades-app/setup.py

e7f22a2a 04/10/2013 07:05 pm Christos Stavrakakis

Merge branch 'release-0.13' into develop

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

36011c7a 04/08/2013 05:12 pm Giorgos Korfiatis

Fix description for resource `ram' in settings

c2337e25 04/02/2013 01:15 pm Kostas Papadimitriou

Merge branch 'develop' into feature-branding

Conflicts:
snf-astakos-app/astakos/im/settings.py
snf-astakos-app/astakos/im/templates/im/login_base.html
snf-astakos-app/astakos/im/templatetags/astakos_tags.py
snf-cyclades-app/synnefo/app_settings/default/ui.py...

f770d29f 04/02/2013 12:56 pm Kostas Papadimitriou

Merge branch 'release-0.13' into develop

Conflicts:
snf-astakos-app/astakos/im/messages.py
snf-astakos-app/astakos/im/views.py
version

View revisions

Also available in: Atom