Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00
Brian Wilson
aae5c7ca23
remove unneeded files
2013-02-06 15:25:25 -05:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
ichuang
0936f448fc
add disable_progress_graph key to course metadata
2013-02-06 03:45:10 +00:00
Brian Wilson
f8b7d5fad6
have timer redirect when it expires
2013-02-04 15:13:14 -05:00
ichuang
ddc8bf2b42
add instructor dashboard feature to download profile & problem state
2013-02-04 04:47:27 +00:00
Brian Wilson
9d98b7055d
add course navigation back into timed exam. Add initial timer styling.
2013-02-01 17:52:14 -05:00
Brian Wilson
07638440ac
rename testcenter_exam to timed_exam, and read duration from metadata (policy.json)
2013-01-31 18:33:22 -05:00
Brian Wilson
9b3d7efb3f
add first pass at testcenter exam
2013-01-30 18:14:53 -05:00
Victor Shnayder
5fa8cf5a78
Only show cohort config for cohorted courses
2013-01-24 15:14:34 -05:00
Victor Shnayder
bab3b0c39e
Add initial set of views for managing cohorts
...
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
2013-01-24 15:12:53 -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
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
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
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
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
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
Vik Paruchuri
4ffa00b400
Add in notifications, peer grading tab, tab image
2013-01-14 15:00:13 -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
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
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
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
David Ormsbee
8bf393fbba
Merge pull request #1182 from MITx/bridger/feature/ungraded_course
...
Visual changes for ungraded courses
2013-01-02 07:19:34 -08:00
Carlos Andrés Rocha
22de7cbb4e
Add logic to display courses by start date and show the new overlay
2012-12-20 20:05:11 -05:00
Bridger Maxwell
d911297670
The progress page now checks course.metadata.get(no_grade, False) to see if the course has a grade.
2012-12-19 12:47:43 -05:00
Bridger Maxwell
5a65c24507
Added parameters to hide grade totals and grade cutoffs in progress graph.
2012-12-19 12:37:02 -05:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
David Ormsbee
7ffb30d0c9
IE errors if you try to use 'return' as a dict key.
2012-11-30 18:22:37 -05:00
Brian Wilson
57cb8c1e21
Add unit tests
2012-11-20 15:56:18 -05:00
Brian Wilson
619ac10069
Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods
2012-11-20 15:46:49 -05:00
Brian Wilson
ee7a8494e6
finish basic implementation of forum admin on instructor dash
2012-11-19 14:59:34 -05:00
Carlos Andrés Rocha
3d5b571a7e
Move courseware related templates to their own folder
...
Fix moved links
2012-11-19 12:45:46 -05:00
Brian Wilson
8f38f04b1f
Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods
2012-11-16 21:23:42 -05:00
Brian Wilson
c9f7558d6d
first pass at add/remove moderators
2012-11-16 18:34:26 -05:00
Calen Pennington
0fff578e7d
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
.gitmodules
lms/envs/aws.py
lms/envs/common.py
lms/static/sass/course.scss
lms/urls.py
2012-11-16 09:03:15 -05:00
Bridger Maxwell
ba57e8a7a5
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
2012-11-15 13:24:19 -05:00
Chris Dodge
87ff18dc56
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-11-07 09:35:21 -05:00
Don Mitchell
7f4bb63dff
Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
...
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Bridger Maxwell
e256b2390b
Added an indicator on Progress page when there are no problem scores in a section.
2012-10-10 14:53:39 -04:00
kimth
8210bfdff5
Remove vestigial js include
2012-09-26 19:51:04 -07:00
Arjun Singh
60ed7046bd
make progress label wider
2012-09-24 00:33:26 -07:00
