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

43 Commits

Author SHA1 Message Date
Calen Pennington
d4377d4ada Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS 2012-09-25 10:10:44 -04:00
Calen Pennington
2554413291 Hook up link to create modules from templates 2012-09-25 10:10:44 -04:00
Calen Pennington
2223d2007b Only display the LMS link if it's set up, and don't error if it isn't 2012-09-25 09:18:54 -04:00
Victor Shnayder
6017aa698b add ENABLE_DISCUSSION_SERVICE: "False" to cms config 2012-09-06 17:28:12 -04:00
Calen Pennington
c4bed2c128 Add basic authentication support for requests made to the xqueue server 2012-08-14 11:59:47 -04:00
Calen Pennington
91b6bb649c Move queue interface url and auth into configuration, rather than hardcoding it 2012-08-14 11:59:46 -04:00
Calen Pennington
6abc2d733f Merge pull request #370 from MITx/feature/bridger/django1.4 
Feature/bridger/django1.4
 2012-08-08 12:52:33 -07:00
Bridger Maxwell
7ae0005afd Fixed CMS setting for 1.4 transition. 2012-08-08 13:30:43 -04:00
Calen Pennington
80b8529f2f Merge branch 'hotfix/1.0.4' 
Conflicts:
	common/djangoapps/util/middleware.py
 2012-08-08 11:05:26 -04:00
Calen Pennington
8059008bde Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors 2012-08-06 10:13:12 -04:00
Calen Pennington
1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms 2012-07-30 14:04:39 -04:00
Calen Pennington
6bd9cd6c28 Add management command for syncing with github 2012-07-30 12:59:28 -04:00
Calen Pennington
8a0270ea2b Allow for modular css from XModules, and split capa module css out as a test 2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59 Move Logger and *withPrefix javascript into a common location 2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware 2012-07-24 16:14:03 -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
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
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
15ac476781 Display preview html on the module edit page. Javascript for previews doesn't yet function 2012-07-24 15:05:07 -04:00
David Ormsbee
729070763f Convert @mitx.mit.edu emails to @edx.org emails 2012-07-23 23:43:34 -04:00
Victor Shnayder
c176a7fe92 Add account creation and login to CMS 
* connect up views from student app
* Add initial @login_required decorators on the protected views
* Add tests for some of the basic functionality
 2012-07-16 13:34:04 -04:00
Victor Shnayder
339e9a68f4 Make end-to-end tests work again 
* NOTE: successfully running the tests depends on an updated version of
  django-pipeline, which fixes a unicode bug (efaba4ac63)

Config changes:
* Use separate db for the cms
* Run collectstatic before running tests--needed to get everything in the right place for loading pages
* fix some paths related to this
* Turn off JS compressor for CMS
* add empty test_root/uploads dir

Code changes:
* Add cms tests to check that home page and signup pages load
* Add cms account creation test
* Make github sync tests clean out repo dirs before running.
 2012-07-13 11:51:33 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms. 
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
 2012-07-13 11:51:32 -04:00
Calen Pennington
f0a049a29e Don't depend on the mitx directory being named that, so that tests will run in jenkins where mitx is checked out as workspace 2012-07-11 08:53:56 -04:00
Matthew Mongeau
347483203a Unscope URLCONF from mitx 2012-07-10 17:37:42 -04:00
Calen Pennington
6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
 2012-07-10 08:55:45 -04:00
Prem Sichanugrist
f60af340ea Add Jasmine suite to CMS 2012-07-05 18:44:56 -04:00
Prem Sichanugrist
0e87ada0fd Do nested search for CoffeeScript compilation 2012-07-05 09:38:50 -04:00
Calen Pennington
b0ff3053b9 Add development code for pushing CMS changes to github 2012-07-03 19:06:07 -04:00
Calen Pennington
feef179e3e Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing 
Conflicts:
	cms/envs/common.py
 2012-06-29 12:11:35 -04:00
Calen Pennington
919f8cf261 Import x_module using the full path 2012-06-28 11:28:42 -04:00
Calen Pennington
e9a00ffc5a Parse XModuleDescriptors on import using from_xml 
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
 2012-06-26 11:56:21 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Calen Pennington
69290c18c3 Live editing of html modules implemented, but no saving to the backend 2012-06-21 15:33:52 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
b91a1d48b6 Remove reference to instructor module 2012-06-19 11:44:54 -04:00
Calen Pennington
703103e767 Get rid of references to askbot 2012-06-19 11:25:41 -04:00
Calen Pennington
b9befbafcd Add contentstore from cms proto as a baseline for importing and views for the cms 2012-06-13 11:42:50 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00