lp:~cjohnston/summit/new-meeting-stuff

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Merged into lp:summit at revision 313

Summit Hackers: Pending requested 2012-03-06

Diff: 1495 lines (+869/-149)

28 files modified

.bzrignore (+2/-0)
summit/common/templates/base.html (+8/-31)
summit/common/templates/common/index.html (+5/-2)
summit/django.wsgi (+2/-3)
summit/schedule/admin/meetingadmin.py (+1/-1)
summit/schedule/autoslug.py (+79/-0)
summit/schedule/forms.py (+82/-4)
summit/schedule/migrations/0017_add_review_status.py (+204/-0)
summit/schedule/models/meetingmodel.py (+15/-1)
summit/schedule/templates/schedule/create_private.html (+1/-1)
summit/schedule/templates/schedule/daily.html (+7/-6)
summit/schedule/templates/schedule/edit_meeting.html (+45/-0)
summit/schedule/templates/schedule/edit_private.html (+1/-1)
summit/schedule/templates/schedule/meeting.html (+26/-15)
summit/schedule/templates/schedule/meeting_review.html (+45/-0)
summit/schedule/templates/schedule/mobile.html (+4/-1)
summit/schedule/templates/schedule/nosession.html (+1/-0)
summit/schedule/templates/schedule/not-attending.html (+1/-0)
summit/schedule/templates/schedule/past_summit.html (+9/-7)
summit/schedule/templates/schedule/propose_meeting.html (+45/-0)
summit/schedule/templates/schedule/review.html (+115/-0)
summit/schedule/templates/schedule/schedule.html (+5/-5)
summit/schedule/templates/schedule/summit.html (+44/-37)
summit/schedule/templates/schedule/summit_info.html (+1/-1)
summit/schedule/templates/schedule/tracks.html (+25/-28)
summit/schedule/views.py (+90/-4)
summit/ubuntu_settings.py (+2/-1)
summit/urls.py (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #781670: Should be possible to subscribe other people to sessions directly in summit	Wishlist	Fix Released
Bug #929083: Move away from requiring blueprints to schedule a public meeting	High	Fix Released

Link a bug report

Related blueprints

312. By Chris Johnston on 2012-03-17

Resolve conflicts

311. By Chris Johnston on 2012-03-17

Fixes most theme issues

310. By Chris Johnston on 2012-03-11

Updating docs to reflect sites

309. By Chris Johnston on 2012-03-08

[r=mhall119] Fixes errors created in a previous merge that I failed to catch before pushing.

308. By Chris Johnston on 2012-03-08

Version 1.0.7 release

307. By Chris Johnston on 2012-03-08

[r=mhall119] This adds theme support to Summit to allow LC and UDS to have separate themes, as well as add a menu app that will allow each site to have it's own menu without having to mess with templates.

306. By Chris Johnston on 2012-03-08

[r=mhall119] Reverses the order of the past summits so that newest appears first.

305. By Chris Johnston on 2012-03-07

Version 1.0.6 Release

304. By Chris Johnston on 2012-03-07

[r=mhall119] Adds django sites to summit to allow for multiple different unique sites

303. By Chris Johnston on 2012-03-07

Fix conflict from production