Calen Pennington
|
8575ed439d
|
Merge branch 'master' into dogfood
Conflicts:
djangoapps/courseware/capa/responsetypes.py
djangoapps/courseware/module_render.py
djangoapps/courseware/modules/html_module.py
djangoapps/courseware/modules/seq_module.py
djangoapps/courseware/modules/x_module.py
djangoapps/courseware/views.py
templates/main.html
templates/problem.js
templates/textbox.html
|
2012-06-05 14:38:49 -04:00 |
|
Calen Pennington
|
b574dcb8e8
|
Check for None with is rather than ==
|
2012-06-01 12:18:43 -04:00 |
|
ichuang
|
27f5826e34
|
content_parser: use logging for errors
|
2012-05-29 23:22:10 -04:00 |
|
ichuang
|
4280c791a3
|
added (temporary?) debugging statements
|
2012-05-27 20:12:06 -04:00 |
|
Piotr Mitros
|
2c2072dae3
|
Converted to use more semantic tags. Working snapshot.
|
2012-05-27 07:39:09 -04:00 |
|
Calen Pennington
|
1b5a9bc547
|
Moving the 'id' prefix back into content_parser where it exists
|
2012-05-25 11:04:05 -04:00 |
|
Calen Pennington
|
dea0d28ace
|
Url encode memcache keys, rather than writing a new encoding scheme. Also use fasthash, rather than md5
|
2012-05-25 10:52:04 -04:00 |
|
Isaac Chuang
|
ad44882835
|
Ike's changes to enable multicourse, new response types, etc.
|
2012-05-16 21:18:47 -04:00 |
|
Isaac Chuang
|
232e758c7a
|
Integrating some of Ike's courseware changes
|
2012-05-13 19:36:01 -04:00 |
|
Calen Pennington
|
47c832647c
|
Call user_groups even for anonymous users
|
2012-05-07 14:56:17 -04:00 |
|
Calen Pennington
|
0871d95f98
|
Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository
|
2012-04-30 15:18:47 -04:00 |
|
Calen Pennington
|
8ecb979339
|
Cleaning up imports
|
2012-04-30 14:36:16 -04:00 |
|
Calen Pennington
|
e6015eb9e7
|
Make showanswer and rerandomize propogate downwards in course.xml
|
2012-04-30 14:30:48 -04:00 |
|
Calen Pennington
|
1bc3835fe6
|
Splitting files into subdirectories in preparation for merge
|
2012-03-19 11:10:44 -04:00 |
|