Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,560 Commits 1 Branch 0 Tags
6ea5f6a493aeaa971ffb4e5cd44f41cc463e6b95
Commit Graph

3560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
6ea5f6a493 Move imageinput.js to capa_module js includes 2012-07-24 16:14:02 -04:00
Calen Pennington
7e4d3c8b35 Modularize sequence coffeescript in prepration for CMS preview 2012-07-24 16:14:02 -04:00
Victor Shnayder
a8c70d3531 add todo 2012-07-24 16:14:02 -04:00
Victor Shnayder
5988d1f47f Organize and de-duplicate imports in mongo.py 2012-07-24 16:14:02 -04:00
Victor Shnayder
ba733fa5d1 add options to dev_mongo env 2012-07-24 16:14:01 -04:00
Victor Shnayder
49e8d08c1e Add get_courses() to mongo modulestore 
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
 2012-07-24 16:14:01 -04:00
Victor Shnayder
51ae0d5484 improve docstrings and formating in mongo.py 2012-07-24 16:14:01 -04:00
Calen Pennington
61446b0544 Make javascript for video previews work correctly 2012-07-24 16:14:01 -04:00
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
5a9ba65571 Add youtube api to CMS for video module 2012-07-24 16:14:00 -04:00
Calen Pennington
4798c596f0 Load preview modules with actual preview elements 2012-07-24 16:14:00 -04:00
Calen Pennington
230dd88afd Add global methods used by video module to CMS 2012-07-24 16:14:00 -04:00
Calen Pennington
2d570f7c54 Load preview modules when a cms edit page is opened 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
3ba03d79aa Remove old generated static content that was accidentally checked in 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
6bcc78f767 Make lms jasmine tests mostly pass 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
39b59484a6 Re-add login requirement to save_item 2012-07-24 15:05:07 -04:00
Calen Pennington
6b28786784 Use the new name for item_id in contentstore.views.save_item 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
1aba46de55 Be consistent with the metadata key name for the data directory 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
57d8361acb Escape characters from raw xml data going into the text box so that the round-trip doesn't get rid of neccessary xml escaping 2012-07-24 15:05:06 -04:00
Calen Pennington
4aab04e4ab Merge pull request #290 from MITx/feature/cpennington/disable-start-date-flag 
Add feature flag for disabling course start dates
 2012-07-24 11:46:58 -07:00
Calen Pennington
98910a2d49 Address review comments 2012-07-24 14:46:46 -04:00
Calen Pennington
66f79251dc Add feature flag for disabling course start dates 2012-07-24 13:22:50 -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
1d5e42f175 Remove very large, no longer used images 2012-07-24 00:05:13 -04:00
David Ormsbee
cf549df5e4 Merge pull request #289 from MITx/dormsbee/hack_fix_pwd_reset 
Dormsbee/hack fix pwd reset
 2012-07-23 20:55:57 -07:00
David Ormsbee
f22810524d Use settings.SITE_NAME instead of hardcoded edx.org 2012-07-23 23:54:35 -04:00
David Ormsbee
d688b7d249 Merge branch 'release/1.0' into dormsbee/hack_fix_pwd_reset 2012-07-23 23:43:48 -04:00
David Ormsbee
729070763f Convert @mitx.mit.edu emails to @edx.org emails 2012-07-23 23:43:34 -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
David Ormsbee
749740eb07 Actually, the bg play YT bug was there because of the lack of a class on the section. Re-removing the YouTube title. 2012-07-23 23:05:06 -04:00
David Ormsbee
75ba3ebbd4 Reverting the YouTube title hiding commit because it brings back the 'video playing in the background when you hit back' bug 2012-07-23 23:02:04 -04:00
David Ormsbee
8b503eb1ef Remove YouTube title from showing in homepage video (thanks, Arjun). 2012-07-23 22:59:45 -04:00
David Ormsbee
2a37f7a921 Merge pull request #288 from MITx/dormsbee/hack_fix_pwd_reset 
Bad hardcoded hack fix to password reset.
 2012-07-23 19:31:02 -07:00
David Ormsbee
8db59825f1 Bad hardcoded hack fix to password reset. 
We used to use Django templates and the Sites framework. At some point we
stopped, but this was leftover. The site_name no longer gets set properly.
It's probably a config issue, but not one I want to deal with right before
release, so I'm hardcoding it to link to the prod edx.org site until we
 can sort what's what in the morning.
 2012-07-23 22:27:33 -04:00
David Ormsbee
7e8986fce9 Merge pull request #287 from MITx/release_fixes 
Release fixes
 2012-07-23 18:03:21 -07:00
Bridger Maxwell
e7bb31af5b Changed unenroll to unregister on dashboard. 2012-07-23 20:46:39 -04:00