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

3467 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Vasyl Nakvasiuk
28b0ba5e10 Migrate video tests to videoalpha tests, remove video tests. 2013-08-12 14:31:47 +03:00
Chris Dodge
20b957518c resolve last code violation 2013-08-09 20:53:17 -04:00
Chris Dodge
f170d85547 fix wrapping, but mainly want to kick off another build due to Jenkins problem 2013-08-09 20:46:14 -04:00
Chris Dodge
1c2958e35d address PR feedback 2013-08-09 20:46:14 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Chris Dodge
6b0e992d9e change regex names to better reflect what the actually match on 2013-08-09 20:46:13 -04:00
Chris Dodge
d9d8d96e05 also support a link rewriting on course import and clone for the following format /courses/[org]/[course]/[run]/. We just need to substitute in the new course-id. 2013-08-09 20:46:13 -04:00
Chris Dodge
e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format 2013-08-09 20:46:13 -04:00
Chris Dodge
25d6de243e add portable link rewriting on clone. Added tests. 2013-08-09 20:46:12 -04:00
Chris Dodge
36fda35040 do portable link rewriting on import and add test to confirm it 2013-08-09 20:46:12 -04:00
Vik Paruchuri
5c9538a9a1 Address review comments 2013-08-09 16:46:25 -04:00
cahrens
835edbf32f Change locators to a restful interface. 
Don't use ; @ and # as separators.
 2013-08-09 14:49:32 -04:00
Vik Paruchuri
8cf82f2973 Fix self assessment test 2013-08-09 14:38:30 -04:00
Vik Paruchuri
6e41c082b1 Fix tests 2013-08-09 12:30:05 -04:00
chrisndodge
09a83dcd1e Merge pull request #589 from edx/fix/cdodge/better-export-error-messaging 
give some debug message regarding why export has failed
 2013-08-09 07:21:20 -07:00
Valera Rozuvan
f301231051 Enabled tabbing to volume slider. 2013-08-09 09:22:57 +03:00
Valera Rozuvan
5380b5cfc3 Making it possible to tab through individual speeds. 
In speed control, when it is focused, a drop down becomes available which contains all
of the available speeds that the player can switch to. When using the Tab button to
tab through all of the controls, it should be possible to select individual speed with
the keyboard.
 2013-08-09 09:22:57 +03:00