Diana Huang
a0c0005e95
Updates to the javascript and the grading controller
...
to handle rubric input
2013-01-14 08:58:33 -05:00
Diana Huang
f3e8d01e08
Pull out old rubric and score selection logic
...
and set up the new rubric
2013-01-11 17:29:39 -05:00
jmvt
d230c1b03c
Added example of geographic student distribution over world map.
2013-01-11 17:14:29 -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
Vik Paruchuri
52164f58ff
Fix self.get call in peer grading service
2013-01-11 11:39:32 -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
ichuang
4f869ad382
remove spurious comment
2013-01-11 00:10:52 -05:00
ichuang
b7ad39a0b9
instructor dashboard shouldn't import .grading anymore
2013-01-11 00:09:46 -05:00
ichuang
37f848949d
only is_staff users can add/edit/delete course instructors
2013-01-10 23:32:49 -05:00
ichuang
5cc88ec1ad
example course_id for compute_grades management command
2013-01-10 23:32:48 -05:00
Calen Pennington
9853c6323f
Remove circular dependencies that connect student.models and django_comment_client
...
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py
Conflicts:
common/djangoapps/student/models.py
2013-01-10 23:32:48 -05:00
ichuang
ec94f7328c
remove try...except workaround for circular import bug fixed by https://github.com/MITx/mitx/issues/1260
2013-01-10 23:32:48 -05:00
ichuang
e5c958082b
list/add/delete instructors on instructor dashboard
2013-01-10 23:32:48 -05:00
ichuang
04d6f08c0c
add offline grade computation & DB table for this
2013-01-10 23:32:48 -05:00
ichuang
82e31d533b
Hookup CourseEnrollmentAllowed to lms/djangoapps/courseware/access.py
2013-01-10 23:31:46 -05:00
ichuang
97fb054449
add export grades to remote gradebook to instructor dashboard
2013-01-10 23:31:46 -05:00
ichuang
200493a54f
instructor dashboard upgrade - add enrollment management
2013-01-10 23:31:45 -05: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
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
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
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -05: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
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
Diana Huang
2293a37f7d
Move over old Staff Grading tests to new app.
2013-01-07 09:17:09 -05:00
Calen Pennington
789ac3fc87
Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api
2013-01-04 16:19:58 -05:00
Diana Huang
fe86c25f72
Bug fixes for the JS and the peer grading service
2013-01-03 17:23:30 -05:00
Diana Huang
28501ca58e
Merge branch 'master' into diana/peer-grading-views
2013-01-03 16:23:14 -05:00
Diana Huang
078b2a5b95
Fix up some minor state issues and
...
complete basic JS functionality for page
2013-01-03 16:19:04 -05:00
Diana Huang
becffd4dbb
Updated html and javascript for new pages as well
...
as a fix for the peer grading service
2013-01-03 14:08:56 -05:00
Diana Huang
1c1034c63b
Pass location as a parameter, not as a part of the url
2013-01-03 13:47:03 -05:00
Diana Huang
bd47b0c79a
New urls and corresponding views in the grading service
2013-01-03 12:59:34 -05:00
Chris Dodge
0743adb1cd
update grade download csv content
2013-01-03 12:58:59 -05:00
Calen Pennington
8874d9d7f8
Add a draft implementation of the Poll module for Justice
2013-01-03 12:21:13 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
