lp:~cjohnston/summit/track-page

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:summit at revision 235

Nigel Babu (community): Approve on 2011-12-15

Chris Johnston: Needs Resubmitting on 2011-12-13

Diff: 642 lines (+521/-4)

14 files modified

summit/media/css/layout.css (+6/-0)
summit/schedule/admin/__init__.py (+1/-0)
summit/schedule/admin/leadadmin.py (+32/-0)
summit/schedule/migrations/0008_add_track_description.py (+191/-0)
summit/schedule/migrations/0009_add_track_leads.py (+204/-0)
summit/schedule/models/__init__.py (+1/-1)
summit/schedule/models/leadmodel.py (+37/-0)
summit/schedule/models/trackmodel.py (+1/-1)
summit/schedule/templates/schedule/schedule.html (+3/-1)
summit/schedule/templates/schedule/summit.html (+1/-0)
summit/schedule/templates/schedule/tracks.html (+34/-0)
summit/schedule/views.py (+9/-0)
summit/templates/base.html (+0/-1)
summit/urls.py (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

239. By Chris Johnston on 2011-12-13

Adds nigelb's whitespace fix

238. By Chris Johnston on 2011-12-12

uggh

237. By Chris Johnston on 2011-12-12

Trying to please nigel

236. By Chris Johnston on 2011-12-12

Fixes schedule page

235. By Chris Johnston on 2011-12-11

Removes conflict, adds lead to display in admin

234. By Chris Johnston on 2011-12-11

[r=nigelbabu] Removes videographer and adds video fields.

233. By Chris Johnston on 2011-12-11

[r=nigelbabu] Adds a sponsorship reviews state to summit so that links only show up when needed.

232. By Chris Johnston on 2011-12-03

[r=mhall119] Adds versioning to summit

231. By Chris Johnston on 2011-12-03

[r=mhall119] Updates files to match what is on production server.

230. By Chris Johnston on 2011-12-01

[r=nigelbabu] Fixes the context_processor bug that was created when next_summit was moved to common