Calen Pennington
|
6d246f0685
|
Merge remote-tracking branch 'origin/master' into ps-cms-backbone
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/coffee/unit.coffee
cms/templates/index.html
cms/templates/widgets/sequence-edit.html
|
2012-07-10 08:55:45 -04:00 |
|
Kyle Fiedler
|
93f8f7685a
|
Added more wip and fixed issue with after
|
2012-07-09 10:37:37 -04:00 |
|
Kyle Fiedler
|
c8da987436
|
Added new icons for all of the content
|
2012-07-09 10:04:20 -04:00 |
|
Kyle Fiedler
|
0cb4781e43
|
Rearranged the filter and sort bar and made it consistant
|
2012-07-09 10:04:20 -04:00 |
|
Prem Sichanugrist
|
a9aa5d9ea0
|
Update code base on changes in master
|
2012-07-05 15:25:04 -04:00 |
|
Prem Sichanugrist
|
5c85412dfa
|
Nested subview is working
|
2012-07-05 09:38:51 -04:00 |
|
Calen Pennington
|
3cf29af8fe
|
Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content
|
2012-07-02 10:17:59 -04:00 |
|
Kyle Fiedler
|
3081258836
|
Refactored the css and fixed some smaller bugs
|
2012-06-25 11:21:24 -04:00 |
|
Kyle Fiedler
|
5908d844b8
|
Added styles to be more consistant across pages
|
2012-06-25 11:21:24 -04:00 |
|
Calen Pennington
|
69290c18c3
|
Live editing of html modules implemented, but no saving to the backend
|
2012-06-21 15:33:52 -04:00 |
|