lp:~summit-hackers/summit/rm-rf

Branch merges

Merged into lp:summit at revision 452

Michael Hall (community): Approve on 2012-10-09

Diff: 265 lines (+161/-4)

9 files modified

summit/common/templatetags/menubuilder.py (+2/-0)
summit/schedule/admin/meetingadmin.py (+1/-1)
summit/schedule/models/meetingmodel.py (+2/-1)
summit/schedule/templates/schedule/admin.html (+3/-0)
summit/schedule/templates/schedule/confirm_deletion.html (+16/-0)
summit/schedule/templates/schedule/delete_confirm.html (+20/-0)
summit/schedule/tests.py (+75/-2)
summit/schedule/views.py (+39/-0)
summit/urls.py (+3/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

457. By Michael Hall on 2012-10-09

Allow admin to filter by approved state, don't mark removed meetings as approved when importing again from launchpad

456. By Michael Hall on 2012-10-09

Remove debug prints, mark a meeting as REMOVED instead of actually deleting the record

455. By Chris Johnston on 2012-10-09

Adds missing test

454. By Chris Johnston on 2012-10-09

Fixes one broken view

453. By Michael Hall on 2012-10-09

Fixes to delete meeting tests

Merged branch lp:~mhall119/summit/rm-rf

452. By Michael Hall on 2012-10-09

work from chris

451. By Michael Hall on 2012-10-04

[r=chrisjohnston] Adds the ability to support 30-minute slots in both initslots and lpupdate commands, even though we won't be using them for UDS-R.

Also adds support for LP Blueprint IDs, and using them to match instead of BP name, so that renames are handled properly, and removed BPs are marked as "REMOVED" but not deleted.

450. By Chris Johnston on 2012-10-04

[r=mhall119] Fixes the menu highlighting

449. By Chris Johnston on 2012-10-02

[r=mhall119] Changes python version from 2.6 to 2.7 as we are now on Precise!

448. By Chris Johnston on 2012-09-27

[r=mhall119] Changes the star on the agenda pages to link to the attending form instead of the meeting page.