Your Name
dba39e2431
add group support to lms
2013-01-18 12:50:25 -05:00
Chris Dodge
575ff02f8a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
...
Conflicts:
jenkins/test.sh
2013-01-18 10:26:44 -05:00
Chris Dodge
c6276c8394
only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata
2013-01-17 23:58:07 -05:00
Carlos Andrés Rocha
ef69b738c9
Sort courses announcement date
...
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.
If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
2013-01-17 21:46:58 -05:00
jmvt
bc268aa791
Merged to lastest master.
2013-01-17 17:39:12 -05:00
John Jarvis
08b8a9f674
Better help message for the force-gen option
2013-01-17 14:36:08 -05:00
Diana Huang
18a3d5e734
Merge branch 'master' into feature/diana/rubric-input
2013-01-17 14:00:43 -05:00
Chris Dodge
fcf92a371d
fix up testing failures post merge
2013-01-17 09:48:10 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
John Jarvis
e09728a3b2
Removing the unavailable tally
...
It doesn't make sense to print out unavailable students
since it will go negative as students unenroll
2013-01-16 17:48:46 -05:00
John Jarvis
52e387e029
Add the force flag
...
This will allow you to force the certificate generation
for when certificate requests are lost and stuck in
'generating', this happens when we have xqueue issues.
2013-01-16 17:44:19 -05:00
John Jarvis
44141b6a55
pep8 cleanup
2013-01-16 17:39:26 -05:00
John Jarvis
491027a814
Allow generation of certificates if they are in the generating state
2013-01-16 17:34:48 -05:00
David Ormsbee
fd20496a60
Merge pull request #1280 from MITx/feature/jth/attempts_reset
...
Added 2 new instructor tools
2013-01-16 13:48:26 -08:00
John Hess
f7f563db9b
Use reverse() to lookup student progress page, use index to lookup module_state_key
2013-01-16 16:44:25 -05:00
jmvt
a9d3736cfb
Replace all calls to analytics service to use the get methods (pulls from mongodb). Added error handling.
2013-01-16 15:09:54 -05:00
Victor Shnayder
9519087d84
Merge pull request #1271 from MITx/feature/victor/beta-testers
...
Feature/victor/beta testers
2013-01-16 06:50:57 -08:00
Diana Huang
8b3fb33fe3
Update tests to handle rubric scores
2013-01-16 09:47:54 -05:00
Diana Huang
9b2faa4987
Merge branch 'master' into feature/diana/rubric-input
2013-01-16 09:02:51 -05:00
Victor Shnayder
b188c8e722
fix bug in string splitting.
2013-01-15 18:19:54 -05:00
Deena Wang
3ff3189260
Finished tests for access.py (as far as able)
2013-01-15 15:39:05 -05:00
Vik Paruchuri
ef2b069409
Add staff grading notifications
2013-01-15 15:34:09 -05:00
Diana Huang
77fe6ed452
Merge branch 'master' into feature/diana/rubric-input
2013-01-15 14:48:40 -05:00
Diana Huang
4422bd996d
Merge branch 'master' into feature/diana/rubric-input
2013-01-15 14:44:57 -05:00
Victor Shnayder
9c7f2cf604
WIP -- do not merge
2013-01-15 14:44:09 -05:00
VikParuchuri
e2f8ce9de6
Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications
...
Feature/vik/add peer grading notifications
2013-01-15 11:40:59 -08:00
Vik Paruchuri
301293f8b0
Remove debug statement, fix active page issue on problem page
2013-01-15 14:33:38 -05:00
Vik Paruchuri
7b1262f667
Fix up authentication, other things
2013-01-15 14:31:02 -05:00
John Hess
9a81c56254
Tracking progess page lookups on instructor dashboard
2013-01-15 13:51:24 -05:00
John Hess
9ef1a4ded5
Tracking problem resets, clearer msgs
2013-01-15 13:51:24 -05:00
John Hess
d025ca248f
Added instructor tools for resetting attempts on a single student's problem to 0 and for getting student's progress page
2013-01-15 13:51:24 -05:00
Diana Huang
3d2ae66cf5
Refactor out rubric rendering and pass along
...
the right information for peer grading
2013-01-15 13:46:18 -05:00
Victor Shnayder
02d5cfd14d
add comment about time format conversion
2013-01-15 11:44:27 -05:00
Victor Shnayder
570df1c9e6
Fix bugs, refactor, support lists of users
2013-01-15 11:44:27 -05:00
Victor Shnayder
3f654af7cd
Refactor common code, fix view a bit
...
remaining:
* support putting multiple names / emails in the big box we now have
2013-01-15 11:44:27 -05:00
Victor Shnayder
1a5fc065ad
Add beta test group management view to instructor dashboard
...
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
2013-01-15 11:44:26 -05:00
Victor Shnayder
58a9fdeddc
add note about settings needed for manual testing
2013-01-15 11:36:25 -05:00
Victor Shnayder
3e5a2f9bde
Add beta test group support
...
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
2013-01-15 11:36:25 -05:00
David Ormsbee
ad261706c8
Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
...
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Diana Huang
48be0b15a1
Clean up on staff grading code path and
...
the beginnings of peer grading.
2013-01-15 11:21:10 -05:00
Vik Paruchuri
50f951d9df
Bug fixes
2013-01-14 17:14:55 -05:00
Vik Paruchuri
6427a7dac5
Rubric html change
2013-01-14 16:03:53 -05:00
Vik Paruchuri
f5600c2b8a
Make things more robust, ensure that a rubric is specified properly before combined open ended module will render
2013-01-14 15:42:38 -05:00
Vik Paruchuri
4353c4ab05
Clean up some logic
2013-01-14 15:16:06 -05:00
Vik Paruchuri
cc56e47633
Fix active page issue
2013-01-14 15:12:54 -05:00
Diana Huang
79c8efcb68
Update the rubric renderer
2013-01-14 15:02:24 -05:00
Vik Paruchuri
4ffa00b400
Add in notifications, peer grading tab, tab image
2013-01-14 15:00:13 -05:00
Diana Huang
bb867ba3b4
Use the new CombinedOpenEndedRubric class for everything
...
related to rubric rendering. Remove the old input type.
2013-01-14 14:46:44 -05:00
Diana Huang
ae65bb0332
Merge branch 'master' into feature/diana/rubric-input
...
Conflicts:
common/lib/capa/capa/inputtypes.py
2013-01-14 13:40:45 -05:00
Diana Huang
1680336da6
Fix some minor bugs in the staff grading interface
2013-01-14 10:22:22 -05:00
