Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

3122 Commits

Author SHA1 Message Date
David Ormsbee
942183d765 Merge branch 'release/1.0' into dormsbee/change_reg_fields 2012-07-22 17:50:46 -04:00
Bridger Maxwell
6caee537a1 Accidentally disabled cache_if_anonymous earlier. Re-enabling. 2012-07-22 17:40:27 -04:00
David Ormsbee
fa51046949 Merge pull request #253 from MITx/smooth_registration 
Smooth registration
 2012-07-22 13:49:59 -07:00
Bridger Maxwell
9afb0f8b78 Disabled student migration 0011, which had not net effect and was causing InnoDB errors. 2012-07-22 16:32:15 -04:00
Bridger Maxwell
ef32adc1c9 Changed log level to exception. 2012-07-22 16:30:41 -04:00
David Ormsbee
7f3a443409 Change over to new reg fields (styling still broken) 2012-07-22 15:35:24 -04:00
David Ormsbee
679b19c94d Merge pull request #240 from MITx/unenroll 
Unenroll
 2012-07-22 12:23:02 -07:00
Bridger Maxwell
61105134aa Cleaned up activation pages. Added "Log In" link to notice when anonymous user tries to enroll in course. 2012-07-22 14:52:49 -04:00
David Ormsbee
f213353613 Change how we display the start date to be internationally unambiguous. 2012-07-21 20:19:12 -04:00
Bridger Maxwell
2f4aba8042 If a user is anonymous when they click the enroll button, they will automatically be enrolled in the course if they immediately log in our create an account. 2012-07-21 17:52:28 -04:00
Bridger Maxwell
60b547273d Registering now temporarily logs you in. A message is displayed on the dashboard, reminding you to activate your account. Logging in shows a reminder about activating. 2012-07-21 15:31:48 -04:00
Bridger Maxwell
660d11dc16 Merge remote-tracking branch 'origin/release/1.0' into unenroll 
Conflicts:
	lms/urls.py
 2012-07-21 12:49:27 -04:00
Bridger Maxwell
dcafbca106 Added an index to course enrollment created field. 2012-07-21 12:44:25 -04:00
David Ormsbee
d6a67ef94d Merge pull request #250 from MITx/pmitros/release-fixes 
Tracking issues, import/export scripts
 2012-07-20 15:14:41 -07:00
Bridger Maxwell
f337baedb0 Renamed enrollment date to created. 2012-07-20 16:48:04 -04:00
Piotr Mitros
b21ea5a8a4 Added import/export scripts 2012-07-20 16:39:19 -04:00
Piotr Mitros
0fb8a7b1c8 Middleware password fix. Needs Cale's cleanup 2012-07-20 16:38:45 -04:00
Arjun Singh
d446081748 Added a filestore pointing at the directory of the file being run for xmodule tests 2012-07-20 13:31:11 -07:00
Bridger Maxwell
96b41e93d1 Removed old todo comment. 2012-07-20 14:33:30 -04:00
Bridger Maxwell
cdc2ff04f8 Added a datetime stamp to course enrollments. 2012-07-20 13:14:59 -04:00
Arjun Singh
25b6db762f Replacing startouttext/endouttext with text in examples. 2012-07-19 13:24:19 -07:00
David Ormsbee
17263dcd1b Keep courses and front page from erroring when we're missing an org in the data. 2012-07-19 16:19:16 -04:00
Arjun Singh
c87f9cd523 Added tests for ChoiceResponses. 2012-07-19 13:07:00 -07:00
Arjun Singh
6871326001 Adding information and an example for ChoiceResponse 2012-07-19 12:41:28 -07:00
Arjun Singh
85f5c93d92 Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in. 2012-07-19 10:25:51 -07:00
Arjun Singh
a23c51e39c Merged two multiple-choice-like response types into a single response; created inputtypes for checkboxes and radio buttons adn cleaned up the code a bit. Fixed checkbox responses. 2012-07-19 10:25:51 -07:00
Arjun Singh
ab11a5f7ed Allowing for form fields to submit more than one value; e.g. checkbox inputs. 2012-07-19 10:25:51 -07:00
ichuang
77dfc2ade7 Merge pull request #224 from MITx/fix_optioninput 
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
 2012-07-19 10:16:02 -07:00
ichuang
b814e6a08d Merge pull request #221 from MITx/kimth/lms-coderesponse 
CodeResponse restricted to only one answer field
 2012-07-19 08:25:03 -07:00
ichuang
6ce2ab6025 fix for py2.6 compatbility 2012-07-19 11:19:42 -04:00
ichuang
0903ba9c1f fix optioninput to preserve author's ordering of options 2012-07-19 11:15:14 -04:00
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