Commit Graph

8552 Commits

Author SHA1 Message Date
Tim Babych
f4280377c5 Do not print exception message below stacktrace 2014-06-19 12:19:21 +03:00
Sarina Canelake
4477c2857f Merge pull request #4156 from edx/sarina/fix-i18n-bugs
Fix variable names to give context for translators
2014-06-19 00:13:38 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators
fix other various i18n issues
2014-06-18 23:28:39 -04:00
Adam
d3d45b8863 Merge pull request #4157 from edx/release
Release
2014-06-18 17:26:39 -04:00
Christina Roberts
b7eea135d4 Merge pull request #4119 from edx/christina/requirejs-promise
Wait for scripts defined in common xmodule code to execute.
2014-06-18 14:56:10 -04:00
Calen Pennington
7a452b6265 Merge pull request #4113 from cpennington/remove-locator
Remove locator.py (now sourced from the external opaque_keys library)
2014-06-18 14:44:10 -04:00
Calen Pennington
c00f80d4fa Remove locator.py (now sourced from the external opaque_keys library)
[LMS-2757]
2014-06-18 13:16:25 -04:00
Ben McMorran
702bdd36a9 Merge pull request #4060 from edx/benmcmorran/edit-tracking
Tracks last edited date and user, and adds has_changes for blocks
2014-06-18 13:13:26 -04:00
cahrens
3acf394d05 Wait for scripts defined in common xmodule code to execute.
STUD-1792
2014-06-18 13:11:37 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
Usman Khalid
3d0409773b Set position for collapsible.js full-bottom link.
Currently it is covering the whole parent div.

LMS-2852
2014-06-18 18:20:11 +05:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference
FOR-545
2014-06-18 14:26:30 +05:00
Gabe Mulley
2ca79f34cf Merge branch 'release' 2014-06-17 17:07:13 -04:00
Sarina Canelake
a8cd760ce3 Merge pull request #4121 from edx/sarina/fix-i18n-bugs
Fix i18n translation issues
2014-06-17 16:14:41 -04:00
Jay Zoldak
e52c948135 Temporarily disable the studio bok-choy CoursePagesTest 2014-06-17 13:28:10 -04:00
Sarina Canelake
b70bd2be78 Use ngettext rather than "word(s)" for plural phrases 2014-06-17 13:25:46 -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
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
Diana Huang
2dbf9442a6 Revise course mode choose page.
LMS-2796
2014-06-16 14:08:40 -04:00
polesye
0dbcf06280 Fix i18n in ChoiceGroup and ChoiceTextGroup. 2014-06-16 13:57:28 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql
LMS-2801
2014-06-16 13:16:32 -04:00
Waheed Ahmed
872d7b6f42 Fixed MATLAB Run Code bug with answer boxes.
LMS-2807
2014-06-16 20:58:35 +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
Alexander Kryklia
e032ab1877 Add examples of html5 videos to docstrings. 2014-06-16 12:46:13 +03:00
jmclaus
27cdb6820f Merge pull request #4084 from edx/jmclaus/i18n-formula-equation-input
FormulaEquationInput: i18n
2014-06-13 23:48:48 +02: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
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
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
Muhammad Ammar
dc135e4398 Video Test Improvements 2014-06-13 14:52:04 +00:00
Jay Zoldak
b2c0e0584d Fix the CoursePagesTest 2014-06-13 08:17:29 -04:00
jmclaus
5833af2489 MatlabInput: i18n 2014-06-13 14:01:09 +02:00
jmclaus
e7d3538c07 ChemicalEquationInput: i18n 2014-06-13 13:29:08 +02:00
jmclaus
f52c1d48de FormulaEquationInput: i18n 2014-06-13 12:10:47 +02:00
Alexander Kryklia
eb8d45b97c Fix incorrect video bok choy test. 2014-06-13 10:25:45 +03:00
Alexander Kryklia
6ea3c8cbdd Fix failing test and update docstrings for video player
Fixes BLD-1115
2014-06-12 19:06:07 +03:00
Don Mitchell
ed2358ab04 Merge pull request #4063 from edx/dhm/mongo_tweaks
Fix wiki search query
2014-06-12 10:07:03 -04:00
Brian Talbot
14ad71f206 Merge pull request #3462 from edx/andya/source-maps
Update SASS ( 3.3.5), Bourbon ( 4.0.2), Neat (1.6.0)
2014-06-11 22:31:37 -04:00