Calen Pennington
cb6c7640c8
Get the video module pointing to the correct static files directory, without relying on get_html replacement
2012-07-24 16:14:01 -04:00
Calen Pennington
19a3c14ab9
Split out code to replace /static urls in get_html into a separate module so that it can be used in CMS previews
2012-07-24 16:14:01 -04:00
Calen Pennington
4c82f35e2d
Put data_dir into metadata for all XModuleDescriptors loaded from xml
2012-07-24 16:14:01 -04:00
Calen Pennington
5f86fcfbff
Standardize how Problem and Video modules are loaded in the LMS and CMS preview pane
2012-07-24 16:14:00 -04:00
Calen Pennington
987fe17358
Load js fragments in order, so that Subview is loaded before the classes that use it
2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb
Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work
2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c
Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms
2012-07-24 16:13:59 -04:00
Calen Pennington
3fa636e060
Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory
2012-07-24 16:13:59 -04:00
Calen Pennington
1395e5d55c
Empty Locations are now legal
2012-07-24 16:13:59 -04:00
Calen Pennington
9458e53988
Adding stripped down 6002x course for testing, along with CMS test for edit pages for same
2012-07-24 16:13:51 -04:00
Calen Pennington
6bf0e093bc
Add tests for the edit page for the toy course, and make sure that exporting to github sets up the git repo properly
2012-07-24 15:05:07 -04:00
Calen Pennington
45144ec4ce
Remove the live preview code from the html and raw modules, in preparation for updating the preview on save
2012-07-24 15:05:07 -04:00
Calen Pennington
15ac476781
Display preview html on the module edit page. Javascript for previews doesn't yet function
2012-07-24 15:05:07 -04:00
Calen Pennington
a81015a91b
Move I4xSystem into xmodule so that the definition is available to the CMS
2012-07-24 15:05:07 -04:00
Calen Pennington
97cdb67b49
Log error messages when failing to parse xml from a string that contain context of where the error occurred in the string (in definition_to_xml)
2012-07-24 15:05:07 -04:00
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
