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

3687 Commits

Author SHA1 Message Date
Brian Talbot
0aea85a4d9 studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators 2013-03-14 12:55:44 -04:00
cahrens
e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1 Saving work. 2013-03-14 09:22:58 -04:00
John Hess
0b2226b051 Merge pull request #1660 from MITx/hotfix/jkarni/folditorder 
Table order fix (again), changes a single character
 2013-03-12 16:17:08 -07:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -04:00
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -04:00
Julian Arni
1058b552f2 Table order fix (again) 2013-03-12 11:30:14 -04:00
Calen Pennington
dfd66c6520 Merge pull request #1650 from MITx/victor/fix-auto-cohorting 
Add logging to debug strange cohort behavior on prod.
 2013-03-12 04:28:28 -07:00
John Hess
331806f155 Merge pull request #1646 from MITx/feature/jkarni/folditx 
Feature/jkarni/folditx
 2013-03-11 15:50:05 -07:00
Victor Shnayder
b06615298f Add logging to debug strange cohort behavior on prod. 
Strange behavior:
  - There are 20 cohorts that users should be randomly assigned
    into in HeroesX
  - Almost all, but not all (e.g. ~3300 / 3400) users end up in the
    same group.
  - testing manually locally and on prod in a django shell shows
    nothing wrong
 2013-03-11 15:24:14 -07:00
John Hess
ad92eb4d02 whitespace back to original. for real though. 2013-03-11 18:05:34 -04:00
John Hess
00c35c95a4 whitespace back to original 2013-03-11 18:05:10 -04:00
John Hess
cc2c26b924 reverted change to definition to/from xml 2013-03-11 18:04:21 -04:00
Jay Zoldak
1c98d5fc8d Fix modulestore tests for pep8 violations 2013-03-11 15:16:09 -04:00
David Ormsbee
0605c94113 Merge pull request #1636 from MITx/feature/brian/htmlbook 
Initial implementation of htmlbook.
 2013-03-11 11:38:46 -07:00
Brian Wilson
53f85f2a07 return empty list if no html or pdf textbook appears in policy.json 2013-03-11 13:52:43 -04:00
David Ormsbee
aceb666076 Merge pull request #1642 from MITx/fix/rocha/numericresponse-exponential 
Make numeric response handle plus sign exponential correctly
 2013-03-11 10:03:44 -07:00
Carlos Andrés Rocha
5f95c6848c Make numeric response handle plus sign exponential correctly 
NumericResponse was failing to accept as correct an answer with a plus
sign in the exponential. For example: 5.0e+1 was marked as incorrect
if the answer was 50. However, 5.0e1 was marked as correct. This
caused confusion, since the answer shown to students included the plus
sign.

LMS Lighthouse [#242]
 2013-03-11 12:53:01 -04:00
Julian Arni
588b27c9dc Added Descriptor method, fixed order issue. 2013-03-11 11:17:12 -04:00
Diana Huang
421e169e1e Update tests with new attributes. 2013-03-11 10:29:18 -04:00
Diana Huang
0c949d20c9 Add the ability to hide correctness markers 
with a custom message for when they submit something.
 2013-03-11 10:12:33 -04:00
Carlos Andrés Rocha
fb407e3cb8 Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error 
Fixed undefined variable error in choicegroup.html
 2013-03-08 14:30:59 -08:00
Calen Pennington
8bb0c64ff9 Set grading policy to an empty dict if it can't be decoded from json 2013-03-08 15:36:19 -05:00
Will Daly
607f27e715 Fixed undefined variable error in choicegroup.html 2013-03-08 14:06:45 -05:00
Calen Pennington
d9b68e2de2 Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics 
Add datadog metrics capture around heartbeat timing
 2013-03-08 08:59:44 -08:00
Jay Zoldak
1f30baabfd Change default browser for lettuce back to chrome. 2013-03-08 11:15:14 -05:00
Jay Zoldak
21e7bc5128 More robust handling for finding and clicking on objects by css. 
Tag tests not working under PhantomJS to skip for now.
 2013-03-08 11:15:14 -05:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
Will Daly
352126b417 Updated tests for correct_map to match changes made to get_npoints 2013-03-08 10:08:20 -05:00
David Ormsbee
5f44b2de04 minor comment on partial credit 2013-03-07 23:52:01 -05:00
David Ormsbee
30f3923c15 Quick patch to regression causing partial credit to break on 6.00x 2013-03-07 23:50:09 -05:00
Diana Huang
2c6ee50ac3 Fix issue where javascript was disappearing from problem html 2013-03-07 19:39:43 -05:00
Victor Shnayder
b02ff247cb Merge pull request #1623 from MITx/fix/will/checkbox_bug 
Fixed checkbox bug in capa_module
 2013-03-07 14:05:52 -08:00
Will Daly
6a54c2a2bc Fixed checkbox bug in capa_module 2013-03-07 17:01:56 -05:00
Chris Dodge
c23c5cc3d9 add comments 2013-03-07 16:12:21 -05:00
Christina Roberts
cb70a0f9d9 Merge pull request #1620 from MITx/fix/cdodge/static-url-allow-references-to-common 
need to support link references to static content that is in the code ba...
 2013-03-07 13:07:16 -08:00
Chris Dodge
891bddcdf9 need to support link references to static content that is in the code base (e.g. module's .js/.css) 2013-03-07 14:28:09 -05:00
Will Daly
e86ed0db91 Merge branch 'master' into fix/will/mc_checkbox_bug 2013-03-07 12:07:34 -05:00
Will Daly
8d83d2fb4e Added handling of condition when no multiple choice item selected, 
but the answer is incorrect.
 2013-03-07 10:52:19 -05:00
Chris Dodge
9ba759802c make export a bit more resilient. If there's a piece of metadata that we can't serialize - i.e. someone wrote a new bool attribute and didn't put it in the type mapping table - then we log the exception and continue. 2013-03-07 10:43:36 -05:00
Will Daly
e841f29352 Updated CSS and template for choicegroup response 
so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.

Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block
 2013-03-07 10:17:03 -05:00
Victor Shnayder
5ec39825e0 Merge pull request #1604 from MITx/hotfix/jkarni/folditscore 
Hotfix/jkarni/folditscore
 2013-03-06 17:32:29 -08:00
Victor Shnayder
b6a6e10bb5 Fix max_attempts='' 
That's what studio defaults to, and recent changes made it break.
Added a few tests to make sure it doesn't happen again.
 2013-03-06 20:16:24 -05:00
Victor Shnayder
57700a56d4 remove links to missing image files. We can add them if needed later. 2013-03-06 19:11:36 -05:00
Brian Wilson
b5ab766092 initial framework for htmlbook 2013-03-06 17:57:33 -05:00
jkarni
3bb108b12e Merge pull request #1608 from MITx/feature/jkarni/genex 
Feature/jkarni/genex
 2013-03-06 14:35:01 -08:00
Diana Huang
5c3dfd9280 Update correctmap to handle partially correct answers, and 
fix annotation tests so that they use the new test_system functionality
 2013-03-06 16:43:12 -05:00
Victor Shnayder
12b6b7d403 Merge pull request #1609 from MITx/diana/refactor-chemical-equation 
Refactor Chemical Equation Preview
 2013-03-06 12:09:03 -08:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule 
Feature/abarrett/annotatable xmodule DO NOT MERGE
 2013-03-06 12:05:27 -08:00
Diana Huang
42e711e7d2 Update tests and documentation. 2013-03-06 14:53:13 -05:00