Commits · 39cf70ecf417eff16d70bf15fc94526c48cc769f · edx / edx-platform · GitLab

10 Jun, 2016 1 commit
- Add new xblock config models. · 39cf70ec
```
TNL-4666
```
  cahrens committed Jun 10, 2016
  39cf70ec Browse Files
07 Jun, 2016 19 commits
- Merge pull request #12611 from edx/ssemenova/icon2 · 1cda718f
```
Changing icon tags from i to span 

TNL-4692
```
  Sofiya Semenova committed Jun 07, 2016
  1cda718f Browse Files
- Merge pull request #12670 from cpennington/reset-urls-favicon-tests · df2f347a
```
Reset urls favicon tests
```
  Calen Pennington committed Jun 07, 2016
  df2f347a Browse Files
- Merge pull request #12600 from edx/alasdair/ECOM-4216-style-the-program-details-header · 194d33ea
```
ECOM-4216 Styling the header
```
  AlasdairSwan committed Jun 07, 2016
  194d33ea Browse Files
- Merge pull request #12683 from edx/douglashall/LOC-78/upgrade_lti_consumer_to_1_0_9 · 98a392c3
```
LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter
```
  Douglas Hall committed Jun 07, 2016
  98a392c3 Browse Files
- Merge pull request #12682 from edx/master-test · c8d3e88a
```
Release June 7, 2016
```
  Michael Frey committed Jun 07, 2016
  c8d3e88a Browse Files
- ECOM-4216 Styling the header · a7cd4dae
  AlasdairSwan committed Jun 07, 2016
  
  a7cd4dae Browse Files
- change icon tags from i to span · c1f79317
```
TNL-4692
```
  ssemenova committed Jun 07, 2016
  c1f79317 Browse Files
- Merge pull request #12673 from cpennington/reset-signature-validator-mocks · f0804390
```
Mock SignatureValidator.verify using patch so that the mock is unset …
```
  Calen Pennington committed Jun 07, 2016
  f0804390 Browse Files
- Merge pull request #12628 from cpennington/test-i18n-reset-translations · 12d23980
```
Test i18n reset translations
```
  Calen Pennington committed Jun 07, 2016
  12d23980 Browse Files
- Merge pull request #12660 from edx/raees/bokchoy_test_fields_my_public_profile · 6b7a094d
```
Raees/bokchoy test fields my public profile
```
  raeeschachar committed Jun 07, 2016
  6b7a094d Browse Files
- LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter · 8ce63fef
  Douglas Hall committed Jun 07, 2016
  
  8ce63fef Browse Files
- Merge pull request #12671 from cpennington/separate-discussion-blackout-tests · 940d38e2
```
Separate discussion blackout tests into a separate ModulestoreTestCase
```
  Calen Pennington committed Jun 07, 2016
  940d38e2 Browse Files
- Merge pull request #12677 from edx/christina/update-ora-version · 267e67d9
```
Update for ora xblock static file handling.
```
  Christina Roberts committed Jun 07, 2016
  267e67d9 Browse Files
- Make test_favicon tests work independently · c124fb34
  Calen Pennington committed Jun 07, 2016
  
  c124fb34 Browse Files
- Mock SignatureValidator.verify using patch so that the mock is unset at the end of the test · 1537f040
  Calen Pennington committed Jun 07, 2016
  
  1537f040 Browse Files
- Merge branch 'release' into master-test · 7cf984d6
  Michael Frey committed Jun 07, 2016
  
  7cf984d6 Browse Files
- Separate discussion blackout tests into a separate ModulestoreTestCase · d49e1e91
  Calen Pennington committed Jun 07, 2016
  
  d49e1e91 Browse Files
- Fixed test fields on my public profile · 5110480d
  raeeschachar committed Jun 07, 2016
  
  5110480d Browse Files
- Merge pull request #12648 from edx/rc/2016-06-07 · 58856964
```
Release Candidate rc/2016-06-07
```
  Michael Frey committed Jun 07, 2016
  58856964 Browse Files
06 Jun, 2016 20 commits
- Bulk Email Cohorts (#12602) · faa7f544
```
Adds cohorts as valid bulk email targets.
```
  Eric Fischer committed Jun 06, 2016
  faa7f544 Browse Files
- Merge pull request #12675 from edx/renzo/persist-programs-nav · 740266bd
```
Show Programs tab on program detail pages
```
  Renzo Lucioni committed Jun 06, 2016
  740266bd Browse Files
- Merge pull request #12627 from cpennington/test-certificates-shared-modulestore-test-case · d76f31bc
```
Don't modify courses inside SharedModuleStoreTestCase test methods in…
```
  Calen Pennington committed Jun 06, 2016
  d76f31bc Browse Files
- Merge pull request #12674 from cpennington/assert-item-equality-in-ccx-tests · 8518ce8f
```
Only assert on item-equality when checking ccx course modules
```
  Calen Pennington committed Jun 06, 2016
  8518ce8f Browse Files
- Merge pull request #12672 from cpennington/separate-courseinfo-tests · 5cc40f06
```
Separate CourseInfo tests into a separate ModulestoreTestCase
```
  Calen Pennington committed Jun 06, 2016
  5cc40f06 Browse Files
- Merge pull request #12668 from cpennington/test-tracker-global-settings · 43674607
```
Use copies of tracker settings dicts in tests so that changes don't l…
```
  Calen Pennington committed Jun 06, 2016
  43674607 Browse Files
- Show Programs tab on program detail pages · ffd1e29d
  Renzo Lucioni committed Jun 06, 2016
  
  ffd1e29d Browse Files
- Merge pull request #12647 from edx/benp/pa11ycrawler-update-AC-488 · b9a38db6
```
AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decodin…
```
  Ben Patterson committed Jun 06, 2016
  b9a38db6 Browse Files
- Merge pull request #12665 from edx/clrux/ac-490 · 1786e25b
```
AC-490 using latest a11y checks and ignoring section test
```
  clrux committed Jun 06, 2016
  1786e25b Browse Files
- Update for ora xblock static file handling. · 29db2930
```
TNL-4710
```
  cahrens committed Jun 06, 2016
  29db2930 Browse Files
- Merge pull request #12657 from edx/renzo/include-listing-url · f8be1ed1
```
Include program listing URL on detail pages
```
  Renzo Lucioni committed Jun 06, 2016
  f8be1ed1 Browse Files
- Separate CourseInfo tests into a separate ModulestoreTestCase · bdf08fc7
  Calen Pennington committed Jun 06, 2016
  
  bdf08fc7 Browse Files
- Merge pull request #12639 from edx/andya/discussion-board-header · d8a8bacd
```
Add styling for content headers to the edx-platform
```
  Andy Armstrong committed Jun 06, 2016
  d8a8bacd Browse Files
- Include program listing URL on detail pages · f913cc52
```
Replaces the hardcoded URL in favor of a URL passed by the server.
```
  Renzo Lucioni committed Jun 06, 2016
  f913cc52 Browse Files
- Make UrlResetMixin.reset_urls a public method (so that it can be used inside test methods) · e93d112c
  Calen Pennington committed Jun 06, 2016
  
  e93d112c Browse Files
- Merge pull request #12626 from cpennington/reset-parameters-fake-payment-tests · acc9bca3
```
Reset client post parameters after each payment_fake test, because th…
```
  Calen Pennington committed Jun 06, 2016
  acc9bca3 Browse Files
- Use copies of tracker settings dicts in tests so that changes don't leak between tests · 3207311e
  Calen Pennington committed Jun 06, 2016
  
  3207311e Browse Files
- Using latest version from NPM and ignoring section tests for now · 6be4f84a
  Chris Rodriguez committed Jun 06, 2016
  
  6be4f84a Browse Files
- Only assert on item-equality when checking ccx course modules · e6c235a4
  Calen Pennington committed Jun 06, 2016
  
  e6c235a4 Browse Files
- Address code review feedback · 3b053980
  Andy Armstrong committed Jun 06, 2016
  
  3b053980 Browse Files