Commits · 086b503b51917e8470d252cf5e5f7dcc1ec4c189 · edx / edx-platform

13 Jun, 2017 13 commits
- Merge pull request #15219 from edx/sarahkf/courseware-lang · 086b503b
```
Added course level lang attribute for LMS WIP 
```
  sarahkf committed Jun 13, 2017
  086b503b Browse Files
- Merge pull request #15310 from edx/sylvia/update_help_tokens · 77212379
```
Update Studio help tokens following doc reorg for Publisher
```
  Eric Fischer committed Jun 13, 2017
  77212379 Browse Files
- Added lang attribute in LMS and Studio; added language col to course_overviews · eafb79de
```
Added course level lang attribute for LMS

added lang attribute to Studio

fixed error when trying to get language attribute on course that does not exist

simplified code

added lang attribure to more places in LMS, added migration for language attribute in course_overview

fixing contraints in the database for language attribute

added lang attribute to several more places in LMS and Studio

added lang attribute to discussion and custom pages; cleaned up code

fixed issue that was causing test failures

moved lang attribute higher in tree in two places
```
  Sarah Fischmann committed Jun 13, 2017
  eafb79de Browse Files
- Merge pull request #14463 from edx/robrap/edx-search-upgrade · 3fbe60ef
```
[DELAY MERGE] TNL-6319: Upgrade edx-search for ES 1.x upgrade.
```
  Feanil Patel committed Jun 13, 2017
  3fbe60ef Browse Files
- Merge pull request #15299 from edx/efischer/ora_rc · c60cb6a6
```
edx-ora2 1.4.2 release
```
  Eric Fischer committed Jun 13, 2017
  c60cb6a6 Browse Files
- Revert "Merge pull request #15309 from edx/efischer/fix_studio_link_tests" · 3ea7a189
```
This reverts commit 8ca5c11a, reversing
changes made to 1acb5155.
```
  Eric Fischer committed Jun 13, 2017
  3ea7a189 Browse Files
- Update Studio help tokens following doc reorg for Publisher · fe3105cc
  Sylvia Pearce committed Jun 13, 2017
  
  fe3105cc Browse Files
- Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading… · 0272b84f
```
Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading ORA Block more than one time)
```
  Dmitry Viskov committed Jun 13, 2017
  0272b84f Browse Files
- edx-ora2 1.4.2 release · 4af499cd
  Eric Fischer committed Jun 13, 2017
  
  4af499cd Browse Files
- Merge pull request #15309 from edx/efischer/fix_studio_link_tests · 8ca5c11a
```
Skip failing tests temporarily
```
  Eric Fischer committed Jun 13, 2017
  8ca5c11a Browse Files
- Prevent footer loaded via branding API from loading unused CSS · 1acb5155
```
Footer HTML requested from the branding API was including two CSS files, lms-footer.css and lms-footer-edx.css. edx.org pages only require lms-footer-edx.css to render the footer. The template code being removed here appears to have been accidentally left in place during a theming change: https://github.com/edx/edx-platform/commit/c0648ab1642dfaece6f42fba9ce129e695b67b8c\#diff-439477a9ba29f7c208e25b0a535cdabeR80.

ECOM-3655
```
  Renzo Lucioni committed Jun 13, 2017
  1acb5155 Browse Files
- Skip failing tests · 9e6b449a
  Eric Fischer committed Jun 13, 2017
  
  9e6b449a Browse Files
- Merge pull request #15290 from edx/bbaker/educator-344 · 7d2d0657
```
Bbaker/educator 344
```
  Brandon Baker committed Jun 13, 2017
  7d2d0657 Browse Files
12 Jun, 2017 14 commits
- Merge pull request #15292 from edx/christina/add-middleware-guid · 54eb9e84
```
Limit courses and libraries returned for global staff.
```
  Christina Roberts committed Jun 12, 2017
  54eb9e84 Browse Files
- Merge pull request #15256 from edx/ammar/edu-292-move-dialog-fix · 2e675fdc
```
move dialog fix
```
  Muhammad Ammar committed Jun 12, 2017
  2e675fdc Browse Files
- Enable DEFAULT_MODE to be customized in config · 2b25c9fc
```
- Keeps platform set default of "Audit" to be backwards compatible and not break stuff
- get COURSE_MODE_DEFAULTS from config if set
```
  Giulio Gratta committed Jun 12, 2017
  2b25c9fc Browse Files
- Limit courses and libraries returned for global staff. · 44544587
```
EDUCATOR-563
```
  cahrens committed Jun 12, 2017
  44544587 Browse Files
- Merge pull request #15274 from edx/bbeggs/pyyaml-3.12 · 10ec774c
```
Upgrade pyyaml to 3.12
```
  Brian Beggs committed Jun 12, 2017
  10ec774c Browse Files
- Upgrade pyyaml to 3.12 · 4eba6f0c
  Brian Beggs committed Jun 12, 2017
  
  4eba6f0c Browse Files
- EDUCATOR-344 · 6b62bf9b
```
Removed extraneous instances of track_function
```
  Brandon Baker committed Jun 12, 2017
  6b62bf9b Browse Files
- Merge pull request #15257 from edx/noraiz/EDUCATOR-546 · 90e73b55
```
Add keep-instructors option in delete_course management command 
```
  Noraiz Anwar committed Jun 12, 2017
  90e73b55 Browse Files
- Enhance delete_course management command · bac223ac
  noraiz-anwar committed Jun 12, 2017
  
  bac223ac Browse Files
- Merge pull request #15270 from edx/mjevtic/LEARNER-1183 · 484ec256
```
[LEARNER-1183] Prepare program data to be presented on program marketing page
```
  Marko Jevtić committed Jun 12, 2017
  484ec256 Browse Files
- move dialog fix · 090ce1d0
```
EDUCATOR-292
```
  muhammad-ammar committed Jun 12, 2017
  090ce1d0 Browse Files
- [LEARNER-1183] Prepare program data to be presented on program marketing page · bf164ae9
```
[LEARNER-1393] Filter program course runs by status
```
  Marko Jevtic committed Jun 12, 2017
  bf164ae9 Browse Files
- Merge pull request #15206 from edx/andya/clean-imports-lms · 9c4869c1
```
Reorder LMS imports using isort
```
  Andy Armstrong committed Jun 11, 2017
  9c4869c1 Browse Files
- Reorder LMS imports using isort · 79acb5c5
  Andy Armstrong committed Jun 11, 2017
  
  79acb5c5 Browse Files
11 Jun, 2017 2 commits
- Updated Course Structure API views to use JWT authentication · 8d4db4ac
```
LEARNER-1375
```
  Clinton Blackburn committed Jun 11, 2017
  8d4db4ac Browse Files
- Updated Commerce API v1 views to use JWT authentication · 0b07b53e
```
LEARNER-1375
```
  Clinton Blackburn committed Jun 11, 2017
  0b07b53e Browse Files
10 Jun, 2017 1 commit
- Merge pull request #15291 from edx/revert-15005-aws_with_filesystem_storage · 5dd2c65c
```
Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module"
```
  Stu Young committed Jun 10, 2017
  5dd2c65c Browse Files
09 Jun, 2017 10 commits
- Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 · 07dc1e6b
```
Exclude hidden programs from white label course page and home page
```
  Ibrahim Ahmed committed Jun 10, 2017
  07dc1e6b Browse Files
- Revert "Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module" · 8870dde9
  Stu Young committed Jun 09, 2017
  
  8870dde9 Browse Files
- EDUCATOR-344 · f4c9044d
```
Removed instances of track function
```
  Brandon Baker committed Jun 09, 2017
  f4c9044d Browse Files
- Exclude hidden programs from white label course and homepage · 99957168
```
LEARNER-1126, LEARNER-1127
```
  Ibrahim committed Jun 09, 2017
  99957168 Browse Files
- Merge pull request #15275 from edx/bbeggs/paramiko-1.18.1 · 6643e7e1
```
Remove paramiko requirement
```
  Brian Beggs committed Jun 09, 2017
  6643e7e1 Browse Files
- Merge pull request #15005 from replaceafill/aws_with_filesystem_storage · eb3bbc7c
```
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
```
  Kevin Falcone committed Jun 09, 2017
  eb3bbc7c Browse Files
- Merge pull request #13850 from proversity-org/proversity/fix-valid-signature · e31590e5
```
Fix valid signature
```
  Simon Chen committed Jun 09, 2017
  e31590e5 Browse Files
- Merge pull request #15269 from edx/mjevtic/LEARNER-1366 · 53cd05fb
```
LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products
```
  Marko Jevtić committed Jun 09, 2017
  53cd05fb Browse Files
- LEARNER-1366 EcommerceService should be able to provide a link to the basket… · 24227286
```
LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products
```
  Marko Jevtic committed Jun 09, 2017
  24227286 Browse Files
- Merge pull request #15224 from edx/ai/EDUCATOR-496-date-format · 58c3366f
```
EDUCATOR-496 Display date in correct UTC format.
```
  Attiya Ishaque committed Jun 09, 2017
  58c3366f Browse Files