Calen Pennington
cc22125971
Remove old pre-compiled css
2012-06-19 14:30:19 -04:00
Calen Pennington
cac53cf1a0
Switch the cms over to using django-pipeline
2012-06-19 14:30:19 -04:00
Calen Pennington
282372736d
Add comment about None in Locations
2012-06-19 14:24:14 -04:00
Calen Pennington
47bf71ae10
Remove extra word in doc string
2012-06-19 14:17:05 -04:00
Calen Pennington
b91a1d48b6
Remove reference to instructor module
2012-06-19 11:44:54 -04:00
Calen Pennington
7914baccaa
Change name of XModuleSystem to DescriptorSystem at usage sites
2012-06-19 11:36:22 -04:00
Calen Pennington
6fb35c4773
Cleanup intertwined descriptor and keystore code
2012-06-19 11:31:13 -04:00
Calen Pennington
5562def5b7
Add documentation of mongo query syntax usage
2012-06-19 11:29:48 -04:00
Calen Pennington
677c25ee68
Remove unused code
2012-06-19 11:29:14 -04:00
Calen Pennington
58085f8ed9
Remove unused urls
2012-06-19 11:29:14 -04:00
Calen Pennington
6daa0f1aa0
Fix string layout for readability
2012-06-19 11:29:14 -04:00
Calen Pennington
f1ffff1dc0
Cleanup and test Location, and add the ability to specify a revision
2012-06-19 11:29:13 -04:00
Calen Pennington
703103e767
Get rid of references to askbot
2012-06-19 11:25:41 -04:00
Calen Pennington
0379d1cb95
Search for course specifically in navigation view
2012-06-19 11:25:29 -04:00
Calen Pennington
199f94aa99
Conform to new TODO standards
2012-06-19 11:24:22 -04:00
Calen Pennington
fb0deb9971
Merge pull request #121 from MITx/pmitros/documentation
...
Rapid merge procedure
2012-06-19 08:01:53 -07:00
Piotr Mitros
25834412ce
Documentation for rapid merge
2012-06-18 17:40:39 -04:00
Piotr Mitros
e108c2cd44
Rapid pull/history
2012-06-18 17:09:17 -04:00
Piotr Mitros
7700a9d082
Merge branch 'master' into pmitros/documentation
2012-06-18 17:06:35 -04:00
Piotr Mitros
8bad7dc99d
Code standards
2012-06-18 17:06:17 -04:00
Calen Pennington
ef6630d733
Merge pull request #120 from MITx/cpennington/cms
...
CMS Beginnings
2012-06-18 13:01:39 -07:00
Calen Pennington
605b1ae0fd
Remove old template that is no longer relevant
2012-06-18 14:24:45 -04:00
Calen Pennington
9ff0effd71
Remove copy/paste instructor module. It was a bad idea anyway. =)
2012-06-18 14:08:15 -04:00
Calen Pennington
f8434b3a6d
Move libraries that can only be imported in the context of django into common/djangoapps
2012-06-18 13:48:26 -04:00
Calen Pennington
34a696cdf6
Merge branch 'master' into cpennington/cms
...
Conflicts:
rakefile
requirements.txt
2012-06-18 13:46:33 -04:00
Calen Pennington
79e81d69b4
Delay initializition of the MongoKeyStore until required
2012-06-18 13:41:53 -04:00
Calen Pennington
51cd7566a0
Merge pull request #119 from MITx/victor/render-path-cleanup
...
put lambda function back in, as requested during code review
2012-06-18 10:21:41 -07:00
Calen Pennington
5404345b1f
Make tests pass when running on cms
2012-06-18 13:21:06 -04:00
Victor Shnayder
7e73f0ede0
put lambda function back in, as requested during code review
2012-06-18 13:12:47 -04:00
Calen Pennington
328b2df7c5
Ignore .egg-info directories
2012-06-18 12:21:12 -04:00
Calen Pennington
4ce08cc358
Merge pull request #118 from MITx/victor/render-path-cleanup
...
Small cleanups in response to Calen + Piotr's comments
2012-06-18 09:12:55 -07:00
Calen Pennington
5ae2668e9c
Merge pull request #43 from MITx/pmitros/same-values
...
Courseware can have same random seed in multiple problems for exam.
2012-06-18 09:10:55 -07:00
Piotr Mitros
f391e9c51c
Courseware can have same random seed in multiple problems for exam. Slight hack.
2012-06-18 12:10:44 -04:00
Victor Shnayder
96cbb3d33b
Small cleanups in response to Calen + Piotr's comments
2012-06-18 12:04:10 -04:00
Calen Pennington
40a950f152
Merge pull request #105 from MITx/ps-video-volume
...
Add video volume control to video player
2012-06-18 09:02:02 -07:00
Calen Pennington
b344e51c0f
Merge pull request #116 from MITx/victor/render-path-cleanup
...
Victor/render path cleanup
2012-06-18 08:59:10 -07:00
Calen Pennington
e67dfb70e4
Add categories and XModuleDescriptors for all module types that are used at the top level of a course
2012-06-18 11:22:36 -04:00
Calen Pennington
fe45de3833
Read week headings from mongodb
2012-06-18 11:20:57 -04:00
ichuang
748398fca1
for externalresponse - fallback to script code if <answer> code not provided
2012-06-17 22:36:39 -04:00
ichuang
2d543f100c
Merge branch 'capa-include' of github.com:MITx/mitx into stable-edx4edx
2012-06-15 22:43:06 -04:00
ichuang
ce74f9779f
modify capa_problem to add <include file="foo"> functionality
2012-06-15 22:40:02 -04:00
ichuang
0dbe63bc63
remove quickedit link from accordion (no need for manual gitreload anymore)
...
now using github WebHook
2012-06-15 21:44:19 -04:00
Victor Shnayder
e061e86424
Clean and refactor courseware/views.py and module_render.py
...
* Refactor index() so that it makes sense to me and hopefully others :)
* Rename preloaded cache of student modules to student_module_cache
* Fix line length and whitespace throughout
* add docstrings and other comments
* a few behavior-preserving tweaks to the code to make it clearer.
* Separate codepaths for with-module and without-module in index view
* Remove default chapter + section, since they don't exist anyway in course.xml
2012-06-15 18:29:04 -04:00
Victor Shnayder
15ac575301
added rednose to requirements (adds color output to nose)
2012-06-15 18:29:03 -04:00
Victor Shnayder
5ad2824c59
fix typo in comment in student view
2012-06-15 18:28:54 -04:00
ichuang
923a47d761
add 7.03x to dev_ike.py
2012-06-15 14:54:26 -04:00
Kyle Fiedler
cb1f6838ba
Added more styles and markup for sequence
2012-06-15 13:27:24 -04:00
Kyle Fiedler
93478d53df
Added scratch on the calendar view and added handles on the calendar view
2012-06-15 10:11:04 -04:00
Kyle Fiedler
57b605dbd3
Added more styels to the section view and default section view
2012-06-14 17:15:30 -04:00
Matthew Mongeau
fdc8de44a9
Nav bar on courses page.
2012-06-14 17:06:00 -04:00
