lp:~mhall119/summit/meeting-type-changes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:summit at revision 390

Chris Johnston: Pending requested 2012-05-05

Diff: 229 lines (+214/-0)

2 files modified

summit/schedule/migrations/0023_change_meeting_types.py (+213/-0)
summit/schedule/models/meetingmodel.py (+1/-0)

api

Superseded for merging into lp:~cjohnston/summit/meeting-type-changes

Chris Johnston: Pending requested 2012-05-05

Diff: 1421 lines (+937/-86)

22 files modified

docs/scheduling.rst (+12/-3)
summit/common/templates/base.html (+21/-0)
summit/common/templatetags/qrcode.py (+43/-0)
summit/media/css/site.css (+3/-1)
summit/schedule/fields.py (+1/-1)
summit/schedule/migrations/0022_add_summit_help.py (+206/-0)
summit/schedule/migrations/0023_change_meeting_types.py (+217/-0)
summit/schedule/models/attendeemodel.py (+5/-0)
summit/schedule/models/meetingmodel.py (+4/-2)
summit/schedule/models/summitmodel.py (+12/-0)
summit/schedule/templates/schedule/actions.html (+33/-26)
summit/schedule/templates/schedule/by_participant.html (+188/-0)
summit/schedule/templates/schedule/by_room.html (+8/-6)
summit/schedule/templates/schedule/by_track.html (+8/-6)
summit/schedule/templates/schedule/daily.html (+8/-6)
summit/schedule/templates/schedule/mobile.html (+20/-15)
summit/schedule/templates/schedule/schedule.html (+5/-3)
summit/schedule/templates/schedule/summit.html (+11/-10)
summit/schedule/templatetags/schedule_perms.py (+81/-0)
summit/schedule/views.py (+47/-4)
summit/urls.py (+2/-1)
summit/version (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #989964: Rework meeting types per discussion

Low

Fix Released

Link a bug report

Related blueprints

392. By Michael Hall on 2012-05-05

Keep roundtable types

391. By Michael Hall on 2012-05-05

Keep roundtable types

390. By Michael Hall on 2012-05-05

Add data migration to convert meeting types

389. By Michael Hall on 2012-05-05

merge from cjohnston

388. By Chris Johnston on 2012-05-05

Minor doc fix

387. By Chris Johnston on 2012-05-05

Updates for docs.

386. By Chris Johnston on 2012-05-04

Version 1.1.5 release

385. By Chris Johnston on 2012-05-04

Fix NoneType exception when attempting to view your created meetings when you aren't logged in

384. By Chris Johnston on 2012-05-03

Version 1.1.4 release

383. By Chris Johnston on 2012-05-03

Undo summit.html changes from rev 364 because the broke the FB widget