Statistics
| Branch: | Tag: | Revision:

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

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

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

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

Add submenu

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

Add billing tab

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

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

Progress VIII

  • integration with quota holder
  • new credit event for integration with aquarium
95a51cdc 08/29/2012 01:30 pm Sofia Papagiannaki

fix group join view

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

New style in form

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)
304acb60 08/23/2012 10:43 am Olga Brani

No groups found issue resolved

b27c104d 08/23/2012 10:27 am Olga Brani

Groups & style

- Dropkick for select
- New style for groups
- Larger input

207de855 08/10/2012 05:03 pm Sofia Papagiannaki

do not show "No groups found!" message when group search form loads

ffb1e7a8 08/07/2012 09:00 pm Sofia Papagiannaki

Progress V

28252c7f 08/06/2012 07:38 pm Sofia Papagiannaki

if moderation is not enabled approve immediately user membership

01ac12d5 08/06/2012 07:01 pm Sofia Papagiannaki

Progress IV

16c30d0b 08/06/2012 06:58 pm Sofia Papagiannaki

rename management commands

d68590fd 08/03/2012 08:40 pm Sofia Papagiannaki

Progress III

2f782c2f 08/03/2012 08:07 pm Sofia Papagiannaki

fix invitations template

373daf6a 08/03/2012 07:51 pm Sofia Papagiannaki

Progress II

7cb372c7 08/03/2012 03:43 pm Sofia Papagiannaki

Merge remote-tracking branch 'origin/newstyles' into 0.6.4

Conflicts:
snf-astakos-app/astakos/im/templates/im/invitations.html
snf-astakos-app/astakos/im/templates/im/login_base.html
snf-astakos-app/astakos/im/templates/im/profile.html
snf-astakos-app/astakos/im/views.py

ade90760 08/03/2012 01:34 pm Sofia Papagiannaki

Progress II

6ff7a7ca 08/03/2012 01:02 pm Sofia Papagiannaki

named reverse urls

8e45d6fd 08/03/2012 11:31 am Sofia Papagiannaki

Progress I

49a1289d 08/02/2012 04:31 pm Olga Brani

Update theme

- Change font
- Style changes

c798d62b 07/31/2012 05:07 pm Olga Brani

Cloudbar fixes. Html updates.

a0be6a0c 07/31/2012 02:00 pm Sofia Papagiannaki

Send helpdesk notification on account activation

Refs: #2674

2746146a 07/30/2012 06:34 pm Kostas Papadimitriou

Merge branch 'master' into newstyles

d9484003 06/26/2012 04:29 pm Olga Brani

Orientation fix for iPhone/iPad

badb9324 06/26/2012 04:29 pm Olga Brani

Fixes

827e20d6 06/22/2012 02:35 pm Sofia Papagiannaki

Fix misspelling error

1b3398a0 06/20/2012 04:02 pm Olga Brani

Bug fixes

5871f324 06/18/2012 01:43 pm Olga Brani

Style fixes

abf4d9e5 06/15/2012 05:39 pm Olga Brani

Merge remote-tracking branch 'origin/newstyles' into newstyles

da7eb085 06/15/2012 05:37 pm Olga Brani

Fixes and Clouds animations

e9083112 06/14/2012 01:27 pm Sofia Papagiannaki

Fix send feedback view

2bc206d4 06/13/2012 03:37 pm Kostas Papadimitriou

Merge branch 'master' into newstyles

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/login_base.html

44ce5791 06/12/2012 06:53 pm Sofia Papagiannaki

fix user info in feedback email template

9dc049cb 06/12/2012 05:37 pm Kostas Papadimitriou

Fix user notification display

also improved styling of "notice" message types

ad956265 06/11/2012 02:20 pm Kostas Papadimitriou

Improved user notifications

additional settings to set messages that get displayed on different
im pages (signin, signup, profile pages).

0b423952 06/07/2012 01:54 pm Olga Brani

Minor fixes & improvements