Commits · dcfb95e76bf271d64679c3d08ae1a18e672ab52f · edx / edx-platform · GitLab

02 Feb, 2016 3 commits
- Merge pull request #11387 from edx/benp/fix-test-tooltip · dcfb95e7
```
Correct flaky condition on tooltip.
```
  Ben Patterson committed Feb 02, 2016
  dcfb95e7 Browse Files
- Merge pull request #11401 from edx/pdesjardins/PHX-248 · d6a76125
```
Edited wording of UI labels for configuring subsection prerequisites …
```
  Peter Desjardins committed Feb 02, 2016
  d6a76125 Browse Files
- Clarify method intent. Use BrokenPromise rather than assert. · 902126d5
  Ben Patterson committed Feb 02, 2016
  
  902126d5 Browse Files
01 Feb, 2016 9 commits
- Edited wording of UI labels for configuring subsection prerequisites (gating) · 2a5b6c9a
  Peter Desjardins committed Feb 01, 2016
  
  2a5b6c9a Browse Files
- Merge pull request #11370 from edx/diana/static-i18n-compiled-files · 4b1a37ef
```
Complete static i18n PR
```
  Diana Huang committed Feb 01, 2016
  4b1a37ef Browse Files
- Check in new static i18n JS files. · 1e1f5abe
  Diana Huang committed Feb 01, 2016
  
  1e1f5abe Browse Files
- Add ability to generate static i18n files. · cd0bb4c7
  Diana Huang committed Feb 01, 2016
  
  cd0bb4c7 Browse Files
- Merge pull request #10731 from doganov/TNL-3664-AUTHORS · 6723b896
```
Add Kaloian Doganov to AUTHORS
```
  Diana Huang committed Feb 01, 2016
  6723b896 Browse Files
- Merge pull request #11392 from edx/ned/find-good-email-for-committer · 5a8b3d02
```
Automatically find a better email for a committer than x@users.noreply.github.com
```
  Ned Batchelder committed Feb 01, 2016
  5a8b3d02 Browse Files
- Merge pull request #11384 from edx/douglashall/PHX-246/gating_multi_problem_prereq · c325fc63
```
PHX-246 Multiple problems in a prerequisite sequence causes grading to fail
```
  Douglas Hall committed Feb 01, 2016
  c325fc63 Browse Files
- Automatically find a better email for a committer than x@users.noreply.github.com · 367a90bb
  Ned Batchelder committed Feb 01, 2016
  
  367a90bb Browse Files
- Merge pull request #11385 from edx/douglashall/fix_xmodule_import · 97cf6dd4
```
Remove gating api import from course xmodule
```
  Douglas Hall committed Jan 31, 2016
  97cf6dd4 Browse Files
30 Jan, 2016 6 commits
- Correct flaky condition on tooltip. · 07f8b8e9
  Ben Patterson committed Jan 30, 2016
  
  07f8b8e9 Browse Files
- Merge pull request #11379 from edx/hasnain-naveed/HOL-44-extented · 907d3e9f
```
HOL-44 / Added check for duplication of email
```
  Douglas Hall committed Jan 30, 2016
  907d3e9f Browse Files
- Add self to AUTHORS · fe329922
  Kaloian Doganov committed Jan 30, 2016
  
  fe329922 Browse Files
- Merge pull request #11317 from edx/benp/test-edit-raw-old · bea3663e
```
[firefox upgrade] Wait for code mirror editor to be active
```
  Ben Patterson committed Jan 29, 2016
  bea3663e Browse Files
- Fix PHX-246 · 263c71a6
  Douglas Hall committed Jan 29, 2016
  
  263c71a6 Browse Files
- [firefox upgrade] Wait for code mirror editor to be active · d7be722c
```
Not an issue for our tests on firefox 28; however, once we upgrade to
Firefox 42 (or later), a new wait condition is needed here. Otherwise,
the content is not set because selenium's action chain is starting too
early.
```
  Ben Patterson committed Jan 29, 2016
  d7be722c Browse Files
29 Jan, 2016 18 commits
- Remove gating api import from course xmodule to avoid importing django related… · 7c923355
```
Remove gating api import from course xmodule to avoid importing django related code into non-django related code
```
  Douglas Hall committed Jan 29, 2016
  7c923355 Browse Files
- Merge pull request #11110 from edx/ormsbee/libsass · 30b5cebc
```
Speed up Sass compilation with libsass
```
  Andy Armstrong committed Jan 29, 2016
  30b5cebc Browse Files
- Merge pull request #11382 from edx/douglashall/update_milestones_dependency · 7ebffe2d
```
Updating edx-milestones dependency to fix edx-opaque-keys install
```
  Douglas Hall committed Jan 29, 2016
  7ebffe2d Browse Files
- Updating edx-milestones dependency to fix edx-opaque-keys install · a075ad86
  Douglas Hall committed Jan 29, 2016
  
  a075ad86 Browse Files
- Support compiling SASS for only one system · 99c90a64
  Andy Armstrong committed Jan 29, 2016
  
  99c90a64 Browse Files
- Speed up SASS compilation with libsass · c13e6230
  David Ormsbee committed Jan 29, 2016
  
  c13e6230 Browse Files
- Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating · dce3d9ca
```
PHX-219 Subsection Gating
```
  Douglas Hall committed Jan 29, 2016
  dce3d9ca Browse Files
- Merge pull request #11376 from edx/zub/add-edx-organizations-api-urls · a54107e5
```
add edx-organizations api urls in lms
```
  Zubair Afzal committed Jan 29, 2016
  a54107e5 Browse Files
- Added check for duplication of email · 0971e371
  Hasnain committed Jan 29, 2016
  
  0971e371 Browse Files
- add edx-organizations api urls in lms · da8a2d9b
```
ECOM-3558
```
  zubair-arbi committed Jan 29, 2016
  da8a2d9b Browse Files
- Merge pull request #11352 from edx/ziafazal/WL-209 · 6e861f26
```
ziafazal/WL-209:Cert Social Sharing customization
```
  Zia Fazal committed Jan 29, 2016
  6e861f26 Browse Files
- Merge pull request #11334 from edx/ziafazal/WL-210 · bae91014
```
ziafazal/WL-210: added branding to 404 and 500 error pages
```
  Zia Fazal committed Jan 29, 2016
  bae91014 Browse Files
- added branding to 404 and 500 error pages · 06e38e1c
```
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
```
  Zia Fazal committed Jan 29, 2016
  06e38e1c Browse Files
- Merge pull request #11242 from edx/asadiqbal08/WL-243-manual-lang · 87d9a079
```
WL-243 LMS Language Selection
```
  Asad Iqbal committed Jan 29, 2016
  87d9a079 Browse Files
- Merge pull request #11350 from edx/mrehan/unwanted-discussion-modules · b427da71
```
Fix - skip orphans while getting discussion modules
```
  M. Rehan committed Jan 29, 2016
  b427da71 Browse Files
- Merge pull request #11315 from open-craft/comprehensive-theme-on-django-templates · 3259df54
```
Make comprehensive theme work with django templates.
```
  Matjaz Gregoric committed Jan 29, 2016
  3259df54 Browse Files
- Merge pull request #11348 from edx/saleem-latif/WL-294 · 4f342dac
```
Going ahead with the merge.
```
  Saleem Latif committed Jan 29, 2016
  4f342dac Browse Files
- Skip orphans while getting discussion modules · 31b180be
  M. Rehan committed Jan 29, 2016
  
  31b180be Browse Files
28 Jan, 2016 4 commits
- Merge pull request #11368 from edx/hotfix/2016-01-28_release_into_master · 22eda46e
```
Merging release into master
```
  Douglas Hall committed Jan 28, 2016
  22eda46e Browse Files
- Added subsection gating feature · 37a7fdc0
  Douglas Hall committed Jan 28, 2016
  
  37a7fdc0 Browse Files
- Merge pull request #11366 from edx/peter-fogg/reenable-course-home-checks · 1603a1ab
```
Reenable course home improvements check.
```
  Peter Fogg committed Jan 28, 2016
  1603a1ab Browse Files
- Merge pull request #11365 from edx/ned/add-note-to-edx-private · 5ec74b7c
```
Add a note to the top of edx-private.txt
```
  Ned Batchelder committed Jan 28, 2016
  5ec74b7c Browse Files