Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos / im / templates @ 49597874

# Date Author Comment
49597874 12/01/2012 10:47 pm Sofia Papagiannaki

Fix group detail template: specify post targets

463a973c 12/01/2012 10:47 pm Sofia Papagiannaki

Enable group owner to modify moderation

666e1351 12/01/2012 10:34 pm Sofia Papagiannaki

Enable group owner to disapprove already approved members

84d26d62 12/01/2012 10:06 pm Sofia Papagiannaki

Remove obsolete strip_http from the templates

098f333b 12/01/2012 07:05 pm Sofia Papagiannaki

Validate sorting request parameter in group views

c6a8da37 12/01/2012 06:03 pm Sofia Papagiannaki

Remove obsolete rcut filter in templates

2e90e3ec 11/30/2012 03:29 pm Kostas Papadimitriou

Merge branch 'devel-0.13' into multipleauthmethods

Conflicts:
snf-astakos-app/astakos/im/context_processors.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/target/local.py
snf-astakos-app/astakos/im/target/shibboleth.py...

d2633501 11/30/2012 02:42 pm Kostas Papadimitriou

Allow multiple login methods per account

6ed0e4a6 11/30/2012 01:30 pm Sofia Papagiannaki

Restore im/admin_notification.txt

f366e3ed 11/30/2012 11:50 am Olga Brani

Merge branch '0.6.4' into devel-0.13

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

59728d4e 11/29/2012 06:19 pm Olga Brani

Fixes
- Rename group to project in ui
- Different pagination for groups search result page
- Truncatechars filter

c0b26605 11/29/2012 05:08 pm Sofia Papagiannaki

Merge remote-tracking branch 'origin/0.12' into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/activation_backends.py
snf-astakos-app/astakos/im/api/admin.py
snf-astakos-app/astakos/im/auth_backends.py
snf-astakos-app/astakos/im/forms.py
snf-astakos-app/astakos/im/functions.py...

bf0c6de5 11/28/2012 12:02 pm Sofia Papagiannaki

Flush other user sessions during password/token change

Refs: #3007

84a7cd69 11/23/2012 05:40 pm Olga Brani

Style improvements

3cbd5e47 11/23/2012 04:44 pm Olga Brani

- New styles for select
- new Class ResourcePresentation
- Group add form javascript validation

fffa19d2 11/20/2012 07:26 pm Sofia Papagiannaki

Updated shibboleth workflow (enable user change email before activation)

Refs: #3041

5841646f 11/20/2012 03:58 pm Olga Brani

Bug fixes
- Custom select
- Units etc for group details
- General fixes

14805c8f 11/16/2012 04:44 pm Olga Brani

Style fixes

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

ef20ea07 11/15/2012 05:37 pm Sofia Papagiannaki

Refine shibboleth signup mechanism

Refs: #3041

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

b47bdc71 11/09/2012 12:47 pm root

remove lorem ipsum, fix wrong join link

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

Bug fix for group create radios

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

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

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

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

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

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

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

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

51945a9e 10/02/2012 01:13 pm Olga Brani

Anchor to select

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

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

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

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

2be26b73 09/26/2012 03:54 pm Olga Brani

Group changes

- Pagination set to 8
- Extra fields in sorting select
- X to close widjets

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

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

Add group tables sorting & decrease interaction with database

fc9ce5b3 09/21/2012 04:30 pm Olga Brani

Sorting + Pagination bug

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

ddc2cc6f 09/21/2012 12:55 pm Olga Brani

- Pagination style change
- Extra select for sorting table

01ad84e9 09/20/2012 04:12 pm Sofia Papagiannaki

Add timeline tab

d220292f 09/20/2012 01:33 pm Sofia Papagiannaki

Add pagination

4de59eac 09/19/2012 03:23 pm Olga Brani

Addcredits

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

5056da3d 09/18/2012 03:14 pm Olga Brani

Billing json

bee0bf32 09/17/2012 06:44 pm Sofia Papagiannaki

Custom template tag for months since a specific date

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

Merge branch 'dev' into 0.6.4

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

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

Add button show all in group search page

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

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

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