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
Matthew Mongeau
47e06692d8
Use details on dashboard.
2012-06-14 16:53:44 -04:00
ichuang
71788c121f
change way gitreload is done (now runs script in data dir)
2012-06-14 16:49:09 -04:00
Matthew Mongeau
e00b7cb252
askbot stuff.
2012-06-14 16:46:07 -04:00
Calen Pennington
6fee7928fc
Successfully read course children out of mongodb
2012-06-14 16:16:15 -04:00
Matthew Mongeau
a08be52780
Skin settings.
2012-06-14 15:46:10 -04:00
Matthew Mongeau
ed4e79661f
Links
2012-06-14 15:09:24 -04:00
Matthew Mongeau
3b37f10e42
Split course navigation out
2012-06-14 15:02:29 -04:00
Matthew Mongeau
8d66f5ee07
Menu work.
2012-06-14 14:52:10 -04:00
Matthew Mongeau
e048b3251d
Get dropdown working
2012-06-14 14:19:47 -04:00
Matthew Mongeau
7337275303
Adding dashboard
2012-06-14 13:50:16 -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
Matthew Mongeau
86826f8688
Integrate more pages.
2012-06-14 11:27:47 -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
