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

11268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection 2013-03-12 15:24:10 -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
chrisndodge
90caa65b53 Merge pull request #1651 from MITx/fix/cdodge/pylint-improvements 
do a bunch of pylint improvements
 2013-03-11 18:18:00 -07:00
Chris Dodge
bf0e5a2701 do a bunch of pylint improvements 2013-03-11 21:14:24 -04: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
chrisndodge
894f9171be Merge pull request #1647 from MITx/fix/zoldak/pep8-cleanup-tests 
Fix modulestore tests for pep8 violations
 2013-03-11 12:20:38 -07:00
Jay Zoldak
1c98d5fc8d Fix modulestore tests for pep8 violations 2013-03-11 15:16:09 -04:00
Don Mitchell
d85f7ac9be Merge pull request #1645 from MITx/feature/cdodge/pylint-cleanup 
Feature/cdodge/pylint cleanup
 2013-03-11 12:10:05 -07:00
Julian Arni
6e92666a20 Fixed score order. 
Less is more.
 2013-03-11 14:57:19 -04:00
Chris Dodge
4ec3683c3c clean up some pylint violations 2013-03-11 14:57:04 -04:00
Chris Dodge
26f4424581 clean up some pylint violations 2013-03-11 14:55:37 -04:00
Chris Dodge
78c8358957 clean up pyling violations from views.py 2013-03-11 14:51:44 -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
Christina Roberts
ce1807b735 Merge pull request #1641 from MITx/fix/cdodge/delete-not-removing-parent-reference 
delete_item should update the parent's list of children to reflect the d...
 2013-03-11 10:00:39 -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
Calen Pennington
81527d60d8 Move pep8 and pylint into test suite, so that we can rachet down the number of violations 2013-03-11 12:27:56 -04:00
Brian Wilson
cd95872b52 htmlbook-specific styling to make Heroes text presentable. 2013-03-11 11:56:48 -04:00
Julian Arni
588b27c9dc Added Descriptor method, fixed order issue. 2013-03-11 11:17:12 -04:00
David Ormsbee
7806acc7cb Merge pull request #1638 from MITx/feature/diana/show-correctness 
Add the ability to hide correctness markers
 2013-03-11 08:14:18 -07:00
Brian Wilson
2199ae673b add checks that book_index is in range 2013-03-11 11:10:08 -04:00
Calen Pennington
fcc3113bbf Merge pull request #1637 from MITx/fix/cdodge/performance-optimize-comment-client-use-jumpto 
Fix/cdodge/performance optimize comment client use jumpto
 2013-03-11 08:02:28 -07:00
Chris Dodge
d38b37f0b4 delete_item should update the parent's list of children to reflect the delete operation. Also added unit test 2013-03-11 10:47:22 -04:00
Brian Wilson
fcb618f04e fix basic alignment issue with html textbook display 2013-03-11 10:38:32 -04:00
e0d
5b0849d4fc Merge pull request #1640 from MITx/feature/cale/specify-ruby-1.9.3 
Specify that mitx should use ruby 1.9.3-p374 for consistancy with prod
 2013-03-11 07:37:58 -07:00
Calen Pennington
a1febce86b Specify that mitx should use ruby 1.9.3-p374 for consistancy with prod 2013-03-11 10:33:09 -04:00
Diana Huang
421e169e1e Update tests with new attributes. 2013-03-11 10:29:18 -04:00
David Ormsbee
43ec6eaa52 Merge pull request #1639 from MITx/feature/dave/delft_logo 
Update of Delft logo (lighthouse ticket #234)
 2013-03-11 07:21:55 -07:00
David Ormsbee
a8ff7911f6 Update of Delft logo (lighthouse ticket #234) 2013-03-11 10:21:03 -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
Chris Dodge
cbcda0fc65 oops didn't mean to commit the test API key 2013-03-10 11:14:25 -04:00
Chris Dodge
18ee1018e6 optimize forum page rendering as we don't pre-compute the link urls to inline discussions. We can use jump_to urls and then figure out the link path if/when end-user clicks on it. This saves a lot of unnecessary round trips to the DB as path computation is expensive, especially when it being done for every discussion module in a course in a loop. 2013-03-10 11:11:17 -04:00
Brian Wilson
bed7dbdb6b fix plumbing for anchors and chapters. 2013-03-08 18:25:33 -05: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
e0d
7eee7a0d2a Merge pull request #1635 from MITx/fix/cale/handle-grading-json-breakage 
Set grading policy to an empty dict if it can't be decoded from json
 2013-03-08 12:47:37 -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
Don Mitchell
3d9878515e Merge pull request #1634 from MITx/bug/christina/advanced-settings 
Need to trigger invalid instead of error, after changes for new version ...
 2013-03-08 12:03:51 -08:00
cahrens
f5dd5d35e9 Need to trigger invalid instead of error, after changes for new version of Backbone. 2013-03-08 14:51:29 -05:00
Will Daly
607f27e715 Fixed undefined variable error in choicegroup.html 2013-03-08 14:06:45 -05:00
Christina Roberts
5eb43a627c Merge pull request #1632 from MITx/fix/zoldak/lettuce-click 
Fix lettuce tests so all studio ones are working and faster
 2013-03-08 11:04:50 -08:00
Jay Zoldak
c5a9ec5e86 Speed up the lettuce test for no policy settings. 2013-03-08 13:34:28 -05:00
Jay Zoldak
3c3f6c3cbe Revert lettuce css_find function to not fail if it does not find the element. 2013-03-08 13:34:28 -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
Calen Pennington
fab07597d2 Use https to talk to rubygems 2013-03-08 11:59:02 -05:00
Christina Roberts
849e8d6cdc Merge pull request #1630 from MITx/fix/zoldak/lettuce-click 
Fix lettuce tests to work with phantomJS
 2013-03-08 08:23:01 -08:00