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

953 Commits

Author SHA1 Message Date
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
David Ormsbee
729070763f Convert @mitx.mit.edu emails to @edx.org emails 2012-07-23 23:43:34 -04:00
Kyle Fiedler
e6465e420a Changed around the css 2012-07-23 12:38:21 -04:00
Calen Pennington
d19e50aeb6 Merge remaining js files into django-pipeline groups 2012-07-23 11:27:22 -04:00
Calen Pennington
5dd4e19c0b Move vendor js into a single file 2012-07-23 10:24:50 -04:00
Bridger Maxwell
9ebac1bdd7 Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware. 2012-07-23 08:18:37 -04:00
David Ormsbee
5330396844 Merge pull request #251 from MITx/kf-multicourse-design 
Kf multicourse design
 2012-07-21 09:39:32 -07:00
Calen Pennington
64b92c35cc Include ie fixes in via django-pipeline 2012-07-20 19:54:07 -04:00
Bridger Maxwell
7d8ded7bf3 Removed UpdateCacheMiddleware, which wasn't doing anything. 2012-07-20 14:06:49 -04:00
Bridger Maxwell
9f84d9b6fd Merge remote-tracking branch 'origin/master' into release/1.0 2012-07-17 13:56:44 -04:00
Matthew Mongeau
171e16f177 Use local feed as default 2012-07-17 12:56:30 -04:00
Matthew Mongeau
2bfe0cb92d Add parsed rss entries to home page with caching 2012-07-17 12:56:28 -04:00
Bridger Maxwell
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-17 12:53:27 -04:00
Bridger Maxwell
8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py
 2012-07-17 10:52:39 -04:00
Bridger Maxwell
bde93aea99 Merge remote-tracking branch 'origin/master' into template_caching 
Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html
 2012-07-16 16:19:26 -04:00
Bridger Maxwell
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
Calen Pennington
f889c9a099 Actually exclude things outside of the mitx repo, rather than only including those things 2012-07-16 12:36:52 -04:00
Calen Pennington
04469a4e8e Strip out STATICFILES_DIRS that aren't in the mitx repo when running unit tests 2012-07-16 12:13:19 -04:00
Bridger Maxwell
eb7ae3540c Added a simple, specific cache for the static_template_pages. 2012-07-16 09:12:50 -04:00
Bridger Maxwell
f9de962365 Merge remote-tracking branch 'origin/master' into course_start 2012-07-13 13:40:01 -04:00
Bridger Maxwell
60da23042f Adding a setting to disable the wiki in deployment. 2012-07-13 13:36:38 -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
Bridger Maxwell
ecc50314f7 Added a decorator that prevents access to course pages until the course has started. 2012-07-13 10:31:36 -04:00
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
Calen Pennington
cfd6890d68 Merge remote-tracking branch 'origin/master' into cpennington/cms-github 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2012-07-10 08:50:54 -04:00
kimth
024789dabf Made data identifiers consistent with master branch of 'content-mit-6002x' 2012-07-09 19:01:25 -04:00
Matthew Mongeau
949efb62e9 Got courses page working... mostly. 2012-07-09 11:27:45 -04:00
ichuang
3a664753b4 minor changes - test this branch with more courses (8.01x, 6.00x) 2012-07-08 22:05:21 -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
ce4cea0e3e Don't fail if no NOSE_COVER_HTML_DIR is set 2012-07-05 13:07:29 -04:00
Calen Pennington
87e612f0f2 Don't swallow messages going to the root logger 2012-07-05 08:48:08 -04:00
ichuang
edeb81ce63 change 8.01x default chapter 2012-07-04 15:50:39 -04:00
ichuang
ce74aa798d fix name of 6.002x course to correspond to change in course.xml 2012-07-03 12:16:33 -04:00