Commit Graph

28558 Commits

Author SHA1 Message Date
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
Matjaz Gregoric
5aabd3a48e Add scope/field selector settings for LinkedIn provider.
This change adds three new configuration variables to third_party_auth's LinkedIn provider:

* SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE,
* SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS,
* SOCIAL_AUTH_LINKEDIN_OAUTH2_EXTRA_DATA

Being able to configure these additional settings is useful if you want
the LinkedIn provider to pre-populate the email field when a new user
registers via the linkedin provider.

The Google provider prepoulates the email field by default, but if you
want LinkedIn to do the same, these two settings should be set to:

SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE = ['r_basicprofile', 'r_emailaddress']
SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS = ['email-address']

For more info see:
http://psa.matiasaguirre.net/docs/backends/linkedin.html
2014-06-16 10:27:38 +02:00
e0d
6fdb4dc8da missed commit 2014-06-14 10:40:20 -04:00
e0d
be1479deb2 shim to update ruby/node, not python reqs 2014-06-14 10:40:07 -04: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
04fcebaf47 Allow xblocks to be added as advanced problem types 2014-06-14 08:06:51 -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
David Ormsbee
3a5ba4ba83 Bump opaque_key dependency to 0.1.1 2014-06-13 15:48:14 -04:00
David Ormsbee
060b8680f4 update opaque keys dependency to fix install 2014-06-13 15:48:09 -04: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
Jay Zoldak
b2c0e0584d Fix the CoursePagesTest 2014-06-13 08:17:29 -04:00
Will Daly
cc457b4458 ORA2 release-2014-06-13T11.52 2014-06-13 08:06:47 -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
501a1b59c4 Merge pull request #4083 from edx/alex/fix_syntax_error_in_video_player_test
Fix incorrect video bok choy test.
2014-06-13 11:24:12 +03:00
Alexander Kryklia
eb8d45b97c Fix incorrect video bok choy test. 2014-06-13 10:25:45 +03:00
Han Su Kim
0b93c5a827 Squashing commits,
Squashing commits

Transition to Oqaque Keys

Bug fixes

Fixing regenerate_user
2014-06-12 18:24:47 -04:00
Sarina Canelake
147dda73e0 Merge pull request #4076 from edx/sarina/ignore-maps
Ignore *.css.map files
2014-06-12 14:39:43 -04:00
Sarina Canelake
ca64189f0f Ignore *.css.map files 2014-06-12 13:58:39 -04:00
Alexander Kryklia
acf298e9ad Merge pull request #4074 from edx/alex/fix_video_saved_editor
Fix failing test and update documentation of video player
2014-06-12 20:03:53 +03:00
Sarina Canelake
5bcd4c54cc Merge pull request #4055 from edx/sarina/fix-underscore-resource
Sarina/fix underscore resource
2014-06-12 12:20:57 -04:00
Alexander Kryklia
6ea3c8cbdd Fix failing test and update docstrings for video player
Fixes BLD-1115
2014-06-12 19:06:07 +03:00
Sarina Canelake
6418f6fe8b Add Chinese (Hong Kong) language 2014-06-12 10:41:09 -04:00
Sarina Canelake
52756cf829 Fix Transifex configuration so we can merge translations 2014-06-12 10:41:08 -04:00