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

Commit: fef8ec45b288d16547896cbf84fed1579910ae1f
https://github.com/mikemintz/deme/commit/fef8ec45b288d16547896cbf84fed1579910ae1f
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2011-08-17 (Wed, 17 Aug 2011)

Changed paths:
M deme_django/cms/templates/default_layout.html
A deme_django/static/javascripts/grid.locale-en.js
A deme_django/static/javascripts/jquery.jqGrid.min.js
A deme_django/static/stylesheets/ui.jqgrid.css

Log Message:
-----------
Added jqGrid widget to static files and default layout (not used in code
yet)


Commit: 7b14dfc87b62bd54a2c2ee3974cfb88c780b865d
https://github.com/mikemintz/deme/commit/7b14dfc87b62bd54a2c2ee3974cfb88c780b865d
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2011-08-18 (Thu, 18 Aug 2011)

Changed paths:
M deme_django/TODO

Log Message:
-----------
Added a bug in TODO


Commit: 072310367aced74ff7ab9cc2c18e29b7d43fed7c
https://github.com/mikemintz/deme/commit/072310367aced74ff7ab9cc2c18e29b7d43fed7c
Author: Mike Mintz <mikemintz@cs.stanford.edu>;
Date: 2011-08-18 (Thu, 18 Aug 2011)

Changed paths:
M deme_django/TODO
M deme_django/modules/event/templates/event/show.html
A deme_django/modules/poll/__init__.py
A deme_django/modules/poll/migrations/__init__.py
A deme_django/modules/poll/models.py
A deme_django/modules/poll/static/exportguide/gcal1.png
A deme_django/modules/poll/static/exportguide/gcal2.png
A deme_django/modules/poll/static/exportguide/ical1.png
A deme_django/modules/poll/static/exportguide/ical2.png
A deme_django/modules/poll/static/exportguide/ical3.png
A deme_django/modules/poll/static/exportguide/webmail1.png
A deme_django/modules/poll/static/exportguide/webmail2.png
A deme_django/modules/poll/static/exportguide/webmail3.png
A deme_django/modules/poll/static/jscalendar/calendar-en.js
A deme_django/modules/poll/static/jscalendar/calendar-setup.js
A deme_django/modules/poll/static/jscalendar/calendar-win2k-cold-2.css
A deme_django/modules/poll/static/jscalendar/calendar.js
A deme_django/modules/poll/templates/Poll/poll.html
A deme_django/modules/poll/templates/Poll/proposition.html
A deme_django/modules/poll/templates/Poll/propositionresponse.html
A deme_django/modules/poll/templatetags/__init__.py
A deme_django/modules/poll/templatetags/event_extras.py
A deme_django/modules/poll/urls.py
A deme_django/modules/poll/views.py
M deme_django/modules/project/models.py
A deme_django/modules/recursiveproject/__init__.py
A deme_django/modules/recursiveproject/migrations/0001_initial.py
A deme_django/modules/recursiveproject/migrations/__init__.py
A deme_django/modules/recursiveproject/models.py
A deme_django/modules/recursiveproject/static/exportguide/gcal1.png
A deme_django/modules/recursiveproject/static/exportguide/gcal2.png
A deme_django/modules/recursiveproject/static/exportguide/ical1.png
A deme_django/modules/recursiveproject/static/exportguide/ical2.png
A deme_django/modules/recursiveproject/static/exportguide/ical3.png
A deme_django/modules/recursiveproject/static/exportguide/webmail1.png
A deme_django/modules/recursiveproject/static/exportguide/webmail2.png
A deme_django/modules/recursiveproject/static/exportguide/webmail3.png
A deme_django/modules/recursiveproject/static/jscalendar/calendar-en.js
A deme_django/modules/recursiveproject/static/jscalendar/calendar-setup.js
A deme_django/modules/recursiveproject/static/jscalendar/calendar-win2k-cold-2.css
A deme_django/modules/recursiveproject/static/jscalendar/calendar.js
A deme_django/modules/recursiveproject/templates/project/recursiveproject.html
A deme_django/modules/recursiveproject/templates/project/recursiveproject_dependency.html
A deme_django/modules/recursiveproject/templatetags/__init__.py
A deme_django/modules/recursiveproject/templatetags/event_extras.py
A deme_django/modules/recursiveproject/urls.py
A deme_django/modules/recursiveproject/views.py

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

Conflicts:
deme_django/TODO


Compare: https://github.com/mikemintz/deme/compare/107379f...0723103