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

Changed paths:
M deme_django/cms/templates/group/show.html
M deme_django/cms/views.py
M deme_django/static/css/deme.css
A deme_django/static/img/empty-profile-pic.jpg
M deme_django/static/less/deme/profiles.less

Log Message:
-----------
updated group page with symsys group as a basis


Commit: 7cc1b9955e0c9d8de50d24bf384803c5aed670d7
https://github.com/mikemintz/deme/commit/7cc1b9955e0c9d8de50d24bf384803c5aed670d7
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-05-04 (Sat, 04 May 2013)

Changed paths:
M deme_django/cms/templates/agent/show.html
M deme_django/cms/templates/group/show.html
M deme_django/cms/views.py
M deme_django/static/css/deme.css
M deme_django/static/less/deme/profiles.less

Log Message:
-----------
agent profiles without photo now show default image, don't show pagination when only one page, change default per group page to 12


Commit: acbe22814b273f7408d3519b3fc6fa2e4ae428ba
https://github.com/mikemintz/deme/commit/acbe22814b273f7408d3519b3fc6fa2e4ae428ba
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-05-04 (Sat, 04 May 2013)

Changed paths:
M deme_django/cms/templatetags/item_tags.py
A deme_django/static/javascripts/deme/metabar-ck.js
M deme_django/static/javascripts/deme/metabar.js

Log Message:
-----------
added edit permission to actions menu, fixed bug with metabar section not expanding when already loaded


Commit: e27058ecca77607d6b45cdd3b005ac4018636b8f
https://github.com/mikemintz/deme/commit/e27058ecca77607d6b45cdd3b005ac4018636b8f
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-05-04 (Sat, 04 May 2013)

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

Log Message:
-----------
show edit permissions on actions menu


Commit: 38c5ebe71637d2bc2c72955d8d7227b5e92e68ca
https://github.com/mikemintz/deme/commit/38c5ebe71637d2bc2c72955d8d7227b5e92e68ca
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-05-05 (Sun, 05 May 2013)

Changed paths:
M deme_django/cms/templates/default_layout.html
M deme_django/cms/templates/includes/metabar.html
M deme_django/static/css/deme.css
M deme_django/static/javascripts/deme/metabar-ck.js
M deme_django/static/javascripts/deme/metabar.js
M deme_django/static/less/deme/metabar.less

Log Message:
-----------
added buttons to resize metadata area


Commit: 1582a9fb1d70ad652c1ff2782496a65b7116f75e
https://github.com/mikemintz/deme/commit/1582a9fb1d70ad652c1ff2782496a65b7116f75e
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-05-05 (Sun, 05 May 2013)

Changed paths:
M deme_django/cms/templates/templatetags/privacy_editor.html
M deme_django/cms/templatetags/item_tags.py
M deme_django/static/css/deme.css
M deme_django/static/less/deme/privacy-editor.less

Log Message:
-----------
different affordances for permission buttons


Commit: 3a11bc113f36733d2fa7bcb09ba40acc7567bb5a
https://github.com/mikemintz/deme/commit/3a11bc113f36733d2fa7bcb09ba40acc7567bb5a
Author: Michael Huang <mikhuang@gmail.com>;
Date: 2013-05-05 (Sun, 05 May 2013)

Changed paths:
M deme_django/cms/models.py
M deme_django/cms/templatetags/item_tags.py
R deme_django/modules/community_forum/templates/discussionboard/show.html
M deme_django/modules/discussionboard/views.py
M deme_django/modules/poll/models.py
A deme_django/modules/poll/templates/poll/agreedisagreepoll.html
R deme_django/modules/poll/templates/poll/approvenpoll.html
M deme_django/modules/poll/views.py
M deme_django/script/create_initial_data.py

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


Compare: https://github.com/mikemintz/deme/compare/a71cebb31a39...3a11bc113f36