Commit Graph

22621 Commits

Author SHA1 Message Date
Calen Pennington
1924609b10 Move schematic.js into capa_module js includes 2012-07-24 16:14:02 -04:00
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
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
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
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
6bcc78f767 Make lms jasmine tests mostly pass 2012-07-24 16:13:59 -04:00
John Jarvis
703293f785 adding enabled features to aws.py 2012-07-24 15:56:42 -04:00
Rocky Duan
a06cc229a0 watch/unwatch threads; display current vote 2012-07-24 15:34:17 -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
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
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
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
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
David Ormsbee
48d69faf4e Merge pull request #286 from MITx/dormsbee/help
Dormsbee/help
2012-07-23 17:40:58 -07:00
David Ormsbee
e53ea2f81d Add common tech problems to help page 2012-07-23 20:39:26 -04:00
David Ormsbee
38d54f42ca Let people know courses are free. <sigh> 2012-07-23 20:38:09 -04:00
Bridger Maxwell
80f46c216b Capitalized facebook on contact page. 2012-07-23 19:56:10 -04:00
Bridger Maxwell
45bdcbdcae Unecessary capitalized letter on contact page. 2012-07-23 19:55:07 -04:00
Bridger Maxwell
e3b023b0ac Removed unecessary quotation mark from contact page. 2012-07-23 19:54:03 -04:00
Bridger Maxwell
7c48ab2509 Changed press dates to international format. 2012-07-23 19:53:08 -04:00
jarv
6666c2fe8a Merge pull request #285 from MITx/release_fixes
Fixed bugs caused by modal cloning. Now, only video modals are cloned.
2012-07-23 16:25:03 -07:00
Rocky Duan
8c3931ba0a removed unnecessary args 2012-07-23 19:24:28 -04:00
Kyle Fiedler
157af877cb Merge branch 'kf-multicourse-design' into release/1.0 2012-07-23 19:20:49 -04:00
Kyle Fiedler
3008c17730 Added bottom margin for articles in help 2012-07-23 19:19:50 -04:00
Bridger Maxwell
1e1e777e04 Fixed bugs caused by modal cloning. Now, only video modals are cloned. 2012-07-23 19:19:27 -04:00
Kyle Fiedler
18ec7ca8e8 Added social links to the footer of the press release 2012-07-23 19:17:22 -04:00
Rocky Duan
d6be47d942 refactored out thread rendering; vote 2012-07-23 19:03:36 -04:00
David Ormsbee
503a7b5d12 Finish a pass at the tech sections of the job page, add new edX fellow description 2012-07-23 18:58:09 -04:00
David Ormsbee
ee7caad181 Change jobs contact to be jobs@edx.org for all 2012-07-23 18:58:09 -04:00
David Ormsbee
799da8de3c Merge pull request #283 from MITx/release_fixes
Fix for appending course enroll to login/register form
2012-07-23 15:49:57 -07:00
Bridger Maxwell
973e474a9c Fix for appending course enroll to login/register form, now that the form is being cloned. 2012-07-23 18:46:02 -04:00
David Ormsbee
2fb5bb6e86 Merge pull request #282 from MITx/kf-multicourse-design
Added styles for help page
2012-07-23 15:45:48 -07:00
Kyle Fiedler
6aac776a33 Added styles for help page 2012-07-23 18:40:58 -04:00