Commit Graph

2256 Commits

Author SHA1 Message Date
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
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Calen Pennington
328b2df7c5 Ignore .egg-info directories 2012-06-18 12:21:12 -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
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
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
Calen Pennington
6fee7928fc Successfully read course children out of mongodb 2012-06-14 16:16:15 -04:00
Calen Pennington
788321be48 Merge pull request #104 from MITx/ps-fix-feedback-calculator
Create Calculator and Feedback form on every page
2012-06-14 09:27:02 -07:00
Prem Sichanugrist
01ca43346f Use existential operator 2012-06-14 12:16:29 -04:00
Kyle Fiedler
3eb7c69b23 Continued on week view styles 2012-06-14 11:55:49 -04:00
Kyle Fiedler
ed69957f62 Added volume images 2012-06-13 15:32:39 -04:00
Kyle Fiedler
b97f82df8f Added some styles to clean up volume slider 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
98ed738490 Make sure we don't show volume control on iOS 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
7924e5c8f5 Add video volume control to video player 2012-06-13 15:32:38 -04:00
Prem Sichanugrist
e14563954a Be specific on video progress slider handle
Using `.ui-slider-handle` was too broad.
2012-06-13 15:32:38 -04:00
Kyle Fiedler
d96d982a5a Added sass readme 2012-06-13 15:21:25 -04:00
Prem Sichanugrist
0f073f70c4 Create Calculator and Feedback form on every page 2012-06-13 14:56:48 -04:00
Calen Pennington
f2080fde62 Porting latest changes from ui_prototype 2012-06-13 14:43:01 -04:00
Calen Pennington
8338031f3e Switch to mako templates 2012-06-13 13:22:38 -04:00
Calen Pennington
a333612cce Add templates directly from cms_proto/ui_prototype 2012-06-13 11:54:17 -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
e75d75b5a8 Merge pull request #99 from MITx/victor/create_docs
Victor/create docs
2012-06-13 08:19:14 -07:00
Victor Shnayder
7608003c15 Update overview to reflect suggestions 2012-06-13 10:18:54 -04:00
Victor Shnayder
c3a1d7788c clarify docstring for modx_dispatch 2012-06-13 10:18:54 -04:00
Victor Shnayder
600899c16c add comment/explanation to eia.py 2012-06-13 10:18:54 -04:00
Victor Shnayder
9f38ccb65d add README.md for dogfood 2012-06-13 10:18:54 -04:00
Victor Shnayder
17af925a8a add function docs to module_render.py 2012-06-13 10:18:54 -04:00
Victor Shnayder
c9cbc52ffa Add rough overview docs 2012-06-13 10:18:53 -04:00
Victor Shnayder
a3561c96f7 added TODO comment 2012-06-13 10:18:53 -04:00
Calen Pennington
6b8d479510 Merge pull request #97 from MITx/pmitros/documentation
Coding standards document
2012-06-13 07:17:51 -07:00
David Ormsbee
8feafeec12 Merge pull request #102 from MITx/mm-test-dependencies
Added django_nose and nosexcover to requirements.txt
2012-06-12 13:48:45 -07:00
Calen Pennington
967a6ee2e7 Merge pull request #94 from MITx/capa-cleanup
Capa cleanup
2012-06-12 12:26:49 -07:00
Prem Sichanugrist
8e98e59cfa Cleanup show answer code 2012-06-12 14:10:00 -04:00
ichuang
35202817d5 problem.coffee : queue mathjax typesetting just once 2012-06-12 14:07:48 -04:00
ichuang
5031c838cc typo in correctmap 2012-06-12 13:52:34 -04:00
ichuang
a0e628f761 private methods start with _ (in capa_problem) 2012-06-12 13:50:57 -04:00
ichuang
4366529a6d capa_problem log.error + raise -> log.debug + # FIXME 2012-06-12 13:46:30 -04:00
ichuang
d68f0a3b32 util: tol.endswith 2012-06-12 13:43:14 -04:00
ichuang
2ffc8819e5 responsetypes - minor edits 2012-06-12 13:40:03 -04:00