lp:~mhall119/loco-team-portal/686268

Branch merges

Propose for merging

No branches dependent on this one.

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

Chris Johnston: Needs Fixing on 2011-01-23

Diff: 718 lines (+469/-33)

14 files modified

loco_directory/common/views.py (+10/-0)
loco_directory/media/css/newstyle.css (+26/-0)
loco_directory/meetings/forms.py (+49/-17)
loco_directory/meetings/models.py (+24/-6)
loco_directory/meetings/templatetags/recurse.py (+82/-0)
loco_directory/meetings/urls.py (+3/-0)
loco_directory/meetings/views.py (+119/-4)
loco_directory/services/urls.py (+1/-0)
loco_directory/services/views.py (+4/-1)
loco_directory/templates/meetings/agenda_item_delete_confirm.html (+43/-0)
loco_directory/templates/meetings/agenda_item_new.html (+36/-0)
loco_directory/templates/meetings/agenda_item_update.html (+37/-0)
loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+19/-5)
loco_directory/templates/site_search.html (+16/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #686268: Add the ability to add agenda items

Wishlist

Fix Released

Link a bug report

Related blueprints

369. By Michael Hall on 2011-01-24

Merge from trunk

368. By Michael Hall on 2011-01-24

Add link to meeting chair's lp profile, merge from Chris Johnston

367. By Michael Hall on 2011-01-24

Show appropriate timezone and localtimes on events and meetings, merge from Chris Johnston

366. By Chris Johnston on 2011-01-23

Fixes bug 639772. Props mhall119

365. By Michael Hall on 2011-01-18

Revert to using JQuery 1.7 compatible css urls

364. By Michael Hall on 2011-01-18

Add mugshots of attendees

363. By Michael Hall on 2011-01-18

Change wording from expires to reapproval

362. By Michael Hall on 2011-01-18

Redirect to new event or meeting after copying

361. By Michael Hall on 2011-01-18

Fix copy meeting and events

360. By Michael Hall on 2011-01-18

Include meetings in team details page