Branch: refs/heads/master
Home: https://github.com/mikemintz/deme
Commit: 0bc8c42a04f085a1f3cdad97bb1c6a4875b1bb44
https://github.com/mikemintz/deme/commit/0bc8c42a04f085a1f3cdad97bb1c6a4875b1bb44
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-04-20 (Sat, 20 Apr 2013)

Changed paths:
M deme_django/cms/templates/default_layout.html
A deme_django/cms/templates/sample_layout.html
M deme_django/cms/templates/textdocument/show.html
M deme_django/modules/community_forum/templates/discussionboard/show.html
M deme_django/static/css/deme.css
M deme_django/static/less/deme/page-layout.less

Log Message:
-----------
style tweaks, adding sample layout to show how to use default layout from within deme


Commit: 242cd979c5687ce9a1fd9aaf837b4ddeb4bc9621
https://github.com/mikemintz/deme/commit/242cd979c5687ce9a1fd9aaf837b4ddeb4bc9621
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-04-24 (Wed, 24 Apr 2013)

Changed paths:
A deme_django/cms/migrations/0008_add_photo_field_to_agent.py
M deme_django/cms/models.py
M deme_django/cms/templates/templatetags/privacy_editor.html
M deme_django/cms/templatetags/item_tags.py
M deme_django/cms/views.py
R deme_django/modules/community_forum/migrations/0002_auto__add_discussionboard.py
M deme_django/modules/community_forum/models.py
R deme_django/modules/community_forum/templates/discussionboard/newdiscussion.html
R deme_django/modules/community_forum/templates/discussionboard/viewdiscussion.html
M deme_django/modules/community_forum/templatetags/air_extras.py
M deme_django/modules/community_forum/views.py
A deme_django/modules/discussionboard/__init__.py
A deme_django/modules/discussionboard/migrations/0001_initial.py
A deme_django/modules/discussionboard/migrations/__init__.py
A deme_django/modules/discussionboard/models.py
A deme_django/modules/discussionboard/templates/discussionboard/newdiscussion.html
A deme_django/modules/discussionboard/templates/discussionboard/show.html
A deme_django/modules/discussionboard/templates/discussionboard/viewdiscussion.html
A deme_django/modules/discussionboard/templatetags/__init__.py
A deme_django/modules/discussionboard/templatetags/discussion_extras.py
A deme_django/modules/discussionboard/urls.py
A deme_django/modules/discussionboard/views.py
M deme_django/modules/poll/models.py

Log Message:
-----------
merging mike's changes


Commit: 7fa9c69d1b4d4d98232ae18e6f4c5e9e20521f52
https://github.com/mikemintz/deme/commit/7fa9c69d1b4d4d98232ae18e6f4c5e9e20521f52
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-04-25 (Thu, 25 Apr 2013)

Changed paths:
M deme_django/cms/templates/default_layout.html
M deme_django/static/css/deme.css
A deme_django/static/javascripts/deme/jqgrid-helpers.js
M deme_django/static/less/deme/page-layout.less
M deme_django/static/less/deme/ui.jqgrid.less

Log Message:
-----------
made jqgrid resize on window resize


Compare: https://github.com/mikemintz/deme/compare/e90c15cb3c8f...7fa9c69d1b4d