Commits · 48767b31c5e166b8bad0eb2cbb4ebd6ac92cce1b · edx / edx-platform · GitLab

07 Jul, 2017 4 commits
- Merge pull request #15492 from edx/nedbat/use-hashes · 48767b31
```
Use commit hashes for certain third-party repos
```
  Ned Batchelder committed Jul 07, 2017
  48767b31 Browse Files
- Merge pull request #15491 from edx/revert-15462-ibrahimahmed443/WL-1083-remove-institutions · 0f759e1c
```
Revert "remove the word Institutions if there is no authoring organization"
```
  Ibrahim Ahmed committed Jul 07, 2017
  0f759e1c Browse Files
- Use commit hashes for certain third-party repos · fdd974dd
  Ned Batchelder committed Jul 07, 2017
  
  fdd974dd Browse Files
- Revert "remove the word Institutions if there is no authoring organization" · 4ec95638
  Ibrahim Ahmed committed Jul 07, 2017
  
  4ec95638 Browse Files
06 Jul, 2017 29 commits
- Merge pull request #15487 from… · 15e66949
```
Merge pull request #15487 from edx/revert-15469-bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482

Revert "Upgrade django-ratelimit-backend to 1.1.1"
```
  Brian Mesick committed Jul 06, 2017
  15e66949 Browse Files
- Revert "Upgrade django-ratelimit-backend to 1.1.1" · af43d08b
  Brian Mesick committed Jul 06, 2017
  
  af43d08b Browse Files
- Merge pull request #15481 from edx/nedbat/update-translations · 00239865
```
Update translations (autogenerated message)
```
  Ned Batchelder committed Jul 06, 2017
  00239865 Browse Files
- Merge pull request #15486 from edx/HarryRein/LEARNER-1783 · b979c871
```
Fixing naming issue in edx.org theme.
```
  Harry Rein committed Jul 06, 2017
  b979c871 Browse Files
- Merge pull request #15484 from edx/afzaledx/LEARNER-1146-patch · a00d9ad3
```
Put the program_types filter under the waffle switch
```
  Douglas Hall committed Jul 06, 2017
  a00d9ad3 Browse Files
- Put the program_types filter under the waffle switch · b8a310d5
  Afzal Wali committed Jul 06, 2017
  
  b8a310d5 Browse Files
- Fixing naming issue in edx.org theme. · 17fc3100
  Harry Rein committed Jul 06, 2017
  
  17fc3100 Browse Files
- Merge pull request #15360 from open-craft/replaceafill/aws_with_filesystem_storage_tested · 8fb86474
```
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
```
  Christina Roberts committed Jul 06, 2017
  8fb86474 Browse Files
- Merge pull request #15478 from edx/ubc-add-lti-consumer-module-to-rest-endpoints · 0b7ace29
```
Add lti consumer xblock modules to LTI REST endpoints
```
  Robert Raposa committed Jul 06, 2017
  0b7ace29 Browse Files
- Update translations (autogenerated message) · 5c4ece29
  Ned Batchelder committed Jul 06, 2017
  
  5c4ece29 Browse Files
- Add lti consumer xblock modules to LTI REST endpoints · 4db8c7a7
```
This allows LTI consumer xblock modules being hocked into get_course_lti_endpoints for
discovering LTI result/outcome endpoints.
```
  Pan Luo committed Jul 06, 2017
  4db8c7a7 Browse Files
- Merge pull request #15462 from edx/ibrahimahmed443/WL-1083-remove-institutions · f6ad15bb
```
remove the word Institutions if there is no authoring organization
```
  Ibrahim Ahmed committed Jul 06, 2017
  f6ad15bb Browse Files
- Merge pull request #14862 from replaceafill/default_discussion_topic · 487895fb
```
Default discussion topic
```
  George Song committed Jul 06, 2017
  487895fb Browse Files
- Merge pull request #15332 from… · ec787a99
```
Merge pull request #15332 from edx/adeel/LEARNER-1188_Setting_connection_timeout_value_for_sailthru_api_call

Implementing connection timeout for sailthru api call.
```
  adeel khan committed Jul 06, 2017
  ec787a99 Browse Files
- Implementing connection timeout for sailthru api call. · 52e28d91
```
LEARNER-1186
```
  Adeel Khan committed Jul 06, 2017
  52e28d91 Browse Files
- Merge pull request #15178 from edx/course-video-image · 95b3055f
```
Course video image
```
  Mushtaq Ali committed Jul 06, 2017
  95b3055f Browse Files
- Change opacity and user messages · d2b420a9
  Mushtaq Ali committed Jul 06, 2017
  
  d2b420a9 Browse Files
- Add waffle switch to toggle video thumbnail feature. · 55621365
  Qubad786 committed Jul 06, 2017
  
  55621365 Browse Files
- Change video image requirements text hover - EDUCATOR-577 · eabfba48
  Mushtaq Ali committed Jul 06, 2017
  
  eabfba48 Browse Files
- Video Uploads Cleanup - Replace table grid layout with div grid layout and do… · 9750cd2a
```
Video Uploads Cleanup - Replace table grid layout with div grid layout and do related adjustments - EDUCATOR-562
```
  Mushtaq Ali committed Jul 06, 2017
  9750cd2a Browse Files
- Add video image settings to aws settings so that lms can pull values from lms.env.json · 7bf717f7
  Mushtaq Ali committed Jul 06, 2017
  
  7bf717f7 Browse Files
- Add frontend video image validations - EDUCATOR-447 · cf6200cb
  Mushtaq Ali committed Jul 06, 2017
  
  cf6200cb Browse Files
- Add backend video image validations - EDUCATOR-45 · e8fee2e0
  Mushtaq Ali committed Jul 06, 2017
  
  e8fee2e0 Browse Files
- add video poster support · 626f2896
```
EDUCATOR-44
```
  muhammad-ammar committed Jul 06, 2017
  626f2896 Browse Files
- video thumbnail ui · 763f0051
  muhammad-ammar committed Jul 06, 2017
  
  763f0051 Browse Files
- Save or update course video image - TNL-6762 · dca12d65
  Muhammad Ammar committed Jul 06, 2017
  
  dca12d65 Browse Files
- Merge pull request #15467 from edx/aamishbaloch/YONK-691 · 7b910953
```
YONK-691: Configurable profile image sizes
```
  Aamish Baloch committed Jul 06, 2017
  7b910953 Browse Files
- Merge pull request #15450 from edx/tasawer/learner-1710-fix-dashboard-HttPClientError · bba59672
```
Fix 500 error on learner dashboard
```
  Tasawer Nawaz committed Jul 06, 2017
  bba59672 Browse Files
- Allow to set the default topic for new Discussion posts · eacc4bc1
  Douglas Cerna committed Jul 05, 2017
  
  eacc4bc1 Browse Files
05 Jul, 2017 7 commits
- Merge pull request #15469 from edx/bmedx/django_1.11_upgrade_ratelimit_backend_PLAT-1482 · bc485ea5
```
Upgrade django-ratelimit-backend to 1.1.1
```
  Brian Mesick committed Jul 05, 2017
  bc485ea5 Browse Files
- Merge pull request #15445 from edx/jmbowman/PLAT-1499 · e4c8ff3a
```
PLAT-1499 Use appropriate default settings in Docker devstack
```
  Jeremy Bowman committed Jul 05, 2017
  e4c8ff3a Browse Files
- Fix 500 error on learner dashboard · a7b20095
```
LEARNER-1710
```
  tasawernawaz committed Jul 05, 2017
  a7b20095 Browse Files
- Fix NotRegistered error when running makemigrations · d6d7fcaf
  bmedx committed Jul 05, 2017
  
  d6d7fcaf Browse Files
- Merge pull request #15468 from edx/robrap/reduce-thresholds · eff621b7
```
Reduce xss thresholds.
```
  Robert Raposa committed Jul 05, 2017
  eff621b7 Browse Files
- Merge pull request #15392 from open-craft/smarnach/notify-default · 224606bd
```
Add flag to configure whether "Notify users by email" is checked by default.
```
  Christina Roberts committed Jul 05, 2017
  224606bd Browse Files
- Updated Django Waffle to 0.12.0 · e1312b38
  Clinton Blackburn committed Jul 05, 2017
  
  e1312b38 Browse Files