Branch: refs/heads/master
Home: https://github.com/mikemintz/deme
Commit: 5240a497d5207d1031c8acadf3562d2404096209
https://github.com/mikemintz/deme/commit/5240a497d5207d1031c8acadf3562d2404096209
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2013-07-08 (Mon, 08 Jul 2013)

Changed paths:
M deme_django/cms/base_viewer.py
M deme_django/cms/models.py
M deme_django/cms/templates/authenticationmethod/login.html
M deme_django/cms/templates/authenticationmethod/loginmenuitem.html
M deme_django/cms/templates/base_layout.html
M deme_django/cms/templates/demesetting/modify.html
M deme_django/cms/templates/includes/adminbar.html
M deme_django/cms/templates/includes/adminbar_widgets/search.html
M deme_django/cms/templates/includes/metabar.html
M deme_django/cms/templates/includes/metabar_swap.html
M deme_django/cms/templates/item/admin.html
M deme_django/cms/templates/item/collectionpermissions.html
M deme_django/cms/templates/item/diff.html
M deme_django/cms/templates/item/edit.html
M deme_django/cms/templates/item/edit_locked.html
M deme_django/cms/templates/item/globalpermissions.html
M deme_django/cms/templates/item/itempermissions.html
M deme_django/cms/templates/item/list_bare.html
M deme_django/cms/templates/item/new_bare.html
M deme_django/cms/templates/item/privacy.html
M deme_django/cms/templates/templatetags/listgridbox.html
M deme_django/cms/templates/textdocument/show.html
M deme_django/cms/templates/viewerrequest/show.html
M deme_django/cms/views.py
M deme_django/docs/installation.rst
M deme_django/modules/community_forum/templates/communityforumparticipant/loginmenuitem.html
M deme_django/modules/demeaccount/templates/demeaccount/loginform.html
M deme_django/modules/demeaccount/templates/demeaccount/loginmenuitem.html
M deme_django/modules/discussionboard/templates/discussionboard/newdiscussion.html
M deme_django/modules/discussionboard/templates/discussionboard/show.html
M deme_django/modules/discussionboard/templates/discussionboard/viewdiscussion.html
M deme_django/modules/event/templates/calendar/show.html
M deme_django/modules/newsroll/templates/newsroll/show.html
M deme_django/modules/openid/templates/openidaccount/loginmenuitem.html
M deme_django/modules/poll/templates/poll/OldapproveNPoll
M deme_django/modules/poll/templates/poll/agreedisagreepoll.html
M deme_django/modules/poll/templates/poll/choosenpoll.html
M deme_django/modules/poll/templates/poll/odpSurvey.html
M deme_django/modules/poll/templates/poll/poll.html
M deme_django/modules/poll/templates/poll/writein.html
M deme_django/modules/project/templates/project/project.html
M deme_django/modules/symsys/templates/base_symsys.html
M deme_django/modules/symsys/templates/symsysgroup/show.html
M deme_django/requirements.txt
M deme_django/settings.py_EXAMPLE

Log Message:
-----------
Upgraded django to 1.5.1 and south to 0.8


Commit: 09dfe1f9e3ce987418bd33024e5d67067002af03
https://github.com/mikemintz/deme/commit/09dfe1f9e3ce987418bd33024e5d67067002af03
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2013-07-08 (Mon, 08 Jul 2013)

Changed paths:
M deme_django/cms/templates/includes/adminbar_widgets/account.html
M deme_django/cms/templates/templatetags/listgridbox.html
M deme_django/cms/templatetags/item_tags.py
M deme_django/static/css/deme.css
M deme_django/static/less/deme/ui.jqgrid.less

Log Message:
-----------
Merge branch 'master' of github.com:mikemintz/deme


Compare: https://github.com/mikemintz/deme/compare/674d14e15eef...09dfe1f9e3ce