Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,937 Commits 1 Branch 0 Tags
02ac72d0afca6e0798ded6623754e56d263ea3bd
Commit Graph

2379 Commits

Author SHA1 Message Date
Vik Paruchuri
f565d17b4f Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:23:31 -05:00
Vik Paruchuri
a0febd35a0 Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:22:12 -05:00
Vik Paruchuri
ddda9ba55d Try to fix tests 2013-02-06 13:19:37 -05:00
Vik Paruchuri
96636681e9 Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-02-06 13:16:02 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Jay Zoldak
fde6d1ba1c Refactor tests for cms contentstore. 2013-02-06 10:42:21 -05:00
Jay Zoldak
2c5a7ccdf7 Rearrange factories and clean up imports 2013-02-06 10:36:28 -05:00
Vik Paruchuri
94e6346cf2 Fix combined open ended tests 2013-02-05 19:04:30 -05:00
Vik Paruchuri
a1e73392c1 Fix descriptor creation 2013-02-05 19:02:21 -05:00
Vik Paruchuri
0fc50095d9 Fix combined open ended tests 2013-02-05 18:53:53 -05:00
Vik Paruchuri
8877ec3500 More robust default version 2013-02-05 18:38:21 -05:00
Vik Paruchuri
4614687e7f Debug image submissions 2013-02-05 18:24:18 -05:00
Vik Paruchuri
8bf29c0e1a Alter image test criteria 2013-02-05 17:17:58 -05:00
Vik Paruchuri
06499bbafc Fix some of the tests 2013-02-05 17:10:35 -05:00
Vik Paruchuri
1d3f8f0655 Pass display name and content link rewriting down the chain 2013-02-05 16:54:57 -05:00
Vik Paruchuri
8e7fa6c90c Support due date and display name 2013-02-05 16:48:21 -05:00
Vik Paruchuri
e6770bcaa7 Parse and pass metadata 2013-02-05 16:42:56 -05:00
Vik Paruchuri
3dc05aa904 Make some bug fixes, alter definition passing to work 2013-02-05 16:25:46 -05:00
Vik Paruchuri
ce0b31465c Add in methods to interact with xmodule, change descriptor 2013-02-05 16:17:55 -05:00
Christina Roberts
8c4b661292 Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote 
studio - resolved HTML display issue with bold and blockquote
 2013-02-05 13:13:44 -08:00
Vik Paruchuri
8ab76f72ad Switching over to a versioning system 2013-02-05 16:07:35 -05:00
Diana Huang
120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule 
Feature/vik/peer grading xmodule
 2013-02-05 12:55:48 -08:00
Brian Talbot
d713b288b5 studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style 2013-02-05 15:21:41 -05:00
Vik Paruchuri
ce87e6f221 Skip two tests 2013-02-05 14:57:59 -05:00
Vik Paruchuri
cae65706fd Pare down on peer grading service 2013-02-05 14:37:08 -05:00
Vik Paruchuri
8027cc7024 Fix some issues with tests 2013-02-05 14:35:44 -05:00
Vik Paruchuri
e13de7543f Test fixes, err response fixes, address review comments 2013-02-05 14:12:11 -05:00
Vik Paruchuri
34dc6e6320 Fix some issues with peer grading service 2013-02-05 13:37:55 -05:00
Vik Paruchuri
7984c4dfcb Move over grading service to xmodule 2013-02-05 13:10:56 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Vik Paruchuri
e8a690df5e Update peer grading tests 2013-02-05 10:46:00 -05:00
Don Mitchell
82b2dc7193 Merge pull request #1427 from MITx/feature/christina/misc2 
Do not do finds within the event method. Decreases likelihood of hitting...
 2013-02-05 07:19:40 -08:00
cahrens
286616e659 Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. 
https://edx.lighthouseapp.com/projects/102637/tickets/153
 2013-02-05 09:50:34 -05:00
Victor Shnayder
82afc477fa Merge pull request #1396 from MITx/feature/victor/randomization 
Feature/victor/randomization
 2013-02-04 15:37:07 -08:00
Victor Shnayder
b6614f6939 add initial test that only tests the descriptor 2013-02-04 18:28:22 -05:00
Vik Paruchuri
725f0c632c Remove get statements, fix module_render 2013-02-04 18:27:25 -05:00
Vik Paruchuri
009a8c5f63 Fix issue with passing rubric scores back to controller 2013-02-04 18:17:23 -05:00
Vik Paruchuri
bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule 
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
 2013-02-04 17:55:55 -05:00
Vik Paruchuri
f019225d16 Fix reloading 2013-02-04 17:23:34 -05:00
Vik Paruchuri
eb049bda9e Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging 2013-02-04 17:18:59 -05:00
Victor Shnayder
d7570de5d7 Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display 
fix bug in conditional - videos were not playing, because a js function changed syntax
 2013-02-04 14:14:18 -08:00
ichuang
0c07f03d68 XModule.loadModules only takes @el as argument now 2013-02-04 17:04:39 -05:00
Vik Paruchuri
5d8aade8e7 Explain django settings imports 2013-02-04 16:57:09 -05:00
Vik Paruchuri
cbd0895aad Add in single peer grading problem view 2013-02-04 16:42:14 -05:00
Vik Paruchuri
c9f75f8b3c Add in score return 2013-02-04 16:14:34 -05:00
Christina Roberts
2306e7c1e8 Merge pull request #1417 from MITx/feature/christina/misc2 
Try, try again.
 2013-02-04 12:56:26 -08:00
cahrens
aac179f135 Try, try again. 2013-02-04 15:48:05 -05:00
Sarina
25bede9005 Merge pull request #1414 from MITx/feature/victor/showanswer-past-due 
Feature/victor/showanswer past due
 2013-02-04 12:39:13 -08:00
Victor Shnayder
fe42d8e9a8 fix typo, add comment 2013-02-04 15:04:20 -05:00