ichuang
0903ba9c1f
fix optioninput to preserve author's ordering of options
2012-07-19 11:15:14 -04:00
Calen Pennington
49ee12963f
Merge pull request #185 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-19 06:29:48 -07:00
kimth
cc9f9a9df8
queuekey generated from LoncapaProblem seed + system time
2012-07-18 14:10:41 -04:00
kimth
84eb3efa8a
Implemented 'initial_display' for CodeResponse
2012-07-18 11:08:17 -04:00
kimth
bb0601ff7a
Further tests of CorrectMap in CodeResponse unit testing
2012-07-18 08:54:54 -04:00
ichuang
2eaa6dbc25
Merge pull request #198 from dementrock/master
...
fixed the bug that you can enroll a course several times
2012-07-17 18:41:36 -07:00
Rocky Duan
7c480dd5b5
only enroll a given course once
2012-07-17 20:19:34 -04:00
kimth
1ddc3b560b
Deep copy of CorrectMap was implied by code. Made it actually the case
2012-07-17 18:33:56 -04:00
kimth
15b42b68eb
Unit tests for CodeResponse update_score
2012-07-17 18:20:03 -04:00
pmitros
b0328b245f
Merge pull request #195 from dementrock/master
...
Minor bug fix. Properly handles script tags where there are spaces before closing brace.
Code is also more elegant than original.
Note that this is not a security bug, as the fix indicated.
2012-07-17 14:49:34 -07:00
sidhanth rao
aded6a4fce
hello
2012-07-17 17:02:09 -04:00
kimth
631517ccdd
Queue callback consumes queuekey
2012-07-17 17:01:28 -04:00
Rocky Duan
ef2a8467e8
fix potential <script> tag escape bug
2012-07-17 17:00:36 -04:00
kimth
0b538fdac8
Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem
2012-07-17 16:58:55 -04:00
kimth
d9432a15ba
Drop immediate seed prior to queuekey generation
2012-07-17 15:26:40 -04:00
Galen Frechette
ba6346cb22
adds one image to about page
2012-07-17 14:54:35 -04:00
kimth
8c327eb07f
Moved imports to top of file
2012-07-17 14:44:20 -04:00
kimth
9b0e00efa2
Log both grading and queueing
2012-07-17 14:41:52 -04:00
Galen Frechette
e65895459a
improves course about page header, adds blog post images, works on static page layouts
2012-07-17 14:29:20 -04:00
Galen Frechette
c5ce0bdfea
updates copy on about contact and faq, tweeks home page header
2012-07-17 13:02:46 -04:00
Galen Frechette
d55cd78c73
updates and imporves design of the home page header
2012-07-17 12:56:29 -04:00
bridger
04b8dbe0d5
Merge pull request #179 from MITx/course_start
...
Course start
2012-07-17 09:54:17 -07:00
Bridger Maxwell
2f4cf23b73
Merge remote-tracking branch 'origin/master' into course_start
...
Conflicts:
common/djangoapps/student/views.py
2012-07-17 12:53:27 -04:00
bridger
08ddd03b5d
Merge pull request #184 from MITx/template_caching
...
edX caching
2012-07-17 09:49:21 -07:00
Bridger Maxwell
615f11e27b
Merge remote-tracking branch 'origin/master' into template_caching
2012-07-17 12:47:53 -04:00
Calen Pennington
02a30ef05a
Merge pull request #188 from MITx/dormsbee/portal_display_tweaks
...
Dormsbee/portal display tweaks
2012-07-17 08:42:42 -07:00
Bridger Maxwell
938f0d1995
Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now.
2012-07-17 11:12:42 -04:00
kimth
934b37c195
Remove json import from capa_problem -- needed for debug
2012-07-17 11:12:23 -04:00
David Ormsbee
b4a8417e70
Use Course.number, remove final exam and content length from the course sidebar (do we have that data yet?)
2012-07-17 11:03:49 -04:00
kimth
803b0c4fd0
Callback uses userid rather than username
2012-07-17 10:59:27 -04:00
David Ormsbee
28fc3ec18a
Add overview.html, a simple one page place where course staff can control a course about page.
2012-07-17 10:54:21 -04:00
Bridger Maxwell
8ebaf8a761
Merge remote-tracking branch 'origin/master' into course_start
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
lms/urls.py
2012-07-17 10:52:39 -04:00
kimth
269468ba6e
CorrectMap.is_queued and .is_right_queuekey defaults to False if answer_id not found
2012-07-17 10:47:10 -04:00
kimth
0958485b46
update_score: edit existing CorrectMap rather than starting with empty CorrectMap
2012-07-17 10:31:21 -04:00
Calen Pennington
c85cf38a3f
Merge pull request #187 from MITx/dormsbee/portal_display_tweaks
...
Dormsbee/portal display tweaks
2012-07-17 06:26:03 -07:00
Calen Pennington
f6cc97a9ce
Minor formatting change in OSX docs for CMS import
2012-07-17 09:22:17 -04:00
Calen Pennington
17c3d068cf
Add basic documentation of importing data into the CMS for development
2012-07-17 09:20:54 -04:00
David Ormsbee
c0e8dc1b69
Remove duplicate entries of courses.
2012-07-17 08:25:17 -04:00
David Ormsbee
373db8704d
Add number property to CourseDescriptor and switch templates to use it.
2012-07-17 08:22:15 -04:00
David Ormsbee
27ec1b4dcf
Change course listing to show course numbers + title
2012-07-17 08:22:15 -04:00
David Ormsbee
e8516c5a3e
Shorten course about link
2012-07-17 08:22:15 -04:00
David Ormsbee
d20eb07722
Allow UTF-8 chars in about sections.
2012-07-17 08:22:15 -04:00
Bridger Maxwell
d38903ac35
Merge remote-tracking branch 'origin/master' into template_caching
...
Conflicts:
lms/static/sass/application.css
2012-07-16 23:33:40 -04:00
Galen Frechette
767469381b
renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling
2012-07-16 22:23:43 -04:00
Galen Frechette
600aff59a6
imporves course object header typography
2012-07-16 19:29:02 -04:00
Bridger Maxwell
36408a8d5a
Removing lms/static/sass/application.css again.
2012-07-16 17:33:51 -04:00
Galen Frechette
96361c3fd5
adds icons to course about page, user nav and dashboard, adds styles to activation pages
2012-07-16 17:29:28 -04:00
Bridger Maxwell
e7fa42261d
Ignoring +lms/static/sass/application.css
2012-07-16 17:11:27 -04:00
ichuang
ffb341f6b3
Merge pull request #186 from MITx/ccp0101/capa_pythonpath
...
Ccp0101/capa pythonpath
2012-07-16 14:06:28 -07:00
Bridger Maxwell
d690a0de24
Removing compiles application.css file.
2012-07-16 17:03:31 -04:00
