Calen Pennington
fc2d5c43f1
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
lms/envs/aws.py
2013-01-14 12:51:19 -05:00
Vik Paruchuri
1316728aaa
Minor naming fix
2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf
Fix staff and peer grading settings to not fail catastrophically
2013-01-14 12:31:50 -05:00
Chris Dodge
08adf9c0d5
Merge branch 'master' into feature/cdodge/cms-master-merge3
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/search.py
common/lib/xmodule/xmodule/modulestore/xml.py
doc/development.md
lms/envs/common.py
2013-01-11 14:04:46 -05:00
chrisndodge
5368a9ad3e
Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf
...
Decrease the number of queries needed for LMS courseware
2013-01-11 07:23:00 -08:00
Victor Shnayder
e97469aee6
Merge pull request #1236 from MITx/diana/peer-grading-views
...
Peer Grading Interface
2013-01-10 13:59:46 -08:00
Diana Huang
d0e00af60e
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-10 16:45:40 -05:00
Diana Huang
81bb2dc979
Better and clearer comments along with some fixes
...
for code review issues
2013-01-10 16:45:19 -05:00
Jay Zoldak
64e8f9c0cd
Add BDD lettuce tests for studio overview toggle section feature.
2013-01-10 16:00:40 -05:00
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -05:00
Diana Huang
ef6d77b116
Clean up names and refactor out some common logic
2013-01-10 15:33:17 -05:00
Diana Huang
084a3c33c8
Update comments and remove some unnecessary code
2013-01-10 15:20:46 -05:00
Diana Huang
0bfb1feed4
Log better exceptions
2013-01-10 15:06:16 -05:00
Diana Huang
4909b84966
Clean up code and make the arguments for get and post more logical.
2013-01-10 14:51:32 -05:00
Calen Pennington
cb3b17d44c
Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior
2013-01-10 14:30:12 -05:00
Diana Huang
3a29d260ae
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-10 14:12:06 -05:00
Calen Pennington
0726294c35
Use get_child_descriptors for grades.py
2013-01-10 13:55:46 -05:00
Calen Pennington
89a0b82e5c
Decrease the number of queries needed for LMS courseware
...
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
2013-01-10 13:55:46 -05:00
Diana Huang
19bc657487
Use correct version of the grader id.
2013-01-10 12:44:54 -05:00
Chris Dodge
d4f30b378e
remove commented out line and add a new comment. also remove debugging trace output
2013-01-09 16:05:09 -05:00
Chris Dodge
e11706ef07
change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores
2013-01-09 15:53:22 -05:00
Diana Huang
393ee3533c
Merge branch 'master' into diana/peer-grading-improvements
2013-01-09 15:45:02 -05:00
Diana Huang
13c692c29b
Show back button when we see an error.
2013-01-09 14:59:59 -05:00
Diana Huang
54d91e7875
Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements
2013-01-09 14:44:08 -05:00
Diana Huang
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -05:00
Diana Huang
950d398387
Updates to the CSS
2013-01-09 10:19:42 -05:00
Calen Pennington
941d55cee3
Merge pull request #1229 from MITx/feature/ichuang/update-symmath-server
...
Feature/ichuang/update symmath server
2013-01-09 06:10:32 -08:00
Diana Huang
f0f25296b2
Update documentation
2013-01-08 15:54:49 -05:00
Jay Zoldak
f056f0624d
Set up the framework for running lettuce tests against studio
2013-01-08 14:44:45 -05:00
Chris Dodge
99750a6812
make sure we turn off module wrappers for the 'ancillary' course content
2013-01-08 11:18:41 -05:00
Diana Huang
19401f29d9
Minor javascript updates
2013-01-08 10:22:07 -05:00
Diana Huang
3f254fc3c7
Merge branch 'master' into diana/peer-grading-views
2013-01-07 15:57:39 -05:00
Diana Huang
02247172a2
Fix some interstitial page CSS
2013-01-07 15:55:14 -05:00
Diana Huang
bbc5cd50bc
Add in default value for MOCK_PEER_GRADING
2013-01-07 15:49:48 -05:00
Diana Huang
b7473f8017
Make mock service return useful data
2013-01-07 15:40:01 -05:00
Diana Huang
e1ec4eec71
Get tests to pass by creating a mock peer grading service
2013-01-07 14:46:32 -05:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -05:00
Carlos Andrés Rocha
56f1c6aad9
Fixed extra characters in faq page
2013-01-07 10:14:00 -05:00
Robert Chirwa
faa2373256
Fix typo in the job page
...
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org >
2013-01-07 10:08:16 -05:00
Diana Huang
2293a37f7d
Move over old Staff Grading tests to new app.
2013-01-07 09:17:09 -05:00
ichuang
9a0d85667c
symmath use https, no server cert verify
2013-01-05 12:29:03 -05:00
ichuang
bf3669395b
update symmath snuggletex server
2013-01-05 12:29:00 -05:00
Diana Huang
e410703e33
Minor bug fixes and improvements
2013-01-04 17:20:03 -05:00
Diana Huang
093560e859
Updates to copy and styling and a few bugfixes
2013-01-04 16:36:28 -05:00
Diana Huang
fa09e25a1a
Add interstitial page between calibration and grading.
...
Make individual Prompt and Rubric Sections hideable.
2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626
Improvements to calibration feedback step
2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be
Minor updates to the page to handle showing Calibration feedback.
...
Also, allow for the hiding of the Prompt and the Rubric.
2013-01-04 12:42:38 -05:00
Diana Huang
d2228205e2
Merge branch 'master' into diana/peer-grading-views
2013-01-04 11:19:10 -05:00
Diana Huang
b5f34a9da6
Show special text when calibrating or when grading.
2013-01-04 11:03:24 -05:00
Carlos Andrés Rocha
d0221808db
Merge pull request #1228 from MITx/content/rocha/media-kit
...
Add new tab/window behavior to media kit
2013-01-04 07:07:43 -08:00
