Commit Graph

23964 Commits

Author SHA1 Message Date
Sylvia Pearce
4f2e18026a Add information about creating a video table of contents 2014-06-17 14:25:10 -04:00
muhammad-ammar
ac26f27898 Merge pull request #4125 from edx/ammar/improve-certificates-test-time
Improve certificates test time
2014-06-17 18:45:35 +05:00
Jay Zoldak
14a80e9c3c Merge pull request #4114 from edx/zoldak/fix-negative-assertion
Speed up test by fixing negative assertion
2014-06-17 09:12:11 -04:00
Jay Zoldak
6d53bf710d Merge pull request #4115 from edx/zoldak/fix-test-captions-closed
Speed up test for closed caption state
2014-06-17 09:11:47 -04:00
Don Mitchell
17210d18ad Merge pull request #4078 from edx/dhm/heartbeat
Refactor heartbeat to delegate to the modulestores and sql
2014-06-17 08:44:37 -04:00
Dave St.Germain
0b37c987c6 Merge pull request #3908 from edx/dcs/support-dashboard
Added manual refund page for support.
PR-615
2014-06-17 08:27:34 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support.
PR-615
2014-06-17 08:24:02 -04:00
zubair-arbi
3a26e813bf Merge pull request #3898 from edx/zub/bugfix/std1629-annotationtool
fix reply/return to annotation links
2014-06-17 16:35:13 +05:00
Anton Stupak
bf8876e198 Merge pull request #4106 from edx/anton/fix-seek-log
Video: fix seek tracking log.
2014-06-17 12:05:20 +03:00
Muhammad Ammar
346164189f Improve certificates test time 2014-06-17 08:54:52 +00:00
zubair-arbi
6cb6680139 fix reply/return to annotation links
STUD-1629
2014-06-17 12:16:07 +05:00
polesye
af67873b7b Fix seek log. 2014-06-17 08:59:11 +03:00
Sarina Canelake
8191d3c77e fixup! Fix i18n translation issues 2014-06-16 23:10:03 -04:00
Jim Abramson
0b398c8976 Merge pull request #4118 from edx/jsa/bugfix-cc-user
bugfix: avoid side-effects when overriding User.default_retrieve_params
2014-06-16 16:24:15 -04:00
jsa
51f3b94f53 bugfix: avoid side-effects when overriding User.default_retrieve_params 2014-06-16 16:01:13 -04:00
Diana Huang
6808790306 Merge pull request #4108 from edx/diana/update-choose-form
Revise course mode choose page.
2014-06-16 14:51:21 -04:00
Diana Huang
2dbf9442a6 Revise course mode choose page.
LMS-2796
2014-06-16 14:08:40 -04:00
Jay Zoldak
4ac1079a99 Speed up test for closed caption state 2014-06-16 13:59:19 -04:00
Jay Zoldak
c33261aefc Speed up test by fixing negative assertion 2014-06-16 13:47:14 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql
LMS-2801
2014-06-16 13:16:32 -04:00
zubair-arbi
b60b7c7e5a Merge pull request #4054 from edx/zub/bugfix/std1775-uploadpdfbutton
trigger change event for file field while uploading pdf
2014-06-16 20:17:14 +05:00
Jay Zoldak
b47e397d64 Merge pull request #4089 from edx/zoldak/courses-test
Fix the CoursePagesTest
2014-06-16 10:45:39 -04:00
Jim Abramson
c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users
implement forums endpoint for searching users.
2014-06-16 10:15:01 -04:00
jsa
c2ebfde429 implement forums endpoint for searching users 2014-06-16 10:12:52 -04:00
Alexander Kryklia
1d5f5db9c6 Merge pull request #4104 from edx/alex/return_html5_video_sources_in_docstring_for_easy_testing
Add examples of html5 videos to docstrings.
2014-06-16 13:37:16 +03:00
Alexander Kryklia
e032ab1877 Add examples of html5 videos to docstrings. 2014-06-16 12:46:13 +03:00
zubair-arbi
8e47219a8d trigger change event for file field while uploading pdf
STUD-1775
2014-06-16 14:06:33 +05:00
e0d
f1bc7a162d Merge pull request #4098 from edx/e0d/paver-shim
shim to update ruby/node, not python reqs
2014-06-14 10:36:53 -04:00
Andy Armstrong
5d1c5ca5f8 Merge pull request #4059 from edx/andya/xblocks-as-advanced-problems
Allow xblocks to be added as advanced problem types
2014-06-14 08:00:24 -04:00
Andy Armstrong
6704d59db0 Allow xblocks to be added as advanced problem types 2014-06-13 17:51:46 -04:00
jmclaus
27cdb6820f Merge pull request #4084 from edx/jmclaus/i18n-formula-equation-input
FormulaEquationInput: i18n
2014-06-13 23:48:48 +02:00
e0d
fbde5fcd7c missed commit 2014-06-13 17:48:38 -04:00
jmclaus
c3520fa1e0 Merge pull request #4085 from edx/jmclaus/i18n-chemical-equation-input
ChemicalEquationInput: i18n
2014-06-13 23:48:07 +02:00
jmclaus
a14be4716d Merge pull request #4087 from edx/jmclaus/i18n-matlab-input
MatlabInput: i18n
2014-06-13 23:44:06 +02:00
e0d
2250338eba shim to update ruby/node, not python reqs 2014-06-13 17:42:28 -04:00
David Baumgold
290906acb0 Merge pull request #4094 from edx/db/http-stub-respond-to-HEAD
make our HTTP stub services respond to HEAD requests
2014-06-13 16:33:40 -04:00
Steven Burch
7c71725f11 Merge pull request #4008 from edx/stv/jsinput
Fix Jasmine tests for JSInput
2014-06-13 13:01:31 -07:00
muhammad-ammar
230aa5e9f6 Merge pull request #4070 from edx/ammar/video-tests-improvements
Video Test Improvements
2014-06-13 23:43:45 +05:00
David Baumgold
bafdb8ecb1 make our HTTP stub services respond to HEAD requests 2014-06-13 14:42:23 -04:00
stv
fd10fbf725 Fix JSInput scope leak
Declare variables locally
- The `allSections` variable was leaking into the global scope, due to a
  typo in the declaration.
- `dataProcessed` can be declared more narrowly within the callback.
2014-06-13 11:04:24 -07:00
stv
cf14dee790 Fix JSInput test fixture
Clean up fixtures automatically between tests
- Nesting test fixture markup within a DIV allows Jasmine to
  automatically restore the fixture to a clean state between each test
  run.

Fix id attribute collision typo
- This looks like a copy/pasta gone wrong; the two test INPUT elements
  were both declared with the same id, `input_1`.

Remove trailing whitespace
2014-06-13 11:04:24 -07:00
stv
bdf90bfcfb Remove superfluous JSInput test
The behavior previously tested here was to check that if a JSInput
element was marked as not processed, re-walking the DOM *should* have
reinitialized it. Unfortunately, this behavior is not supported by the
underlying JSChannel library. In fact, if JSChannel detects an existing
channel with the same origin and scope, it throws an uncaught exception,
leaving the DOM in a "broken" state.

JSInput will prevent duplicates from being added, as long as we don't
manually update the `data-processed` attribute. This behavior is already
being tested.
2014-06-13 11:04:24 -07:00
stv
60a9e99871 Fix JSInput tests
Select DOM elements with wildcard syntax

- DOM lookups were being done with non-existent literal selectors, so it
  was returning empty lists. As assertions were to be made while
  iterating over the list of elements, nothing was actually being
  verified.

- Common code has been centralized in the setup function. By declaring
  CSS selectors once, we minimize the odds of inadvertently using the
  wrong selector, as happened here.

- Had these tests actually been iterating over a non-empty list, this
  would have thrown undefined exceptions. jQuery.each calls its handler
  with an index and an item/object as the arguments. However, the object
  is a DOM-object, not a jQuery-object.  These tests break, as they had
  assumed the latter.
2014-06-13 11:04:24 -07:00
stv
e2cab19084 Ensure JSInput tests actually run
This test currently fails, meaning that the existing tests weren't
testing what they claimed.

Assertions are made for each element returned by the CSS selectors.
However, the selectors are assumed to be wildcard matches, but are
actually literal selectors. As there are no matched elements, this
causes the assertions to be (silently) checked zero times, without
failure.
2014-06-13 11:04:24 -07:00
Han Su Kim
858f3ae5c9 Merge pull request #4075 from edx/han/regenerate_user
Transition to Oqaque Keys
2014-06-13 11:39:56 -04:00
Sarina Canelake
a58149eb81 Merge pull request #4091 from edx/sarina/06132014-language-update
Update translations (autogenerated message)
2014-06-13 10:55:12 -04:00
Muhammad Ammar
dc135e4398 Video Test Improvements 2014-06-13 14:52:04 +00:00
Han Su Kim
8fdec439ee Changing over imports to opaque_keys.edx 2014-06-13 09:36:40 -04:00
Sarina Canelake
11d3ddfc10 Update translations (autogenerated message) 2014-06-13 09:27:28 -04:00
Will Daly
c0bdd9b2f3 Merge pull request #4088 from edx/will/ora2-release-2014-06-13T11.52
ORA2 release-2014-06-13T11.52
2014-06-13 09:26:35 -04:00