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

12296 Commits

Author SHA1 Message Date
Vik Paruchuri
3380745692 About to trim some lines 2013-02-04 13:54:27 -05:00
Vik Paruchuri
c6c89e4216 Make peer grading xmodule work with notifications 2013-02-04 13:16:05 -05:00
Vik Paruchuri
7263cbfcca Fixes to make peer grading show up in notifications 2013-02-04 12:41:14 -05:00
Your Name
bdfc9d9784 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 12:30:48 -05:00
Vik Paruchuri
f742b7d865 Start to integrate peer grading xmodule back into notifications 2013-02-04 12:07:03 -05:00
Vik Paruchuri
8bd7b60aca Add in key to mock peer grading service 2013-02-04 10:50:07 -05:00
Vik Paruchuri
c991c0489c Fix open ended test with flagging 2013-02-04 10:26:25 -05:00
Kevin Chugh
69225f6435 cohort ID showing, have to translate to display text 2013-02-04 08:33:33 -05:00
Brian Wilson
1685f302ab add TimerModule to courseware 2013-02-04 02:22:24 -05:00
ichuang
ddc8bf2b42 add instructor dashboard feature to download profile & problem state 2013-02-04 04:47:27 +00:00
ichuang
19051e40d2 use ajax for doing conditional_module 2013-02-03 18:53:51 -05:00
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -05:00
Vik Paruchuri
d9517877a4 Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging 2013-02-01 18:32:48 -05:00
Brian Wilson
9d98b7055d add course navigation back into timed exam. Add initial timer styling. 2013-02-01 17:52:14 -05:00
Deena Wang
1a6fc1b505 Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing 
Conflicts:
	cms/djangoapps/contentstore/tests/test_views.py
 2013-02-01 16:05:44 -05:00
Ned Batchelder
9d34767e6a Fix the remaining module storage tests. 2013-02-01 15:45:43 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Deena Wang
25aca5866d Merge branch 'master' into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_access.py
 2013-02-01 10:19:40 -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
Your Name
f2f7459656 remove more prints 2013-01-31 17:24:08 -05:00
Your Name
c25cd33214 remove print 2013-01-31 17:22:54 -05:00
Vik Paruchuri
b22bad7fa1 Add in some removed imports (fix tests) 2013-01-31 17:11:44 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Vik Paruchuri
01cdc6e7f8 Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes 
Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
 2013-01-31 16:50:10 -05:00
Jay Zoldak
6fe209b0cf Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests 
New tests for OpenEndedGrading
 2013-01-31 08:34:06 -08:00
Vik Paruchuri
78f9f63466 Add in notification type for flagged submissions 2013-01-31 11:19:15 -05:00
Vik Paruchuri
b4c80da224 Trim whitespace 2013-01-30 21:50:24 -05:00
Vik Paruchuri
8e9ec501a7 Implement flagging, fix urls 2013-01-30 21:44:21 -05:00
Vik Paruchuri
4c16479569 Working on frontend JS for posting 2013-01-30 21:22:59 -05:00
Vik Paruchuri
17fce100bb Add in ban actions to table 2013-01-30 21:10:48 -05:00
Vik Paruchuri
b248a09572 Work on adding in ban actions 2013-01-30 21:06:54 -05:00
Vik Paruchuri
e89196e0dd Add in flagged problem list return 2013-01-30 20:47:00 -05:00
Vik Paruchuri
dd72297f73 Wire up flagged problem list 2013-01-30 20:39:53 -05:00
Vik Paruchuri
78696c62b8 Work on open ended flagged problems 2013-01-30 20:36:09 -05:00
Vik Paruchuri
5f538f078b Pass flag through from LMS to grading controller 2013-01-30 19:50:36 -05:00
Brian Wilson
9b3d7efb3f add first pass at testcenter exam 2013-01-30 18:14:53 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Diana Huang
36d8b8768c Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-30 16:41:18 -05:00
Victor Shnayder
f2944334ab Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests 
Add unit tests for lms courseware access
 2013-01-30 12:51:50 -08:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
Your Name
66e443ae63 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-01-30 15:18:45 -05:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7 Add unit tests for lms courseware access 2013-01-30 15:03:43 -05:00
chrisndodge
67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc 
Bug fixes for problem progress not updating.
 2013-01-30 08:24:38 -08:00
Your Name
043d962329 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-01-30 10:26:23 -05:00
Christina Roberts
fd4b3f9489 Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store 
add unit test to test DraftModuleStore.get_items() fix
 2013-01-30 06:49:53 -08:00
Chris Dodge
dbf15fc2ac add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id 2013-01-30 09:46:38 -05:00
cahrens
3c1c61fb19 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). 2013-01-30 09:23:07 -05:00
Calen Pennington
2854d7d066 Point course_image.jpg at the correct place in the /static url space 2013-01-30 09:12:50 -05:00
Calen Pennington
07487a8d8f Use descriptor when setting up replace_urls, as it's been created at that point 2013-01-30 09:12:50 -05:00