lp:~dholbach/loco-team-portal/582354

Branch merges

Propose for merging

No branches dependent on this one.

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

Chris Johnston: Approve on 2010-10-05

Diff: 351 lines (+242/-4)

10 files modified

loco_directory/teams/forms.py (+2/-2)
loco_directory/teams/management/commands/lpupdate.py (+9/-0)
loco_directory/teams/migrations/0010_add_photos_feed_fields.py (+2/-2)
loco_directory/teams/migrations/0011_add_team_active.py (+116/-0)
loco_directory/teams/models.py (+1/-0)
loco_directory/teams/urls.py (+2/-0)
loco_directory/teams/views.py (+48/-0)
loco_directory/templates/teams/merge_teams.html (+24/-0)
loco_directory/templates/teams/select_other_team.html (+37/-0)
loco_directory/templates/teams/team_detail.html (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #582354: LD does not deal well with renamed teams

High

Fix Released

Link a bug report

Related blueprints

311. By Daniel Holbach on 2010-10-01

remove unnecessary expires_date

310. By Daniel Holbach on 2010-09-30

add new pages that let people choose the team to merge with and do the actual merging

309. By Daniel Holbach on 2010-09-30

add team activity in cronjob

308. By Daniel Holbach on 2010-09-30

don't allow editing the field

307. By Daniel Holbach on 2010-09-30

add active field for teams

306. By Daniel Holbach on 2010-09-30

fix backwards transition

305. By Chris Johnston on 2010-09-28

New Release

304. By Chris Johnston on 2010-09-28

Adding translation and fixing slight css issue

303. By Chris Johnston on 2010-09-28

Bugfix for bug #620869 thanks to mhall119 and daker, and updated translations

302. By Chris Johnston on 2010-09-28

Updating Translations