lp:~lucyllewy/loco-team-portal/django-1.5
Created by
Lucy Llewellyn
and last modified
- Get this branch:
- bzr branch lp:~lucyllewy/loco-team-portal/django-1.5
Only
Lucy Llewellyn
can upload to this branch. If you are
Lucy Llewellyn
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Ready for review
for merging
into
lp:loco-team-portal
- LoCo Team Portal Developers: Pending requested
-
Diff: 1375 lines (+203/-205)58 files modifiedloco_directory/articles/models.py (+1/-1)
loco_directory/events/feeds.py (+1/-1)
loco_directory/events/models.py (+2/-2)
loco_directory/events/urls.py (+1/-1)
loco_directory/local_settings.py.sample (+1/-1)
loco_directory/manage.py (+6/-8)
loco_directory/meetings/feeds.py (+1/-1)
loco_directory/meetings/models.py (+3/-3)
loco_directory/meetings/urls.py (+1/-1)
loco_directory/services/urls.py (+1/-1)
loco_directory/settings.py (+1/-1)
loco_directory/teams/feeds.py (+1/-1)
loco_directory/teams/models.py (+5/-5)
loco_directory/teams/urls.py (+1/-1)
loco_directory/templates/404.html (+3/-3)
loco_directory/templates/about_loco.html (+3/-3)
loco_directory/templates/articles/article_detail.html (+2/-2)
loco_directory/templates/base.html (+9/-9)
loco_directory/templates/events/event_history_list.html (+1/-1)
loco_directory/templates/events/event_list.html (+7/-7)
loco_directory/templates/events/global_event_detail.html (+5/-5)
loco_directory/templates/events/global_event_detail.inc.html (+1/-1)
loco_directory/templates/events/global_jam_dashboard.html (+5/-5)
loco_directory/templates/events/team_event_detail.html (+4/-4)
loco_directory/templates/events/team_event_detail.inc.html (+5/-5)
loco_directory/templates/events/team_event_detail_attendee.inc.html (+2/-2)
loco_directory/templates/events/team_event_detail_comments.inc.html (+3/-3)
loco_directory/templates/events/team_event_li.inc.html (+1/-1)
loco_directory/templates/index.html (+11/-11)
loco_directory/templates/lc_edit.html (+2/-2)
loco_directory/templates/loco_council.html (+3/-3)
loco_directory/templates/loco_setup.html (+1/-1)
loco_directory/templates/meetings/agenda_item_delete_confirm.html (+2/-2)
loco_directory/templates/meetings/agenda_item_new.html (+1/-1)
loco_directory/templates/meetings/agenda_item_update.html (+3/-3)
loco_directory/templates/meetings/meeting_history_list.html (+1/-1)
loco_directory/templates/meetings/meeting_list.html (+3/-3)
loco_directory/templates/meetings/team_meeting_detail.html (+5/-5)
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+3/-3)
loco_directory/templates/meetings/team_meeting_detail_basic.inc.html (+1/-1)
loco_directory/templates/meetings/team_meeting_li.inc.html (+1/-1)
loco_directory/templates/profiles/details.html (+3/-3)
loco_directory/templates/teams/merge_teams.html (+1/-1)
loco_directory/templates/teams/select_other_team.html (+1/-1)
loco_directory/templates/teams/team_detail.html (+20/-20)
loco_directory/templates/teams/team_event_history.html (+19/-19)
loco_directory/templates/teams/team_event_list.html (+4/-4)
loco_directory/templates/teams/team_meeting_history.html (+18/-18)
loco_directory/templates/teams/team_meeting_list.html (+3/-3)
loco_directory/templates/teams/team_reapprovals.html (+2/-2)
loco_directory/templates/venues/venue_detail.html (+3/-3)
loco_directory/urls.py (+2/-2)
loco_directory/userprofiles/models.py (+2/-2)
loco_directory/userprofiles/urls.py (+1/-1)
loco_directory/venues/models.py (+1/-1)
loco_directory/venues/urls.py (+1/-1)
requirements/dev.txt (+4/-4)
requirements/prod.txt (+4/-4)
Related bugs
Related blueprints
Branch information
Recent revisions
- 686. By Lucy Llewellyn
-
Update to django 1.5
- builds on/supercedes lp:~diddledan/loco-team-portal/django-1.4
- 683. By ԜаӀtеr Ⅼарсһуnѕkі
-
merged Pablo Rubianes' fix for `make run`
* removed distribute_setup.py
* upgraded vobject to version 0.8.2
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:loco-team-portal