lp:~mboehn/lancms/lc2-allauth

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:lancms at revision 22

Mathias Bøhn Grytemark: Approve on 2014-01-08

Diff: 555 lines (+177/-199)

21 files modified

README (+4/-0)
core/admin.py (+0/-17)
core/common.py (+5/-0)
core/models.py (+0/-33)
core/tests.py (+0/-16)
core/urls.py (+0/-7)
core/views.py (+0/-9)
lancms2/settings.py (+29/-2)
lancms2/urls.py (+12/-10)
register/models.py (+0/-3)
register/tests.py (+0/-16)
register/views.py (+0/-1)
requirements.txt (+2/-0)
templates/account/profile.html (+33/-0)
templates/base.html (+59/-0)
templates/index.html (+33/-14)
ticket/admin.py (+0/-6)
ticket/models.py (+0/-31)
ticket/tests.py (+0/-16)
ticket/urls.py (+0/-8)
ticket/views.py (+0/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

33. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

added a simple profile page to show that it's working

32. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

added font-awesome in base-template. it's easy and GPL-compatible.

31. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

added link to some easy instructions to get started with the facebook-app-thingy

30. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

some tweaks to make the allauth-templates work with my base

29. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

added django-debug-toolbar

28. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

added log out-option in base template

27. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-08

added 'django.core.context_processors.request' and fixed some indenting

26. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-07

and we get an error with socialauth... will look into it

25. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-07

working on a sane template for testing

24. By Mathias Bøhn Grytemark <email address hidden> on 2014-01-07

trying to add bootstrap for some quick templates