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

10694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Hess
d265c255ec Merge branch 'master' of github.com:MITx/mitx 2013-02-25 18:42:39 -05:00
John Hess
fbce425152 drag and drop now correctly handles cases where no draggables should be dragged 2013-02-25 18:42:34 -05:00
chrisndodge
ae681a52f9 Merge pull request #1549 from MITx/bug/dhm/video 
Somehow the saves changed to just sets w/ don't send data to the server.
 2013-02-25 10:30:47 -08:00
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
David Ormsbee
f519c4f571 Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui 
Feature/victor/revert revert of forums ui
 2013-02-25 09:03:33 -08:00
Victor Shnayder
fe47d96969 Merge pull request #1547 from MITx/fix/will/cs191_symmath_check_ans=0_bug 
Fixed a bug in symmath_check():
 2013-02-25 08:48:23 -08:00
David Ormsbee
dde4fc981b Merge pull request #1546 from MITx/fix/cdodge/make-jump-to-handle-lost-slash 
add a 'missing slash' regular expression for Location patterns in order ...
 2013-02-25 08:22:24 -08:00
Will Daly
862ce67bfc Fixed a bug in symmath_check(): one of the if statements 
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated  bool(ans) was redundant, so I removed it.
 2013-02-25 10:59:33 -05:00
Chris Dodge
752ff20cf5 add a 'missing slash' regular expression for Location patterns in order to account for dropped slash with the i4x:// pattern. Certain redirect cases will cause this 2nd slash to be dropped (I think via Nginx) 2013-02-25 10:45:00 -05:00
David Ormsbee
3a0c1eaa71 Merge pull request #1545 from MITx/feature/victor/dynamic-cohorts 
Feature/victor/dynamic cohorts
 2013-02-25 07:26:25 -08:00
Your Name
9f58f6890d Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-25 09:31:28 -05:00
Victor Shnayder
db06efae75 Prevent scroll-to-top on clicks in cohorts views 
Have to return false from event handlers to avoid href="#"
links from sending the user to the top of the page.
 2013-02-24 19:44:41 -05:00
Victor Shnayder
01a38c29be Add auto-cohorting functionality. 
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
 2013-02-24 18:48:01 -05:00
Victor Shnayder
8e93e0770f Merge pull request #1509 from MITx/feature/victor/capa-finished 
Add showanswer="finished" option and tests
 2013-02-24 13:24:34 -08:00
Ned Batchelder
ff35d3e6d9 Merge in a cherry-picked commit 2013-02-22 10:54:01 -05:00
Ned Batchelder
2e21c71fc4 A script to run just one test, based on the test failure description. 2013-02-22 10:52:25 -05:00
Diana Huang
ed955df230 Merge pull request #1529 from MITx/feature/vik/oe-messages 
Feature/vik/oe messages
 2013-02-22 07:31:06 -08:00
Vik Paruchuri
d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-22 10:21:34 -05:00
David Ormsbee
215f6aeb27 Merge pull request #1505 from MITx/feature/brian/pdf_js 
Feature/brian/pdf js
 2013-02-21 17:28:16 -08:00
Brian Wilson
d42a12da59 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 17:50:08 -05:00
Brian Wilson
8076c5b731 remove unneeded files (that break collectstatic) 2013-02-21 17:38:00 -05:00
chrisndodge
7e107119b7 Merge pull request #1535 from MITx/fix/cdodge/make-jump-to-handle-lost-slash 
remove empty attempts and weights from simple test course
 2013-02-21 12:43:15 -08:00
Chris Dodge
103508b45d remove empty attempts and weights from simple test course 2013-02-21 15:41:59 -05:00
Brian Wilson
6d174ef029 remove dead code 2013-02-21 15:41:28 -05:00
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Brian Wilson
d5e34b0a44 fix initialization of scale dropdown, and check for valid values of page number 2013-02-21 15:35:03 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings 
Fix/cdodge/serializing ints as empty strings
 2013-02-21 12:12:44 -08:00
Diana Huang
76c4007449 Merge pull request #1522 from MITx/diana/click-tracking 
Add more click tracking and logging to the open ended grading interface
 2013-02-21 11:10:35 -08:00
Ned Batchelder
3580deaec0 Merge pull request #1534 from MITx/fix/zoldak/test-modulestore-naming 
Change test modulestore naming differentiation scheme to uuid
 2013-02-21 11:01:58 -08:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Jay Zoldak
9eb2766943 Change test modulestore naming differentiation scheme to uuid 2013-02-21 13:07:14 -05:00
Chris Dodge
bc1ee3dbfa Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 12:56:20 -05:00
Chris Dodge
041d28f0e9 use better variable names to assert that the expected item was indeed loaded 2013-02-21 12:56:17 -05:00
Don Mitchell
49cab68aee Merge pull request #1533 from MITx/fix/cdodge/template-got-renamed 
template name got changed. Need to reflect that on test.
 2013-02-21 09:27:23 -08:00
Chris Dodge
fa3402a977 template name got changed. Need to reflect that on test. 2013-02-21 12:25:10 -05:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests 
Make sure temp directories are properly cleaned up so running tests does...
 2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling 
Feature/cdodge/metadata inheritence crawling
 2013-02-21 08:29:54 -08:00
Chris Dodge
a7f6545cbc add unit test 2013-02-21 11:22:20 -05:00
Chris Dodge
68a8587ed2 don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts' 2013-02-21 11:02:47 -05:00
Diana Huang
9aac915c9f Remove unnecessary assignment 2013-02-21 10:33:48 -05:00
Brian Wilson
00e31c0116 fix toolbarViewer styling 2013-02-21 10:30:20 -05:00
Diana Huang
3a8b7156a0 Merge branch 'master' into diana/click-tracking 2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0 Address code review feedback 
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
 2013-02-21 10:17:08 -05:00
Jay Zoldak
8b1579e490 Merge pull request #1527 from MITx/feature/vik/check-if-submission-allowed 
Feature/vik/check if submission allowed
 2013-02-21 06:37:50 -08:00
Brian Wilson
731f4abd8a fix bug with nav to a page, and add pdfviewer.css. 2013-02-21 03:15:08 -05:00
Brian Wilson
1850528a99 add contents of pdfjs to common/static/js/vendor, after fixing CR/LF issues in localization files 2013-02-20 18:49:59 -05:00
Brian Wilson
50cae69945 define pdfviewer.js, and use from static_pdfbook.html 2013-02-20 18:37:17 -05:00
Vik Paruchuri
9d5a08fc6d Fix location string 2013-02-20 18:07:24 -05:00