Branch: refs/heads/master
Home: https://github.com/mikemintz/deme

Commit: 9be065930c66dff78a1379a5625311e984af5491
https://github.com/mikemintz/deme/commit/9be065930c66dff78a1379a5625311e984af5491
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-08-30 (Tue, 30 Aug 2011)

Changed paths:
M deme_django/cms/templates/group/show.html
M deme_django/modules/event/templates/event/show.html
M deme_django/modules/event/views.py
M deme_django/modules/poll/models.py
M deme_django/modules/poll/templates/poll/approvenpoll.html
M deme_django/modules/poll/views.py
M deme_django/modules/recursiveproject/models.py
M deme_django/modules/recursiveproject/templates/project/recursiveproject.html
M deme_django/modules/recursiveproject/views.py

Log Message:
-----------
Completed UI for ApproveN poll. Still need to fix all permissions.


Commit: e7ade2f604d1e107ca5f5fa318bde2035456e069
https://github.com/mikemintz/deme/commit/e7ade2f604d1e107ca5f5fa318bde2035456e069
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-08-30 (Tue, 30 Aug 2011)

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

Log Message:
-----------
Still need to do project permissions and change the model for Group


Commit: cb29c33a2810ede36802c3f6eb14cc340e19678f
https://github.com/mikemintz/deme/commit/cb29c33a2810ede36802c3f6eb14cc340e19678f
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-08-30 (Tue, 30 Aug 2011)

Changed paths:
M deme_django/cms/templates/textdocument/show.html

Log Message:
-----------
Trying to figure out how to get the divs to line up without using frames


Commit: 4041a9e021ffe172ff136a08f4333e2f4766c577
https://github.com/mikemintz/deme/commit/4041a9e021ffe172ff136a08f4333e2f4766c577
Author: Jimmy Tobin <jtobin1@stanford.edu>;
Date: 2011-08-30 (Tue, 30 Aug 2011)

Changed paths:
M deme_django/TODO

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


Compare: https://github.com/mikemintz/deme/compare/2f7dbb6...4041a9e