lp:~ris/loco-team-portal/fix-552762

Branch merges

Propose for merging

Ready for review for merging into lp:loco-team-portal

Adnane Belmadiaf: Needs Fixing on 2013-04-01

Chris Johnston: Needs Fixing on 2013-01-09

Diff: 1729 lines (+1420/-11) (has conflicts)

14 files modified

Makefile (+1/-1)
loco_directory/events/forms.py (+101/-5)
loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py (+184/-0)
loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py (+185/-0)
loco_directory/events/migrations/0012_auto__add_teameventvenue.py (+196/-0)
loco_directory/events/migrations/0013_historical_venue.py (+195/-0)
loco_directory/events/migrations/0014_auto__del_field_teamevent_venue.py (+190/-0)
loco_directory/events/models.py (+10/-2)
loco_directory/events/views.py (+114/-3)
loco_directory/media/css/venues.css (+10/-0)
loco_directory/media/js/jquery.formset.js (+170/-0)
loco_directory/media/js/venues.js (+3/-0)
loco_directory/templates/events/team_event_new.html (+26/-0)
loco_directory/templates/events/team_event_update.html (+35/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #552762: LD needs to be able to allow for adding multiple locations for one event

Medium

In Progress

Link a bug report

Related blueprints

556. By Robert Sajdok on 2013-06-29

South Changes for team event venue.

555. By Robert Sajdok on 2013-02-07

Resolve conflicts

554. By Robert Sajdok on 2013-01-09

LP: #552762: "LD needs to be able to allow for adding multiple locations for one event"
Add image files and migration.

553. By Robert Sajdok on 2013-01-09

LP: #552762: "LD needs to be able to allow for adding multiple locations for one event"

552. By Adnane Belmadiaf on 2012-09-15

* Break up past meetings by year/month Props Ris

551. By Adnane Belmadiaf on 2012-09-13

[r=chrisjohnston] * Fixed the common app coding style

550. By Adnane Belmadiaf on 2012-09-10

Added support for syncdb/migrate

549. By Adnane Belmadiaf on 2012-09-09

* Added a param to rety when the command fails

548. By Adnane Belmadiaf on 2012-09-08

* Fix python path
* Added required SSO fields

547. By Adnane Belmadiaf on 2012-09-07

Added Vagrant support