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

1391 Commits

Author SHA1 Message Date
Victor Shnayder
c3e07660df formatting cleanup in calc.py 2012-10-08 10:51:37 -04:00
Bridger Maxwell
62400c4c92 Added starting_index conf to AssignmentFormatGrader. Added a bit of forwards compatibility for new grading policies. 2012-10-06 14:52:48 -04:00
Victor Shnayder
7e304abec2 Merge pull request #833 from MITx/feature/rocha/openid-djangostore 
Fix error when creating empty associations
 2012-10-05 10:57:45 -07:00
Carlos Andrés Rocha
193ca7b34b Fix error when creating empty associations 
Also renamed some variables to make them more distinguishable
 2012-10-05 13:46:49 -04:00
Victor Shnayder
8578320e3d move output right/wrong image to top left of each test instead of center 2012-10-05 13:06:26 -04:00
Victor Shnayder
9496064943 Merge pull request #821 from MITx/feature/rocha/openid-djangostore 
Use django cache for OpenID provider store
 2012-10-05 08:41:18 -07:00
Victor Shnayder
5b79352aba Merge pull request #806 from MITx/feature/rocha/support-additional-video-sources 
Add support for video download link
 2012-10-03 17:15:46 -07:00
Carlos Andrés Rocha
e62968d5e1 Get OpenID XRDS url host from request 
Replaced the previous method of getting it from HTTP_POST to use
django's mechanism, which may or may not use HTTP_HOST. However if an
attacker changes the request header, there is not much he can do since
he cannot recreate the association nonce.
 2012-10-03 17:16:22 -04:00
Carlos Andrés Rocha
4840de8c88 Create Django cache backed OpenID provider store 2012-10-03 16:54:07 -04:00
Victor Shnayder
607fdb020b Merge pull request #820 from MITx/ned/spaces_in_codemirror 
Now when you hit the TAB key in codemirror, it will insert 4 spaces.
 2012-10-03 13:24:47 -07:00
Ned Batchelder
52ccfab122 Now when you hit the TAB key in codemirror, it will insert 4 spaces. 2012-10-03 16:19:04 -04:00
Victor Shnayder
d042026e68 Merge pull request #809 from MITx/feature/rocha/styling-for-code-responses 
Add styling for code grader responses
 2012-10-03 06:45:28 -07:00
Victor Shnayder
85893c77c6 Make collapsibles not collapse the entire page 
- need to set text of the link, not the document
- there was something funny with the operator precedence in the ternary operator (was getting 'true', instead of a string)
 2012-10-03 09:25:57 -04:00
Carlos Andrés Rocha
8ac13f5c60 Add styling for code grader responses 2012-10-02 22:56:56 -04:00
arjun810
f627c9e9c1 Merge pull request #791 from MITx/kimth/js-refactor 
Kimth/js refactor
 2012-10-02 19:47:20 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
David Ormsbee
13bfbc820d Prevent caching of block showing top status bar (used for system alert notifications). 2012-10-02 16:38:28 -04:00
Victor Shnayder
8b0f1a0305 get rid of caching--unneeded complexity. 2012-10-02 15:03:06 -04:00
Carlos Andrés Rocha
f357e90dc0 Add support for video download link 
Add a download link to the video player. The link is defined in the
content xml using the following structure:

<video youtube="youtubestring">
  <source src="video_link"/>
</video>
 2012-10-02 14:23:31 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner. 
- still needs style
- will cache for 10 seconds
 2012-10-02 11:48:16 -04:00
kimth
845b921ca1 Missing comma 2012-10-02 15:42:22 +00:00
kimth
ed55e4ae2f Move collapsible back into xmodule 2012-10-02 15:41:38 +00:00
Arjun Singh
a8acb7ff30 Renamed jsloader to match up with the content more explicitly; refactored Collapsible out into its own library 2012-10-01 03:03:33 -07:00
Victor Shnayder
d424fb8332 make codemirror use visible tabs 
* this may not be optimal (compared to e.g. replacing tabs with spaces), but it's a lot better than mystery 'bad indentation' errors
 2012-09-30 19:18:56 -04:00
Victor Shnayder
af6dd84af0 Merge pull request #789 from MITx/feature/bridger/course_grading 
Feature/bridger/course grading
 2012-09-30 11:52:36 -07:00
Bridger Maxwell
4ee0e258ea Refactored a bit of the generating scores code. 2012-09-30 14:48:20 -04:00
kimth
680934045f Adjust comments 2012-09-29 21:39:48 -07:00
kimth
c3abeff8d4 Another TODO comment 2012-09-29 21:28:04 -07:00
kimth
7b8750ab69 HTML modules can also run script_placeholder 2012-09-29 19:05:48 -07:00
kimth
4acd8b9fe1 Further explanation to TODO 2012-09-29 18:54:17 -07:00
kimth
faa35f95cc Move executeProblemScripts into executeModuleScripts 2012-09-29 18:53:24 -07:00
kimth
77af860445 Begin transplant of executeProblemScripts 2012-09-29 18:31:06 -07:00
kimth
8956e5bcb1 Update comment: jsloader works at module-scope 2012-09-29 18:03:59 -07:00
kimth
46598b659c HTML module also uses jsloader 2012-09-29 17:27:06 -07:00
kimth
65b3f58338 jsloader works at module-level 2012-09-29 16:57:23 -07:00
kimth
cbd602b40d Moving toggle code. wip 2012-09-29 16:03:17 -07:00
kimth
c8964b800b Create jsloader.coffee 2012-09-29 15:14:18 -07:00
Calen Pennington
9c859fd925 Merge pull request #780 from MITx/feature/cdodge/cms-static-content-management 
Feature/cdodge/cms static content management
 2012-09-29 07:39:50 -07:00
Bridger Maxwell
2e4ea1d49c Added docstring for show_only_average parameter. 2012-09-28 23:19:46 -04:00
Bridger Maxwell
fc73916e05 Removed django.conf.settings dependency from graders. 2012-09-28 23:14:55 -04:00
Bridger Maxwell
a99d7f7c4a Fixed settings.GENERATE_PROFILE_SCORES for debugging progress graph. 2012-09-28 21:48:41 -04:00
Bridger Maxwell
8ba8504466 Added option to only show average of a section format grader. 2012-09-28 12:47:12 -04:00
Tom Giannattasio
33f0176c33 added problem collapsibles 2012-09-28 12:09:38 -04:00
Tom Giannattasio
8d44e6a3db added html collapsibles 2012-09-28 12:06:29 -04:00
Chris Dodge
1ee7646cfc per feedback, use reverse() when generating callback urls. Also generate thumbnails when ingesting static images. We'll need these handy for the CMS UI. 2012-09-28 10:20:57 -04:00
Calen Pennington
bc947c5e4e Merge pull request #776 from MITx/lyla/cms-templates 
Lyla/cms templates
 2012-09-28 05:55:39 -07:00
kimth
f93115ee4d Merge pull request #778 from MITx/hotfix/arjun/mc_style 
Fixes multiple choice styling
 2012-09-27 13:41:20 -07:00
Arjun Singh
71923e7c1f Add block display back for text 2012-09-27 13:31:08 -07:00
Chris Dodge
adad3c550b Support asset library references in CapaModule. Also some code refactoring/cleanup. Preparing for review and submit 2012-09-27 12:31:45 -04:00
Chris Dodge
39e64c1e56 work in progress. Need to commit before rebasing to master 2012-09-27 10:24:53 -04:00