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

4395 Commits

Author SHA1 Message Date
Don Mitchell
438bbffb93 Add field iterator which includes namespaced fields 
And fix get_explicitly_set to use it and to get the json not native
field values.
 2013-08-16 10:42:53 -04:00
Don Mitchell
929597ce84 Move load_from_json to the test file only 
It's a reasonable demo of in memory xblock creation, but doesn't fit
the xblock pattern. Moving temporarily to keep the dag persistence test.
 2013-08-16 10:42:53 -04:00
Don Mitchell
857431f793 Clarify comments re behavior 2013-08-16 10:42:53 -04:00
Don Mitchell
a507ebc1b6 Clarify function name 
and fix some comments ref'g old names
 2013-08-16 10:42:53 -04:00
Don Mitchell
e4a69373d0 xblock fields persist w/o breaking by scope 
Letting xblocks handle scope rather than separating fields into
different attrs. Although, split still shunts content fields to a
different collection than setting and children fields.

The big difference is that content fields will always be a dict and not
sometimes just a string and there's no special casing of 'data' attr.

The other mind change is no more 'metadata' dict.
 2013-08-16 10:42:52 -04:00
Anton Stupak
9b76b49292 Disable speed controls for unsupported browsers. 2013-08-16 14:44:44 +03:00
David Ormsbee
5f8eab5f95 Merge pull request #687 from edx/bugfix/ichuang/optioninput-msg 
capa optioninput template was missing msg output (needed for hints)
 2013-08-15 13:52:50 -07:00
Christina Roberts
03b6050348 Merge pull request #667 from edx/christina/read-only-api 
Make split mongo read-only API consistent with other modulestores.
 2013-08-15 13:05:58 -07:00
Carlos Andrés Rocha
f4fe6de38f Merge pull request #684 from rocha/test-invalid-youtube-ids 
Add test for invalid YouTube IDs strings
 2013-08-15 10:13:26 -07:00
cahrens
9f229a4605 Make get_errored_courses part of the modulestore API (with default implementation). 
Also clarifies the contraction of location.course_id by throwing an exception for lcoations that are not of category course.

Add test for course_id method.
 2013-08-15 12:50:37 -04:00
Vik Paruchuri
c9e0d36d16 Merge pull request #621 from edx/fix/vik/oe-issues 
Fix/vik/oe issues
 2013-08-15 08:27:34 -07:00
Carlos Andrés Rocha
9199f1d08b Add test for invalid YouTube IDs strings 2013-08-15 11:06:53 -04:00
Peter Baratta
55b67e39bb Merge pull request #680 from edx/peterb/move-numpy-seterr 
Move the silencing of numpy's warnings into test_calc.py
 2013-08-15 07:31:03 -07:00
Peter Baratta
5f3dd37f98 Move the silencing of numpy's warnings into test_calc.py 
..because that is where it is the most annoying/visible. Otherwise it really
has no effect on the LMS or anything else.
 2013-08-15 08:54:43 -04:00
Valera Rozuvan
8ba9497fd9 Merge pull request #675 from edx/anton/disable_0-25x_speed 
Add filter for playback rates.
 2013-08-14 19:46:58 -07:00
ichuang
501c089f41 capa optioninput template was missing msg output (needed for hints) 2013-08-14 21:51:40 -04:00
Sarina Canelake
6a1e88cf77 Merge pull request #681 from edx/sarina/hotfix/fix-combinedopenended 
Fix error seen in combinedopenended modules
 2013-08-14 13:53:52 -07:00
Sarina Canelake
f438922a88 Fix error seen in combinedopenended modules 2013-08-14 16:36:33 -04:00
Anton Stupak
b4df2c4d73 Add filter for playback rates. 2013-08-14 18:15:18 +03:00
cahrens
13ef870b1b pylint/pep8 cleanup. 
cleanup.
 2013-08-14 09:59:44 -04:00
cahrens
aed29cb01f Add get_instance method. 2013-08-14 09:50:00 -04:00
cahrens
70d5ec6ea4 Make it clear that get_course_for_item is only a helper method in mongo modulestore. 2013-08-14 09:04:58 -04:00
Valera Rozuvan
b583a4e793 Optimizing code. Caching an element selector. 2013-08-14 11:56:13 +03:00
Valera Rozuvan
99ae63777e Removed unnecessary tabindex = 0 from <a /> - they get it by default. 2013-08-14 11:51:15 +03:00
Valera Rozuvan
3b326c3072 Fixing spelling typos in comments. 2013-08-14 11:49:27 +03:00
Valera Rozuvan
efac70e6b3 Adding documentation to the event handlers for volume and speed control. 2013-08-14 10:51:45 +03:00
Valera Rozuvan
da3e21ceee Fixed tabbing backwards. 
Now you can tab through all of the controls in Video forwards, and then tab backwards.
 2013-08-14 10:51:45 +03:00
Valera Rozuvan
0a5d261fc4 For YouTube videos tabbing from Speeds to Volume closes Speeds dialog. 
An old TODO item was done. It turns out a simple case of calling
the method to bind handlers after the Spees dialog was re-rendered.
 2013-08-14 10:51:45 +03:00
Carlos Andrés Rocha
a2225aad01 Merge pull request #655 from rocha/cleanup-xmodule-test-imports 
Cleanup some xmodule tests imports and data directory location
 2013-08-13 14:48:26 -07:00
cahrens
e0aa46ab2d Make split mongo read-only API consistent with other modulestores. 2013-08-13 15:06:08 -04:00
chrisndodge
cd838e2652 Merge pull request #644 from edx/fix/cdodge/remove-unused-import-code 
remove unused code from xml_import.py
 2013-08-13 09:57:40 -07:00
Christina Roberts
f88de3920a Merge pull request #627 from edx/christina/restful-url 
Change locators to a restful interface.
 2013-08-13 07:34:22 -07:00
Carlos Andrés Rocha
82ae9e775d Cleanup some xmodule tests imports and data directory location 2013-08-12 20:58:36 -04:00
Carlos Andrés Rocha
8a527d16a6 Fix error when there is an invalid YouTube property in a video module 2013-08-12 19:29:14 -04:00
Julian Arni
7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime 
Conflicts:
	cms/djangoapps/contentstore/views/preview.py
 2013-08-12 15:04:49 -04:00
Julian Arni
91b23c406a Merge branch 'master' into jkarni/fix/descriptorsystemruntime 2013-08-12 15:00:26 -04:00
David Baumgold
6a3f0c141d Merge pull request #564 from edx/db/xblock-student-view 
XBlock integration for Studio: student view
 2013-08-12 11:55:40 -07:00
cahrens
98a47857b3 Allow version ID to appear after course ID. 
cleanup
 2013-08-12 14:49:27 -04:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video 
Migration videoalpha module to one main video module
 2013-08-12 10:56:12 -07:00
Carlos Andrés Rocha
c727d43ce6 Merge pull request #617 from edx/rocha/change-console-stream-to-stderr 
Change console logging stream from stdout to stderr
 2013-08-12 10:55:29 -07:00
Chris Dodge
05e1ffb190 remove unused code from xml_import.py 2013-08-12 12:49:15 -04:00
Peter Baratta
bfccfba9d4 Merge pull request #512 from edx/peterb/formula-preview 
Calc module changes: previewing and <formulaequationinput>

To see individual commits, see tag peterb/formula-preview/presquash
 2013-08-12 09:24:29 -07:00
Peter Baratta
735e3b01a2 Create a new response type for Numerical/Formula 
Named `FormulaEquationInput` (name up for debate)

- Based off ChemEqnIn
- Add FormulaEquationInput in inputtypes.py
- Add a call to a skeleton method for a preview

javascript:

- Queue up some MathJax
- Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview
- Tests

Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
 2013-08-12 11:48:45 -04:00
Peter Baratta
a1162cbb34 Change calc module 
- Create a method called `parse_algebra`. It takes a string of math and returns with a `pyparsing.ParseResults` object representing it.
- `evaluator` takes this tree and applies the old "parse actions" to it to get the same number as it used to.
- Change calc's API: `evaluator` to use `case_sensitive` rather than `cs`
- Add most of the capability for latex rendering
 2013-08-12 11:40:20 -04:00
Peter Fogg
e20acee4c4 Working on Videoalpha test fix. 
Fixed all common and LMS tests.

The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
 2013-08-12 14:32:15 +03:00
Anton Stupak
a6f6a50792 Disable js unit tests. 2013-08-12 14:32:14 +03:00
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 2013-08-12 14:31:48 +03:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
e381adbc3e Make js unit tests out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
8ba94bb2a5 Remove js unit tests. 2013-08-12 14:31:47 +03:00