Calen Pennington
d8f8d8c656
Merge branch 'release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
lms/djangoapps/courseware/courses.py
2012-07-24 08:52:50 -04:00
David Ormsbee
f22810524d
Use settings.SITE_NAME instead of hardcoded edx.org
2012-07-23 23:54:35 -04:00
David Ormsbee
614f4540d0
Place a domain_override to force Django to use edx.org instead of example.com.
...
Django hardcodes the subject line for password reset emails. You're supposed
to be able to override it with a properly named template, but that didn't
make it into 1.3.1 (which is what we're deploying on now). We're not using
the Sites framework at this time, so this was the "fix".
2012-07-23 23:41:45 -04:00
Bridger Maxwell
cfe1255432
Updated error messages for missing signup fields.
2012-07-23 20:03:38 -04:00
Calen Pennington
4984f9d804
Use django-pipeline to read course static files.
...
Requires the replacement of {COURSE_STATIC_URL} with just /static/
in about/overview.html files.
2012-07-23 16:22:45 -04:00
Calen Pennington
1d1a9173a4
Cleaning up pep8 violations
2012-07-23 14:44:40 -04:00
Calen Pennington
7ef8b6ac1e
Merge remote-tracking branch 'origin/release/1.0'
2012-07-23 14:27:29 -04:00
Calen Pennington
ebe67d2d7d
Merge remote-tracking branch 'origin/release/1.0'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-23 13:55:20 -04:00
David Ormsbee
b9c6e36616
Merge pull request #266 from MITx/cpennington/fix_tests
...
Cpennington/fix tests
2012-07-23 10:51:31 -07:00
Calen Pennington
7a34a8c342
Fix failing tests
2012-07-23 13:49:11 -04:00
Arjun Singh
11eaab2726
Added a filestore pointing at the directory of the file being run for xmodule tests
2012-07-23 13:48:02 -04:00
Matthew Mongeau
343f5a5393
Add dek to berkeley story.
2012-07-23 13:10:05 -04:00
David Ormsbee
3087ec6c91
Merge pull request #259 from MITx/feature/cpennington/minimize_js_requests
...
Consolidate javascript at the bottom of the page and in a minimal number of django-pipeline groups
2012-07-23 08:41:29 -07:00
Matthew Mongeau
ee72a725bb
Sort by course number. Simplify university grouping.
2012-07-23 11:38:01 -04:00
Calen Pennington
5915532a57
Consolidate code used for disabling USE_DJANGO_PIPELINE feature
2012-07-23 11:27:22 -04:00
David Ormsbee
9d81a8becb
Merge pull request #256 from MITx/dormsbee/change_reg_fields
...
Dormsbee/change reg fields
2012-07-22 16:13:52 -07:00
David Ormsbee
074fc24343
Fix up the signup modal for registration for the new fields.
2012-07-22 18:53:12 -04:00
David Ormsbee
44f5891fe2
Remove migration that conflicts with smooth_registration
2012-07-22 18:01:44 -04:00
David Ormsbee
7192c30985
Move migration for new reg fields so as not to conflict with smooth_registration
2012-07-22 17:52:55 -04:00
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
