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

78 Commits

Author SHA1 Message Date
Kyle Fiedler
9d14033f6b Added some styles for the top navigation and for the sidebar navigation 2012-07-31 16:29:01 -04:00
Kyle Fiedler
d30ae5389e Added fix for videos start to zero out colors and mit styles 2012-07-31 14:18:42 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Kyle Fiedler
257ce0430f Moved vendor sass files to css folder and included them in 2012-07-30 17:39:19 -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
Victor Shnayder
59defd33b6 Formatting and little bugfixes 
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
 2012-07-27 16:09:25 -04:00
Victor Shnayder
cb30850759 Config for integration tests 
* move askbot repo into mitx as a submodule
* set settings as in 85865f7221
* remove test_mongo env.
* Refactor tests to use new config structure.
* Add real integration tests--not working due to bugs in course xml. Turned off.
 2012-07-27 16:09:25 -04:00
Calen Pennington
6afe1709e7 Merge pull request #306 from MITx/arjun/compile_coffee 
Compiling coffee files in course data directories on startup.
 2012-07-26 13:31:46 -07:00
Arjun Singh
73261719ce Added TODO near temporary code. 2012-07-26 13:14:00 -04:00
Calen Pennington
73d6565fac Merge remote-tracking branch 'origin/hotfix/1.0.1' 
Conflicts:
	common/djangoapps/student/views.py
 2012-07-26 09:05:57 -04:00
Arjun Singh
3002260de5 Compiling coffee files in course data directories on startup. 2012-07-25 21:45:01 -04:00
Matthew Mongeau
bd9da89fe9 Move press articles to json. 2012-07-25 17:31:34 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -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
50f27bcfb7 Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers 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
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
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
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
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