← Back to branch summary

~michael.nelson/open-goal-tracker/trunk

~michael.nelson/open-goal-tracker/trunk

Viewing all changes in revision 48.

Committer: Michael Nelson
Date: 2010-08-23 12:08:35 UTC
mfrom: (47.1.4 extract-css-cols-to-base-laout)
Revision ID: michael.nelson@canonical.com-20100823120835-b46n3jf7wqhpoh5a

Merged extract-css-cols-to-base-laout

files removed:
dev_project/templates

dev_project/templates/doit

dev_project/templates/doit/base.html

files renamed:
src/doit/doc/mockups/user-goal.bmml => src/doit/doc/mockups/eg-goal-1-enjoy-guitar.bmml

src/doit/doc/mockups/user-goal2.bmml => src/doit/doc/mockups/eg-goal-2-facilitate-learning.bmml

files modified:
src/doit/templates/doit/base.html

src/doit/templates/doit/current_user_goal.html

src/doit/views.py

Show diffs side-by-side

added added

removed removed

dev_project/templates/

dev_project/templates/doit/

dev_project/templates/doit/base.html

src/doit/doc/mockups/eg-goal-2-facilitate-learning.bmml

src/doit/templates/doit/base.html

src/doit/templates/doit/current_user_goal.html

src/doit/views.py

Older »