Commit Graph

1088 Commits

Author SHA1 Message Date
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
Victor Shnayder
b188c8e722 fix bug in string splitting. 2013-01-15 18:19:54 -05:00
Vik Paruchuri
ef2b069409 Add staff grading notifications 2013-01-15 15:34:09 -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
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
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
Vik Paruchuri
4ffa00b400 Add in notifications, peer grading tab, tab image 2013-01-14 15:00:13 -05:00
Vik Paruchuri
52164f58ff Fix self.get call in peer grading service 2013-01-11 11:39:32 -05: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
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
Diana Huang
19bc657487 Use correct version of the grader id. 2013-01-10 12:44:54 -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
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
Diana Huang
2293a37f7d Move over old Staff Grading tests to new app. 2013-01-07 09:17:09 -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
Diana Huang
c89ff2ac0e Basic peer grading view using mocks and some cleanup in
the peer grading service
2013-01-02 17:44:58 -05:00
Diana Huang
37f261f906 Move peer grading so that there are the individual problem pages
and the problem list page
2013-01-02 15:01:59 -05:00