lp:~ltp-devs/loco-team-portal/django-1-3-upgrade

Branch merges

Propose for merging

Merged into lp:loco-team-portal at revision 589

LoCo Team Portal Developers: Pending requested 2012-12-26

Diff: 352 lines (+48/-33)

21 files modified

loco_directory/local_settings.py.sample (+10/-4)
loco_directory/media/js/comments.js (+1/-1)
loco_directory/settings.py (+14/-5)
loco_directory/templates/base.html (+2/-2)
loco_directory/templates/events/global_event_delete_confirm.html (+1/-1)
loco_directory/templates/events/global_event_new.html (+2/-2)
loco_directory/templates/events/global_event_update.html (+1/-1)
loco_directory/templates/events/team_event_comment_new.inc.html (+1/-1)
loco_directory/templates/events/team_event_delete_confirm.html (+1/-1)
loco_directory/templates/events/team_event_new.html (+1/-1)
loco_directory/templates/events/team_event_register.html (+2/-2)
loco_directory/templates/events/team_event_update.html (+2/-2)
loco_directory/templates/meetings/agenda_item_delete_confirm.html (+1/-1)
loco_directory/templates/meetings/team_meeting_delete_confirm.html (+1/-1)
loco_directory/templates/meetings/team_meeting_new.html (+1/-1)
loco_directory/templates/meetings/team_meeting_update.html (+1/-1)
loco_directory/templates/teams/team_update.html (+1/-1)
loco_directory/templates/venues/venue_update.html (+2/-2)
loco_directory/urls.py (+1/-1)
requirements/dev.txt (+1/-1)
requirements/prod.txt (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

593. By Chris Johnston on 2012-12-26

Adds {% csrf_token %}

592. By Chris Johnston on 2012-12-26

Updates template loader

591. By Chris Johnston on 2012-12-26

Actually fixes admin url

590. By Chris Johnston on 2012-12-26

Updates db settings

589. By Chris Johnston on 2012-12-26

Fix admin URL

588. By Adnane Belmadiaf on 2012-12-25

[r=] PEP8 fixes

587. By Adnane Belmadiaf on 2012-12-24

Added logging when failure

586. By Adnane Belmadiaf on 2012-12-24

Fix migrate command for vagrant

585. By Adnane Belmadiaf on 2012-12-24

[r=] Fixed the global event layout

584. By Adnane Belmadiaf on 2012-12-22

[r=] Don't add geo when there is no venue