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

22621 Commits

Author SHA1 Message Date
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
Diana Huang
1680336da6 Fix some minor bugs in the staff grading interface 2013-01-14 10:22:22 -05:00
Diana Huang
a0c0005e95 Updates to the javascript and the grading controller 
to handle rubric input
 2013-01-14 08:58:33 -05:00
Brian Wilson
8e059ff934 fix placeholders for phone_country_code values, and subject line of exam_help email. 2013-01-12 00:58:04 -05:00
Diana Huang
f3e8d01e08 Pull out old rubric and score selection logic 
and set up the new rubric
 2013-01-11 17:29:39 -05:00
jmvt
d230c1b03c Added example of geographic student distribution over world map. 2013-01-11 17:14:29 -05:00
Vik Paruchuri
682ac3455b Address some comments from code review, fix rubric display 2013-01-11 15:51:37 -05:00
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -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
chrisndodge
5368a9ad3e Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf 
Decrease the number of queries needed for LMS courseware
 2013-01-11 07:23:00 -08:00
Brian Talbot
5d40d22136 revised rejected state error message content, markup, and styling on registration's right hand side status area 2013-01-11 09:52:46 -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
Vik Paruchuri
5150d6cdee Add in better status indicators 2013-01-10 19:00:03 -05:00
Vik Paruchuri
bccafe6c31 Add in correctness display 2013-01-10 19:00:02 -05:00
Vik Paruchuri
af705ca1af Remove html 2013-01-10 19:00:02 -05:00
Vik Paruchuri
943c0ff820 Display results separately from submission logic 2013-01-10 19:00:02 -05:00
Vik Paruchuri
3620fd93d9 Create a result container and put results into it 2013-01-10 19:00:02 -05:00
Vik Paruchuri
24bfe44049 Some restyling, automatically check for feedback, remove reload button 2013-01-10 19:00:02 -05:00
Vik Paruchuri
5273d44788 Fix css and display current step 2013-01-10 19:00:02 -05:00
Vik Paruchuri
a3c1f7c9f4 Feedback submission moved 2013-01-10 19:00:02 -05:00
Vik Paruchuri
f70434970e Make everything look a bit nicer 2013-01-10 19:00:02 -05:00
Vik Paruchuri
9788535416 Get rid of open ended message 2013-01-10 19:00:02 -05:00
Vik Paruchuri
5b0181c925 Status moved to the right 2013-01-10 19:00:02 -05:00
Vik Paruchuri
9a4ee350d7 JS tweaks, move feedback into its own template 2013-01-10 19:00:02 -05:00
Vik Paruchuri
e46ecdb6e2 Move skip button 2013-01-10 19:00:02 -05:00
Vik Paruchuri
8d80fcfb86 Add button to skip post assessment 2013-01-10 19:00:02 -05:00
Vik Paruchuri
d4dd0cd84c Html changes 2013-01-10 19:00:01 -05:00
Vik Paruchuri
ea6945a3fe Collapsible feedback 2013-01-10 19:00:01 -05:00
Vik Paruchuri
d9ea0fcda0 display feedback in status box 2013-01-10 19:00:01 -05:00
Vik Paruchuri
a7c64b8e2d Add collapsible 2013-01-10 19:00:01 -05:00
Vik Paruchuri
b6774ed2e8 Add back check for feedback button. Can always remove later 2013-01-10 19:00:01 -05:00
Vik Paruchuri
792e57ac62 Remove check for feedback button 2013-01-10 19:00:01 -05:00
Vik Paruchuri
146e0919f1 Work on alerts, transitions between pages 2013-01-10 19:00:01 -05:00
Vik Paruchuri
0ec1db8169 Add in a message area 2013-01-10 19:00:01 -05:00
Vik Paruchuri
5e38433494 Add in static data for max score and max attempts 2013-01-10 19:00:01 -05:00
Vik Paruchuri
c6c77c0cde Simple status display 2013-01-10 19:00:01 -05:00