Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,753 Commits 1 Branch 0 Tags
d9fdccb567924f04ec420e95bfe5c37e5bee751a
Commit Graph

3141 Commits

Author SHA1 Message Date
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Deena Wang
7918c35414 fixing up tests 2013-01-28 15:29:55 -05:00
Deena Wang
583505b95b test_courses.py 2013-01-25 12:19:16 -05:00
Deena Wang
f9b0ec37cd more tests in test_views, needs templates to continue 2013-01-24 16:08:19 -05:00
Deena Wang
9663973038 more tests for courseware/views 2013-01-24 14:59:46 -05:00
Deena Wang
d81b031624 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-01-24 10:05:04 -05:00
Deena Wang
61e12f57e7 experimenting with creating a course 2013-01-24 09:59:33 -05:00
Jay Zoldak
4d469fd9f7 Add test for jump_to. 2013-01-24 09:55:24 -05:00
Deena Wang
ca185c034f Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-01-23 10:50:37 -05:00
Deena Wang
3fd69bcae4 more tests in test_views.py 2013-01-23 10:41:12 -05:00
Jay Zoldak
26ee9a24ef Add test for TOC rendering 2013-01-22 15:15:47 -05:00
Deena Wang
7884e2c690 more tests 2013-01-22 15:08:44 -05:00
Deena Wang
3565023389 created test_courses.py 2013-01-22 14:01:01 -05:00
Deena Wang
6e773909e4 added test_views 2013-01-22 10:36:05 -05:00
Deena Wang
1565cd5bd3 Test cases for lms/djangoapps/courseware/module_render in test_module_render 2013-01-18 14:44:17 -05:00
Deena Wang
3ff3189260 Finished tests for access.py (as far as able) 2013-01-15 15:39:05 -05:00
David Ormsbee
36b024ab95 Merge pull request #1203 from MITx/feature/alex/gst-mitx 
Feature/alex/gst mitx
 2013-01-15 08:24:09 -08: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
Valera Rozuvan
f2fd649a16 Removed unnecessary XML section. Documenting. 2013-01-15 12:55:13 +02:00
Valera Rozuvan
080e96fdc4 Work in progress on GST. 2013-01-15 12:55:11 +02:00
valera-rozuvan
0913e9ef69 Work on GST. 2013-01-15 12:51:55 +02:00
valera-rozuvan
643ac69a57 Separating JS from the html for GST. 2013-01-15 12:51:55 +02:00
Alexander Kryklia
da4a676513 working xmodule - GsT 2013-01-15 12:51:55 +02:00
Alexander Kryklia
69d0156c36 slider, plot and input contrlos are transferred from xml to html substituted to proper div elements 2013-01-15 12:51:54 +02:00
Alexander Kryklia
169d4b123c updates 2013-01-15 12:51:54 +02:00
Alexander Kryklia
54c222a015 template for gst 2013-01-15 12:51:54 +02:00
VikParuchuri
a64111a6e7 Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe 
Feature/vik/integrate sa and oe
 2013-01-14 10:06:43 -08:00
Vik Paruchuri
1316728aaa Minor naming fix 2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf Fix staff and peer grading settings to not fail catastrophically 2013-01-14 12:31:50 -05:00
Vik Paruchuri
a64806656a Integrate rubric into self assessment 2013-01-14 12:20:27 -05:00
Vik Paruchuri
16f06ae7b7 Fix some minor html 2013-01-14 11:57:09 -05:00
Vik Paruchuri
3e0cf9d234 Make rubric render more nicely 2013-01-14 11:53:23 -05:00
Vik Paruchuri
2b4929562a Fix up rubric rendering 2013-01-14 10:39:58 -05:00
Vik Paruchuri
0567e8f0aa Factor out rubric rendering 2013-01-14 10:35:53 -05:00
Vik Paruchuri
682ac3455b Address some comments from code review, fix rubric display 2013-01-11 15:51:37 -05:00
Vik Paruchuri
9a752f51c7 Fix rubric return, add in score field 2013-01-11 12:48:15 -05:00
Vik Paruchuri
7febe2c2c8 Integrate minimal rubric display 2013-01-11 12:43:57 -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
Vik Paruchuri
3bf532e199 Check marks in each step 2013-01-10 19:00:03 -05:00