lp://staging/~mboehn/lancms/lc2-django1.7

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/lancms at revision 106

Mathias Bøhn Grytemark: Approve (self-review) on 2015-01-11

Diff: 1525 lines (+94/-1296)

18 files modified

core/migrations/0001_initial.py (+79/-77)
core/migrations/0002_auto__add_field_userprofile_phone.py (+0/-72)
core/migrations/0003_auto__chg_field_userprofile_postalcode.py (+0/-70)
core/migrations/0004_auto__add_organization.py (+0/-83)
core/migrations/0005_events.py (+0/-83)
core/migrations/0006_add_model_event.py (+0/-90)
core/migrations/0007_auto__add_field_organization_is_active__chg_field_organization_owner.py (+0/-93)
core/migrations/0008_auto__add_field_organization_urlslug.py (+0/-88)
core/migrations/0009_auto__add_field_organization_externalurl.py (+0/-89)
core/migrations/0010_auto__add_unique_organization_urlslug.py (+0/-87)
core/migrations/0011_auto__add_field_event_is_active__add_field_event_urlslug__add_field_ev.py (+0/-108)
core/migrations/0012_auto__add_field_event_startdate__add_field_event_enddate.py (+0/-102)
core/migrations/0013_auto__del_field_event_startdate__del_field_event_enddate__add_field_ev.py (+0/-126)
core/migrations/0014_auto__add_field_event_about.py (+0/-95)
fabfile.py (+1/-1)
lancms2/settings.py (+3/-21)
requirements.txt (+10/-10)
templates/base.html (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1407297: Upgrade to Django 1.7

Critical

Fix Committed

Link a bug report

Related blueprints

109. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

Upgraded the rest of the requirements.

108. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

Updated template after upgrade to Django 1.7.

107. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

Upgraded django-allauth. Seems to work

106. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

Removed South settings

105. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

Upgraded to Django 1.7.
Also removed South and upgraded django-debug-toolbar.

104. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

fabric deployment didn't work. virtualenv needed python3 specified

103. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

updated i18n

102. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

indenting error in something related to lak's eventsettings. I just made it run so I can branch off

101. By Mathias Bøhn Grytemark <email address hidden> on 2015-01-03

tested new version of django-countries. seems to work.

100. By Launchpad Translations on behalf of lancms on 2015-01-02

Launchpad automatic translations update.