Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos @ 574264f8

# Date Author Comment
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)

9e5075ef 09/14/2012 06:08 pm Sofia Papagiannaki

Enable group owner to add members

Refs: #2793

5a03a01a 09/14/2012 06:05 pm Sofia Papagiannaki

Merge branch 'dev' into 0.6.4

f2d3fe96 09/14/2012 05:06 pm Sofia Papagiannaki

remove django_extensions from installed_apps

a4233484 09/14/2012 04:48 pm Sofia Papagiannaki

Enable group owner to add members

Refs: #2793

2b1a5f5d 09/14/2012 03:08 pm Olga Brani

Style changes in group_edit and show_all_groups

c5e33649 09/14/2012 12:18 pm Sofia Papagiannaki

Remove debug_toolbar from installed_apps

10ed0073 09/14/2012 12:06 pm Sofia Papagiannaki

Rollback transaction in case signup failure

df67421c 09/13/2012 05:43 pm Sofia Papagiannaki

Add button show all in group search page

Refs: #2793

5c1ad9e3 09/13/2012 04:37 pm Sofia Papagiannaki

Group owner can update group description & homepage

Refs: #2793

51c57c9c 09/13/2012 04:23 pm Sofia Papagiannaki

Group owner can update group description & homepage

Refs: #2793

4ff0f36c 09/13/2012 04:21 pm Sofia Papagiannaki

remove obsolete view

4f78c22c 09/13/2012 04:21 pm Sofia Papagiannaki

merge with origin 0.6.4

0f0c9878 09/13/2012 11:19 am Sofia Papagiannaki

Merge branch '0.6.4' into dev

1954d761 09/11/2012 04:46 pm Olga Brani

- Editable group fields
- Show all feature in search
-

6da417da 09/11/2012 01:45 pm Olga Brani

UI changes

- Show more/less button
- Removed table sorting

c8977d75 09/10/2012 04:51 pm Olga Brani

Various presentation fixes

5ce3ce4f 09/10/2012 01:52 pm Sofia Papagiannaki

Fix code formatting to conform to the PEP 8 style guide

7faeaef3 09/10/2012 11:48 am Olga Brani

Bug fixes

- Homepage field appearing in form
- Fix for search_group page

6078c7ef 09/07/2012 02:46 pm Olga Brani

Migration fix

c78c9908 09/07/2012 02: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/forms.py

1831a0fe 09/07/2012 01:48 pm Olga Brani

Minor fixes

- Help text for modearation_enabled field
- Terms of use=> Terms of service

ed4a91be 09/07/2012 01:24 pm Olga Brani

Bug fix

- remove extra links from Cloudbar

ea221961 09/07/2012 01:22 pm Olga Brani

New font (Open Sans)

a4db4523 09/06/2012 07:23 pm Sofia Papagiannaki

Add group homepage field

Refs: #2793

83bdb2b6 09/06/2012 07:06 pm Sofia Papagiannaki

Display only enabled groups in group search

58d88b47 09/06/2012 06:33 pm Sofia Papagiannaki

Not exact group search

Refs: #2793

f627a979 09/06/2012 04:22 pm Sofia Papagiannaki

fix get_query utility in case of HEAD request

368a508c 09/05/2012 07:07 pm Sofia Papagiannaki

Change clientid in aquarium messages to string

fcf90160 09/05/2012 06:13 pm Sofia Papagiannaki

AstakosUser signed_terms property instead of function

2ef68a58 09/05/2012 12:59 pm Sofia Papagiannaki

Add submenu

a88d9ec1 09/05/2012 12:57 pm Sofia Papagiannaki

Add submenu

20d50182 09/04/2012 04:03 pm Sofia Papagiannaki

fix group enable

6e029beb 09/04/2012 12:23 pm Sofia Papagiannaki

Add billing tab

705a9ae0 09/03/2012 07:00 pm Sofia Papagiannaki

add missing import

1cbce16f 09/03/2012 07:00 pm Sofia Papagiannaki

use django ADMIN & SERVER_EMAIL settings instead of DEFAULT_ADMIN_EMAIL & DEFAULT_FROM_EMAIL

4b7d68f0 09/03/2012 05:38 pm Olga Brani

Indermediate page for create group

056ee470 09/03/2012 05:10 pm Olga Brani

Style changes in create group form

9d446b22 09/03/2012 04:53 pm Sofia Papagiannaki

remove space

28bcc2cf 09/03/2012 04:52 pm Sofia Papagiannaki

schedule credit update interval the first day of each month

77f6e87f 09/03/2012 04:36 pm Sofia Papagiannaki

more management commands for handling resources

c1e49eaf 09/03/2012 04:05 pm Sofia Papagiannaki

fix 0017 migration

41ee7794 09/03/2012 02:04 pm Sofia Papagiannaki

fix synnefo.settings

7e6bb438 09/03/2012 02:01 pm Sofia Papagiannaki

fix syneffo_settings

a49bcf4b 09/03/2012 01:23 pm Sofia Papagiannaki

django-celery configuration

8b59b8ea 09/03/2012 01:22 pm Sofia Papagiannaki

import commissioning only if QUOTA_HOLDER_URL is set

fc1e2f02 09/02/2012 06:19 pm Sofia Papagiannaki

Progress VIII

  • integration with quota holder
  • new credit event for integration with aquarium
04e8a251 09/02/2012 06:01 pm Sofia Papagiannaki

move aquarium listener in endpoints

8fd2c1fa 09/02/2012 05:59 pm Sofia Papagiannaki

delete migration

e21a4ea5 09/02/2012 05:59 pm Sofia Papagiannaki

move aquarium listener in endpoints

eebf750d 08/29/2012 04:13 pm Sofia Papagiannaki

add email & is_active index in auth_user

aab4d540 08/29/2012 01:52 pm Sofia Papagiannaki

remove unused imports & code refinement

95a51cdc 08/29/2012 01:30 pm Sofia Papagiannaki

fix group join view

eff12d38 08/29/2012 01:26 pm Olga Brani

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

b591d833 08/29/2012 12:13 pm Olga Brani

New style in form

aa4109d4 08/28/2012 04:56 pm Sofia Papagiannaki

set default group in newly created users

567ce269 08/28/2012 03:34 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/forms.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_detail.html
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html

3abf6c78 08/28/2012 01:45 pm Sofia Papagiannaki

Progress VIII

send admin notification upon group creation

0f4fa26d 08/27/2012 07:53 pm Sofia Papagiannaki

Progress VII

  • add policies during group creation
  • improve performance (reduce db access)
025b4028 08/27/2012 03:33 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_list.html

f6e8cca4 08/27/2012 10:47 am Sofia Papagiannaki

change helpdesk notification email subject