Commits · 905c5c567c8672a73d665cb0b682b916db27f926 · edx / edx-platform · GitLab

08 Jun, 2016 4 commits
- Merge pull request #12692 from edx/peter-fogg/bulk-change-enrollment-help-text · 905c5c56
```
Correct help text for the bulk_change_enrollment command.
```
  Peter Fogg committed Jun 08, 2016
  905c5c56 Browse Files
- Merge pull request #12681 from edx/christina/delete-landing · 1f26cd2e
```
Delete old cruft from 2012/2013.
```
  Christina Roberts committed Jun 08, 2016
  1f26cd2e Browse Files
- Correct help text for the bulk_change_enrollment command. · 17fb925c
  Peter Fogg committed Jun 08, 2016
  
  17fb925c Browse Files
- Merge pull request #12686 from edx/alisan/author · 849e3b79
```
adding myself to the author file
```
  alisan617 committed Jun 07, 2016
  849e3b79 Browse Files
07 Jun, 2016 29 commits
- Bump installed edx-proctoring version (#12669) · ed2644a1
  Eric Fischer committed Jun 07, 2016
  
  ed2644a1 Browse Files
- Merge pull request #12615 from edx/bjacobel/focus-test-to-bokchoy · 61e64fbf
```
Move the flaky focus unit test removed in #12433 to a bok choy test
```
  Brian Jacobel committed Jun 07, 2016
  61e64fbf Browse Files
- Merge pull request #12608 from edx/efischer/add_edx · 1d0e93a0
```
Correct references to HtmlUtils in underscore files
```
  Eric Fischer committed Jun 07, 2016
  1d0e93a0 Browse Files
- Merge pull request #12629 from cpennington/cleanup-files-badging-tests · 61a5e713
```
Cleanup uploaded files after badging tests
```
  Calen Pennington committed Jun 07, 2016
  61a5e713 Browse Files
- 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
- Delete old cruft from 2012/2013. · 1fa43191
  cahrens committed Jun 07, 2016
  
  1fa43191 Browse Files
- Cleanup uploaded files after badging tests · c42c86ae
  Calen Pennington committed Jun 07, 2016
  
  c42c86ae Browse Files
- Add Backbone global to jshintrc · 50d314d9
```
Underscore was previously defined, it seemed odd to not have Backbone as well.
```
  Eric Fischer committed Jun 07, 2016
  50d314d9 Browse Files
- Use edx.HtmlUtils properly in incourse_reverify_view · 0c3468a0
  Eric Fischer committed Jun 07, 2016
  
  0c3468a0 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
- Move the flaky focus unit test removed in #12433 to a bok choy test · 57b4cb7f
  Brian Jacobel committed Jun 07, 2016
  
  57b4cb7f Browse Files
- adding myself to the author file · 0870373e
  alisan617 committed Jun 07, 2016
  
  0870373e 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 7 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