Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos / im / templates / im @ 3b258643

# Date Author Comment
3b258643 12/13/2012 04:59 pm Kostas Papadimitriou

Third party providers fixes

- Proper third party user getter. Do not include info in queryset.
- Fix signup_url. key param only needed for login

ab7e3a9e 12/13/2012 04:36 pm Kostas Papadimitriou

Additional messages in third party registration/login process

607a487b 12/12/2012 04:07 pm Kostas Papadimitriou

CSS selector fix

7402953c 12/12/2012 04:02 pm Kostas Papadimitriou

Proper visibility handling of local login form

force display of local login form after invalid form submissions

803c9c57 12/12/2012 03:36 pm Olga Brani

Bug fix

- Form visible when there is error in submit

b22c36fd 12/11/2012 05:16 pm Kostas Papadimitriou

Fix third party signup template

extend from local signup to keep them in sync on template/styles changes

67f7179d 12/11/2012 05:16 pm Kostas Papadimitriou

Split profile authentication methods in separate file

aabaf230 12/11/2012 02:36 pm Olga Brani

Merge commit

2db258bf 12/06/2012 12:25 pm Olga Brani

Text fixes
Style fixes

45ed7743 12/05/2012 03:23 pm Olga Brani

Resource usage new % style

0a63687f 12/05/2012 03:23 pm Olga Brani

Uniform text in group details/group list

67be1883 12/05/2012 01:15 pm Olga Brani

Text changes

edae77cd 12/04/2012 02:05 pm Olga Brani

Limit usage ratio
Fix link in how-it-works page

65bd6c25 12/04/2012 02:05 pm Olga Brani

- Update user/project activation status
- Fix float bug

30a77ab5 12/04/2012 12:00 pm Olga Brani

Moderation fix

95c16e3c 12/04/2012 11:31 am Olga Brani

Interactivity in how-it-works page

6c037281 12/04/2012 10:45 am Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/api/__init__.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html

632b6458 12/04/2012 10:10 am Olga Brani

Style fixes
New menu

db9083f9 12/04/2012 09:10 am Kostas Papadimitriou

Dynamic third party signup url

c1b47d7f 12/04/2012 09:05 am Kostas Papadimitriou

Merge branch 'twitterauth' into devel-0.13

666c7490 12/03/2012 06:28 pm Sofia Papagiannaki

Change menu ``Report`` to ``Usage``

38879c8b 12/03/2012 06:03 pm Sofia Papagiannaki

Remove forgotten merge mark

7fa3d29f 12/03/2012 05:55 pm Sofia Papagiannaki

Update snf-manage commands in email templates.

f9aea9c8 12/03/2012 05:49 pm Sofia Papagiannaki

Update snf-manage commands in email templates. Fix authentication token renewal.

680a29ac 12/03/2012 03:37 pm Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
snf-astakos-app/astakos/im/templates/im/profile.html

792c2f3b 12/03/2012 03:27 pm Olga Brani

Bug fixes
Style improvents
Authorisation methods page

29b0ec5a 12/03/2012 02:13 pm Sofia Papagiannaki

Do not show default groups in project lists

c101b32b 12/03/2012 01:35 pm Kostas Papadimitriou

Twitter authentication backend

698d5671 12/03/2012 01:33 pm Kostas Papadimitriou

Remove unused template

081070a5 12/03/2012 11:20 am Kostas Papadimitriou

Configurable auth providers templates/titles

b2033b58 12/03/2012 04:41 am Kostas Papadimitriou

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

07a1f977 12/02/2012 12:55 am Sofia Papagiannaki

Extend/Update management commands

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

4c32678b 11/30/2012 07:09 pm Kostas Papadimitriou

Remove explicit link to change password view

dc59b418 11/30/2012 05:44 pm Olga Brani

Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

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

5ebebb20 11/30/2012 05:42 pm Olga Brani

How it works page

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...

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