Branch: refs/heads/master
Home: https://github.com/mikemintz/deme
Commit: 42c607f224831d8582d8f50c8885b47d554d4724
https://github.com/mikemintz/deme/commit/42c607f224831d8582d8f50c8885b47d554d4724
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/docs/usage.rst

Log Message:
-----------
more docs about the layout


Commit: 48fa195d3bd092192810b95dad74301b466c5e51
https://github.com/mikemintz/deme/commit/48fa195d3bd092192810b95dad74301b466c5e51
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/modules/discussionboard/views.py

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


Commit: dc3b1b59abb798602224cdd599d583c05799c326
https://github.com/mikemintz/deme/commit/dc3b1b59abb798602224cdd599d583c05799c326
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/cms/templates/item/list_bare.html
M deme_django/cms/views.py

Log Message:
-----------
Create header above table when displaying listed search results:
"These <item-type>s contain '<phrase>'


Commit: b0acdc229c679c61f82c9f2f80dcd7a0c6ed5c6a
https://github.com/mikemintz/deme/commit/b0acdc229c679c61f82c9f2f80dcd7a0c6ed5c6a
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/cms/templatetags/item_tags.py

Log Message:
-----------
bug fix - "Add to <collection>" does nothing


Commit: f40427c2bf82d12cca66f98135d35f64af1c50f4
https://github.com/mikemintz/deme/commit/f40427c2bf82d12cca66f98135d35f64af1c50f4
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/cms/templates/templatetags/listgridbox.html
M deme_django/cms/templatetags/item_tags.py

Log Message:
-----------
Get rid of "join" for non-groups


Commit: ae6e3d41bd6a0727e882a517d5c4e69be9c8d37a
https://github.com/mikemintz/deme/commit/ae6e3d41bd6a0727e882a517d5c4e69be9c8d37a
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/cms/templatetags/item_tags.py

Log Message:
-----------
Changed group check to work with potential subclasses


Commit: 1a9fe15f26aa83ed6b5b1b055b22f33cd2ac5bc2
https://github.com/mikemintz/deme/commit/1a9fe15f26aa83ed6b5b1b055b22f33cd2ac5bc2
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/cms/templatetags/item_tags.py

Log Message:
-----------
Add join/leave to Actions menu when viewing group with permission to join or as a member


Commit: 2a682a0ef89a3d7314f30f87bc3c4b74a4b74d65
https://github.com/mikemintz/deme/commit/2a682a0ef89a3d7314f30f87bc3c4b74a4b74d65
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-07-01 (Mon, 01 Jul 2013)

Changed paths:
M deme_django/modules/poll/models.py

Log Message:
-----------
Change "Eligibles" to "Eligible Group" in Poll


Compare: https://github.com/mikemintz/deme/compare/3b9f431229e3...2a682a0ef89a