Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
kimth
ff4716ef76 Further simplification after restricting to one answer field 2012-07-19 10:57:14 -04:00
kimth
bff86c32ca CodeResponse restricted to only one answer field 2012-07-19 10:47:12 -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
Matthew Mongeau
a64ddc771a Display courses in university related columns. 2012-07-18 17:36:12 -04:00
David Ormsbee
9ec8c9934e Merge pull request #209 from MITx/dormsbee/uni_profile 
Dormsbee/uni profile
 2012-07-18 13:39:43 -07:00
David Ormsbee
16eeb43a04 Add University Profile page with images and text blurbs 2012-07-18 16:17:12 -04:00
David Ormsbee
a3d48cf22c Merge pull request #207 from MITx/mm-remove-preferred-language 
Mm remove preferred language
 2012-07-18 12:24:36 -07:00
kimth
cc9f9a9df8 queuekey generated from LoncapaProblem seed + system time 2012-07-18 14:10:41 -04:00
David Ormsbee
753181642e Merge pull request #205 from MITx/course_images 
Course images
 2012-07-18 11:08:20 -07:00
Bridger Maxwell
f25dbc0854 Added {COURSE_STATIC_URL} format key for about section html. Changed get_about_section to be get_course_about_section in courseware.courses. 2012-07-18 13:48:20 -04:00
Matthew Mongeau
73df314159 wip 2012-07-18 13:40:16 -04:00
bridger
dbf0bf34d8 Merge pull request #204 from MITx/dormsbee/at_a_glance 
Add some more info the the "About" Course page "at a glance" section
 2012-07-18 10:39:34 -07:00
David Ormsbee
588f115b33 Add support for optional end_date, effort, and prerequisites info on course_about 2012-07-18 13:17:31 -04:00
Matthew Mongeau
dd0cd57ead Add date_of_birth 2012-07-18 13:02:56 -04:00
Matthew Mongeau
456054a261 Cleanup. 2012-07-18 13:02:31 -04:00
Matthew Mongeau
67221b0725 Added countries and other demographics to be stored in db. 2012-07-18 13:02:07 -04:00
Matthew Mongeau
7e25f39f62 Change stored gender value for students.models.UserProfile 
* Changed from 'male', 'female', and 'other' to 'm', 'f', and 'o'
 2012-07-18 13:00:40 -04:00
kimth
84eb3efa8a Implemented 'initial_display' for CodeResponse 2012-07-18 11:08:17 -04:00
David Ormsbee
7acfdcd16d Ignore registrations for Courses that can't be found 2012-07-18 10:49:45 -04:00
Bridger Maxwell
0b097f470d Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 2012-07-18 10:37:07 -04:00
Bridger Maxwell
c24c88022b Changed wording in emails to remove any 6.002x or MITx reference. 2012-07-18 10:36:55 -04:00
David Ormsbee
824ea6f72e Merge pull request #199 from MITx/dormsbee/course_images 
Dormsbee/course images
 2012-07-18 07:24:23 -07:00
kimth
bb0601ff7a Further tests of CorrectMap in CodeResponse unit testing 2012-07-18 08:54:54 -04:00
David Ormsbee
8768189db1 Video slot only appears in course about page if there is a video (note: url is still fixed). 2012-07-18 01:29:00 -04:00
David Ormsbee
a12e628fb1 Display real course start date in course about page 2012-07-17 22:52:19 -04: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
Bridger Maxwell
e4a3b261d4 Moved enroll and course_about to courseware, because they depend on lms. 2012-07-17 17:09:20 -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
kimth
9b0e00efa2 Log both grading and queueing 2012-07-17 14:41:52 -04:00
David Ormsbee
8bd0f0183b Merge pull request #193 from MITx/mm-rss-parser-fixes 
Store rss instead of parser in memcache.
 2012-07-17 11:27:58 -07:00
Matthew Mongeau
384f24064e Store rss instead of parser in memcache. 2012-07-17 14:26:20 -04:00
Bridger Maxwell
996fec4b63 Added a check that course enrolmments don't already exist before creating them. 2012-07-17 14:01:26 -04:00
Bridger Maxwell
9f84d9b6fd Merge remote-tracking branch 'origin/master' into release/1.0 2012-07-17 13:56:44 -04:00
Bridger Maxwell
1a8d999663 Added a migration with indexes on course enrollment and a unique constraint. This involves a migration that first drops the table, because there may be non-unique data there already. 2012-07-17 13:54:54 -04:00
Matthew Mongeau
171e16f177 Use local feed as default 2012-07-17 12:56:30 -04:00
Matthew Mongeau
2bfe0cb92d Add parsed rss entries to home page with caching 2012-07-17 12:56:28 -04: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 Maxwell
615f11e27b Merge remote-tracking branch 'origin/master' into template_caching 2012-07-17 12:47:53 -04: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
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
David Ormsbee
373db8704d Add number property to CourseDescriptor and switch templates to use it. 2012-07-17 08:22:15 -04:00