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

23917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Will Daly
cc457b4458 ORA2 release-2014-06-13T11.52 2014-06-13 08:06:47 -04: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
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
Sarina Canelake
3adc2f0a2e Fix opaque_keys imports from hotfixes 2014-06-11 21:32:41 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
Brian Talbot
786655f890 correcting poorly scoped Sass variables set in xmodules' .scss files to adhere to Sass 3.3 scoping 
see http://blog.sass-lang.com/posts/184094-sass-33-is-released for more information on 3.3+ variable scoping
 2014-06-11 21:19:46 -04:00
Brian Talbot
44982ae3ca correcting for updated Bourbon radial-gradient mixin syntax 2014-06-11 21:19:46 -04:00
Brian Talbot
02b0725456 correcting for Bourbon deprecated inline-block() mixin 2014-06-11 21:19:46 -04:00
Brian Talbot
5150b03423 updating Bourbon gem file to version 4.0.2 and Bourbon spec version requirement to 4.0.1 2014-06-11 21:19:36 -04:00
Brian Talbot
71ea2fe27b updating static common/static/sass bourbon/neat files 2014-06-11 21:19:26 -04:00
Brian Talbot
ae86c2a31c setting Bourbon spec version requirement to 4.0.1 and Neat spec version requirements to 1.6.0 2014-06-11 21:19:19 -04:00
Brian Talbot
cf63512538 updating Bourbon gem file to version 4.0.1 2014-06-11 21:18:08 -04:00
Brian Talbot
eca836c988 updating Neat gem file to version 1.6.0 2014-06-11 21:18:08 -04:00
Ben Patterson
e8ca25f2af Set sass spec version requirement to 3.3.5. 2014-06-11 21:18:08 -04:00
Andy Armstrong
f3dd8aee8a Update SASS pipeline to generate source maps 
Note: this requires SASS 3.3+ so do ```bundle install```
 2014-06-11 21:18:08 -04:00
Alison Hodges
1816f97fba Merge pull request #4064 from edx/ahodges/documentation/20140611chglog 
3 entries for June -> 1 entry
 2014-06-11 16:12:51 -04:00
Don Mitchell
4959f3b85b Fix wiki search query 
and formatting error in a doc file.
 2014-06-11 15:57:51 -04:00
Sarina Canelake
2e36fb293b Merge pull request #4046 from edx/hotfix/2014-06-11 
Hotfix 2014-06-11
 2014-06-11 14:23:25 -04:00
Sarina Canelake
236f36b349 Merge pull request #4057 from louyihua/dark_lang 
Do not merge zh-hk into zh-tw in darklang
 2014-06-11 14:16:46 -04:00
David Baumgold
5037d97837 Merge pull request #4033 from edx/db/kill-reviewboard 
Remove unused .reviewboardrc
 2014-06-11 13:53:56 -04:00
louyihua
6d7839007a Do not merge zh-hk into zh-tw in darklang 2014-06-12 01:19:49 +08:00
Jim Abramson
b6bf1b8848 Merge pull request #4056 from edx/jsa/search-spell-correction-fixes 
clarify and internationalize the search spell correction message.
 2014-06-11 13:14:56 -04:00
Calen Pennington
13ec3698d5 Merge pull request #4058 from cpennington/hotfix/lms-2830 
Allow users that have unregistered from a verified course to re-register.
 2014-06-11 13:05:12 -04:00
jsa
5dfd4d4dcc clarify and internationalize the search spell correction message. 2014-06-11 12:41:34 -04:00
Calen Pennington
f6ea16223b Allow users that have unregistered from a verified course to re-register. 
Fixes LMS-2830
 2014-06-11 12:37:53 -04:00
David Baumgold
ff42848ccc Merge pull request #4035 from edx/db/jenkins-is-not-special 
Move Jenkins scripts into `scripts` directory
 2014-06-11 11:58:20 -04:00
Mathew Peterson
fd002500e9 Merge pull request #4042 from edx/mathewpeterson/authors 
Adds Mat Peterson to authors file
 2014-06-11 11:40:33 -04:00
Julia Hansbrough
dc33897241 Merge pull request #4053 from edx/harvard-annotations-on-hotfix 
Harvard annotations on hotfix
 2014-06-11 11:39:11 -04:00
Anton Stupak
beca9b51d9 Merge pull request #4051 from edx/anton/i18n-choicetextgroup 
ChoiceTextGroup i18n.
 2014-06-11 18:19:24 +03:00
Don Mitchell
6d682787c5 Merge pull request #4047 from edx/dhm/mongo_indices 
Review all fs.files and modulestore indices
 2014-06-11 11:07:59 -04:00
David Baumgold
e0b693f1bf Merge pull request #4034 from edx/db/kill-nginx-proxy 
Remove unused nginx.conf
 2014-06-11 10:32:10 -04:00
Alison Hodges
48824b817a 3 entries for June -> 1 entry 2014-06-11 10:26:29 -04:00