Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1258 Commits

Author SHA1 Message Date
Miles Steele
02432e05cc integrate slickgrid, add instructor.enrollment, add instructor.access, refactor & clean 2013-08-02 09:52:12 -04:00
Miles Steele
6ff568ce9d remove pid and version 2013-08-02 09:52:12 -04:00
Miles Steele
daeabb06bf add instructor dashboard beta (partial) (view, template, coffeescript, api endpoints) 2013-08-02 09:52:12 -04:00
Miles Steele
4238cb569f fix repoint dump_grades script 2013-08-02 09:52:11 -04:00
Miles Steele
2e1d729e57 move instructor views.py to views/legacy.py 2013-08-02 09:52:11 -04:00
Adam Palay
0076d6a64d fix error handling 
distinguish logged error and instructor-facing error
 2013-08-01 14:56:28 -04:00
Adam Palay
bbd52e05a2 converts user objects to unicode, improve error logging 2013-08-01 14:56:27 -04:00
Carlos Andrés Rocha
b8d1a138ae Show dates when the data was collected in the instructor dashboard panel 2013-07-30 11:16:27 -04:00
Kristin Stephens
71a1562e21 Fix offline_gradecalc 
Bug: Throws error when can't find a user on the request object for grading or can't find a session attribute.

Fix: Added a user attribute with a value of the current student and a session attribute with a value of an empty dictionary.
 2013-07-25 14:31:20 -07:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
David Ormsbee
7993d5c1fc Merge pull request #348 from edx/bugfix/ichuang/idasbhoard-track-json 
tracking in idashboard should only log json-serializable objects
 2013-07-10 10:17:30 -07:00
dcadams
e1a0499678 Added test for email body containing course url and some pep8 fixes. 2013-07-09 14:25:06 -07:00
ichuang
a2b552d05f use unicode instead of str for casting track.views args in idashboard 2013-07-09 14:24:23 -04:00
dcadams
738ba15322 Fix course url link in enrollment emails. 2013-07-09 11:01:52 -07:00
ichuang
f136edb469 tracking in idashboard should only log json-serializable objects 2013-07-08 11:52:39 -04:00
Ned Batchelder
31a72093e0 Fix broken tests by simplifying the CourseFactory 
The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.
 2013-07-03 17:04:18 -04:00
Jean Manuel Nater
5cb4c1a750 Removed some pep8 violations. 2013-07-01 17:07:24 -04:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py 
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
 2013-07-01 14:45:53 -04:00
Felix Sun
0c4d6ba6d9 Made explanation for hints field in crowdsource_hinter.py more clear. 
Fixed various commenting things.

Removed an unused function in the crowdsourced module coffeescript.

Improved commenting in hint_manager.

Fixed pep and pylint violations.
 2013-07-01 11:52:52 -04:00
Felix Sun
970a7f0916 Fixed some docstring formatting things. 
Expanded test coverage a little.
 2013-07-01 10:25:04 -04:00
Felix Sun
b6760cebca Fixed a small, but dangerous, string-to-integer casting bug in hint_manager. 
Expanded tests of hint_manager.

Enabled the hint_manager by default in development environments.
 2013-07-01 10:25:04 -04:00
Felix Sun
6890563d43 Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager. 2013-07-01 10:25:04 -04:00
Felix Sun
ab303e7567 Fixed numerous code-formatting issues and pep8 violations. 
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
 2013-07-01 10:25:04 -04:00
Felix Sun
bb922ed8d8 Moved the crowdsourced hinter module into mako template form. 
Fixed some bugs in the tests for crowdsourced hinter.
 2013-07-01 10:25:04 -04:00
Felix Sun
b64fe5c537 Finished prototype of hint moderation view. Began re-writing tests of the crowdsource hinter module. (Old tests no longer cover all the code, now that moderation has been added.) 2013-07-01 10:25:03 -04:00
Felix Sun
100f6bf11e Began work on instructor view to hinting system. 
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
 2013-07-01 10:25:03 -04:00
Renzo Lucioni
4a41ce804f Merge pull request #293 from edx/renzo/fix-idashboard-event-types 
Standardize types used for logging events from the instructor dashboard
 2013-06-28 09:07:45 -07:00
Renzo Lucioni
d53114abda Shorten line length 2013-06-28 11:46:20 -04:00
Renzo Lucioni
4557891e0d Standardize types used for logging events from the instructor dashboard 2013-06-27 16:25:03 -04:00
Jean Manuel Nater
3c67e2754a Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
 2013-06-27 13:53:47 -04:00
dcadams
306ac48210 Email on enroll/un-enroll actions 
Optionally email students on enroll/un-enroll actions
by instructor from enrollment tab in LMS.
 2013-06-26 15:28:36 -07:00
Jean Manuel Nater
799b938d5b Merge branch 'master' into jnater/courseware_tests 2013-06-24 17:24:42 -04:00
Ned Batchelder
bec6330c34 Merge pull request #251 from edx/ned/pylint-fixes 
Ned/pylint fixes
 2013-06-24 10:44:35 -07:00
mlsteele
88060c0590 Merge pull request #144 from edx/fix/msteele/instructor_tests 
fix gradebook tests
 2013-06-21 19:16:09 -07:00
Ned Batchelder
df4b512b6f Change wildcard imports into specific imports 2013-06-21 17:33:06 -04:00
Jean Manuel Nater
1b94050ef6 Merge branch 'master' into jnater/courseware_tests 
Conflicts:
	lms/djangoapps/open_ended_grading/tests.py
 2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891 Addressed pull request feedback. 2013-06-21 14:05:57 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Brian Wilson
eb1fe899e8 Fix progress reporting. 2013-06-18 11:17:17 -04:00
Brian Wilson
b224f4e8cc move test_tasks to test_integration. 2013-06-18 11:17:16 -04:00
Brian Wilson
c48dabc383 Move code to instructor_task Django app. 2013-06-18 11:17:15 -04:00
Brian Wilson
d2b3977f57 Add dogstat logging to background tasks. 2013-06-18 11:13:55 -04:00
Brian Wilson
9e11a5659f Rename task_queue.py to task_submit.py. 2013-06-18 11:13:19 -04:00
Brian Wilson
c676cfd64a Rename fields in CourseTaskLog, including a task_key column for indexing. Use 'rescore' instead of 'regrade'. Clean up task submission. 2013-06-18 11:13:19 -04:00
Brian Wilson
003c9ba5d9 Define MITX_FEATURES['ENABLE_COURSE_BACKGROUND_TASKS'] to allow background tasks to be removed from instructor dash. 2013-06-18 11:13:17 -04:00
Brian Wilson
1984cfecc1 Add duration to task status. Add tests for reset-attempts. 2013-06-18 11:13:17 -04:00
Brian Wilson
297206f260 Add background task history to instructor dash (as table). 
Add task-history-per-student button, and fix display of task messages.
 2013-06-18 11:13:01 -04:00
Brian Wilson
6cd23875ea Remove delete button from instructor dash. (Also remove last-modified 
column from task-in-progress table).
 2013-06-18 11:11:34 -04:00
Brian Wilson
0d38789a1d Add additional background tasks: reset attempts, delete state. Update 
CourseTaskLog fully after task submission, so it works in Eager mode
(for testing).
 2013-06-18 11:05:33 -04:00