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

490 Commits

Author SHA1 Message Date
Calen Pennington
c3ba8817e9 Correctly add course_dirs to static files 2012-07-12 16:06:05 -04:00
bridger
bc21cdfaa5 Merge pull request #167 from MITx/utf8_migration_merge 
Utf8 migration merge
 2012-07-12 07:34:45 -07:00
Bridger Maxwell
d739e61ebd Added check to make sure utf8 migration only runs on mysql. Had to add in certificates module. 2012-07-11 16:33:46 -04:00
John Jarvis
c6bf160002 removing {marketing,marketing-ie,print}.scss from PIPELINE_CSS 2012-07-11 15:53:56 -04:00
Calen Pennington
100422a7f3 Make collectstatic run to completion 2012-07-11 10:14:51 -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
David Ormsbee
2f90b27707 Only load DATA_DIR subdirs if DATA_DIR exists (so not during tests) 2012-07-10 13:56:51 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Calen Pennington
5406b9bb40 Make /static/ urls work in the courseware 2012-07-10 12:54:47 -04:00
Calen Pennington
dbfcd78c88 Get custom_tag templates using system.filestore so that they work in multicourse 2012-07-10 10:46:18 -04:00
kimth
024789dabf Made data identifiers consistent with master branch of 'content-mit-6002x' 2012-07-09 19:01:25 -04:00
ichuang
0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging 2012-07-08 19:03:29 -04:00
ichuang
9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx 
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
 2012-07-08 16:52:36 -04:00
Matthew Mongeau
5109253378 Revert "workarounds for get_about_section" 
This reverts commit 05e1bcf4f1.
 2012-07-06 17:23:56 -04:00
Matthew Mongeau
05e1bcf4f1 workarounds for get_about_section 2012-07-06 17:13:53 -04:00
Calen Pennington
a1f98e76cd WIP: Merging multicourse and xmodule descriptor changes 
The basic form has been fleshed out. Things still to do:
1) Extend get_course interface to the rest of modulestore
2) Make courses actually load
3) Make org/course/maybe others metadata attributes for course_module (see xml_module), so
that they are loaded/saved on import/export to xml
 2012-07-05 21:56:52 -04:00
Calen Pennington
9d1dc37b44 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	cms/djangoapps/contentstore/management/commands/import.py
	cms/djangoapps/contentstore/views.py
	cms/envs/common.py
	cms/envs/dev.py
	cms/envs/test.py
	cms/static/sass/README.txt
	cms/static/sass/_base.scss
	cms/static/sass/_calendar.scss
	cms/static/sass/base-style.scss
	cms/templates/base.html
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/module-dropdown.html
	cms/templates/widgets/navigation.html
	cms/templates/widgets/problem-edit.html
	cms/urls.py
	common/djangoapps/pipeline_mako/__init__.py
	common/djangoapps/util/views.py
	common/lib/capa/capa_problem.py
	common/lib/capa/templates/textinput_dynamath.html
	common/lib/mitxmako/middleware.py
	common/lib/mitxmako/shortcuts.py
	common/lib/mitxmako/template.py
	common/lib/xmodule/capa_module.py
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/test_files/symbolicresponse.xml
	common/lib/xmodule/test_files/test_files/symbolicresponse.xml
	common/lib/xmodule/tests/__init__.py
	common/lib/xmodule/tests/test_files/symbolicresponse.xml
	common/lib/xmodule/vertical_module.py
	common/lib/xmodule/video_module.py
	common/lib/xmodule/x_module.py
	lms/djangoapps/courseware/content_parser.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/static/coffee/spec/helper.coffee
	lms/static/coffee/spec/modules/video/video_player_spec.coffee
	lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
	lms/static/coffee/src/modules/problem.coffee
	lms/static/coffee/src/modules/sequence.coffee
	lms/static/coffee/src/modules/video/video_player.coffee
	lms/static/coffee/src/modules/video/video_volume_control.coffee
	lms/static/js/vendor/jquery-1.6.2.min.js
	lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
	lms/static/sass/application.scss
	lms/static/sass/courseware/_sequence-nav.scss
	lms/static/sass/courseware/_video.scss
	lms/templates/main.html
	lms/urls.py
	rakefile
	requirements.txt
 2012-07-05 16:22:50 -04:00
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -04:00
ichuang
200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation 
- issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
 2012-06-26 23:00:25 -04:00
David Ormsbee
bc8c077379 Add info page support with multiple courses 2012-06-21 10:59:48 -04:00
David Ormsbee
3859c2be19 Add scanning of data directory for courses. 
These are then displayed at /courses.
 2012-06-21 10:59:48 -04:00
Calen Pennington
4cb285f1f9 Switch the cms over to using django-pipeline 2012-06-21 10:59:46 -04:00
ichuang
9edc6bbd43 add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-21 10:59:38 -04:00
Calen Pennington
338547343e Get the cms up to the point of rendering a template 2012-06-21 10:59:36 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms 
Conflicts:
	rakefile
	requirements.txt
 2012-06-18 13:46:33 -04:00
Matthew Mongeau
a08be52780 Skin settings. 2012-06-14 15:46:10 -04:00
Matthew Mongeau
47126dc686 wip 2012-06-13 14:50:25 -04:00
Calen Pennington
967a6ee2e7 Merge pull request #94 from MITx/capa-cleanup 
Capa cleanup
 2012-06-12 12:26:49 -07:00
Matthew Mongeau
d0819071c7 PROJECT_ROOT is needed for coffeescript paths 2012-06-11 13:57:37 -04:00
ichuang
6f14acee9e add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-10 22:34:30 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00
David Ormsbee
bd2a44ade9 Merge pull request #90 from MITx/cpennington/capa_django_deps 
Removing references to django.conf.settings from capa/responsetypes.py
 2012-06-07 16:18:08 -07:00
Bridger Maxwell
8a523997b1 Added setting for new changes to django-pipeline. Only sass is recompiled each time now. 2012-06-07 16:49:51 -04:00
Calen Pennington
c3e730a0a2 Add the capa module templates to the list of mako templates 2012-06-07 16:44:57 -04:00
Calen Pennington
91b306b35a Moving capa and xmodule out of djangoapps/courseware, and removing django references from them 2012-06-06 14:15:32 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00