Commits · f6ec9360e3810bdb4803bcb28b31fa0d79d7a2f4 · edx / edx-platform

28 Aug, 2015 1 commit
- Use microsite platform_name and email_from_address if available · f6ec9360
```
fixed broken test

fixes for broken tests
```
  Zia Fazal committed Aug 28, 2015
  f6ec9360 Browse Files
27 Aug, 2015 3 commits
- Merge pull request #9459 from… · d8f484ac
```
Merge pull request #9459 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints

Remove experimental logistration endpoints
```
  tasawernawaz committed Aug 27, 2015
  d8f484ac Browse Files
- Removing experimental logistration endpoints · 07148c63
```
ECOM-1017
```
  Tasawer committed Aug 27, 2015
  07148c63 Browse Files
- Merge pull request #9474 from edx/asadiqbal08/SOL-1128 · 40b5663b
```
asadiqbal08/SOL-1128-Certificates: Studio Setup Copy and UI changes
```
  Matt Drayer committed Aug 27, 2015
  40b5663b Browse Files
26 Aug, 2015 17 commits
- Merge pull request #9487 from edx/release-2015-08-26-conflict · a3599425
```
Merging 2015-08-26 release conflict branch to master
```
  David Ormsbee committed Aug 26, 2015
  a3599425 Browse Files
- PEP8 fix. · 7543e05b
  David Ormsbee committed Aug 26, 2015
  
  7543e05b Browse Files
- Merge branch 'release' into release-2015-08-26-conflict · ff62a8ea
  David Ormsbee committed Aug 26, 2015
  
  ff62a8ea Browse Files
- Merge pull request #9461 from edx/awais786/XCOM-538-otto-admin-restrict-nonexisting-course · 830a695f
```
adding validator to make sure course exists in db before creating in …
```
  Awais Qureshi committed Aug 26, 2015
  830a695f Browse Files
- Merge pull request #9436 from edx/rc/2015-08-25 · 02cc9ca8
```
2015-08-25 Release
```
  David Ormsbee committed Aug 26, 2015
  02cc9ca8 Browse Files
- Merge pull request #9463 from edx/efischer/js-flakes · 94e11e1e
```
Revert "Fix for flaky TeamDiscussionView js tests"
```
  Eric Fischer committed Aug 26, 2015
  94e11e1e Browse Files
- Removing extraneous render from team_discussion.js · 4d974730
```
On the advice of https://github.com/edx/edx-platform/pull/9470,
the render call here is not needed and should be removed in order
to allow the view's owner to determine when it needs to be rendered.

This will hopefully also fix the flaky tests we've been seeing,
we'll need to continue to monitor the builds to be sure.
```
  Eric Fischer committed Aug 26, 2015
  4d974730 Browse Files
- Revert "Fix for flaky TeamDiscussionView js tests" · 3e407b9d
```
This reverts commit d64c2b29.
```
  Eric Fischer committed Aug 26, 2015
  3e407b9d Browse Files
- Merge pull request #9481 from edx/revert-9456-derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS · 4bc62274
```
Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYT…
```
  Fred Smith committed Aug 26, 2015
  4bc62274 Browse Files
- adding validator to make sure course exists in db before creating in otto. · cdfc9da4
  Awais committed Aug 26, 2015
  
  cdfc9da4 Browse Files
- Merge pull request #9480 from edx/ormsbee/pull_from_last_weeks_hotix · 74394bfe
```
Fixes modal color
```
  David Ormsbee committed Aug 26, 2015
  74394bfe Browse Files
- Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…" · 16ac5801
  Fred Smith committed Aug 26, 2015
  
  16ac5801 Browse Files
- Fixes modal color · 96fc3063
  Chris Rodriguez committed Aug 26, 2015
  
  96fc3063 Browse Files
- Merge pull request #9418 from edx/usman/tnl2883-video-tests · 6a1be48e
```
Fix video bumper tests.
```
  Usman Khalid committed Aug 26, 2015
  6a1be48e Browse Files
- SOL-1128 · 43316ea8
  asadiqbal committed Aug 26, 2015
  
  43316ea8 Browse Files
- Fixed video bumper tests. · 0dbb969b
```
TNL-2883
```
  Usman Khalid committed Aug 26, 2015
  0dbb969b Browse Files
- Merge pull request #9450 from edx/peter-fogg/sort-topic-page · 4aec2abf
```
Add sorting controls on topics page.
```
  Peter Fogg committed Aug 25, 2015
  4aec2abf Browse Files
25 Aug, 2015 19 commits
- Merge pull request #9471 from edx/jibsheet/third-party-auth-settings · 65377423
```
Allow configuring sensitive third_party_auth settings via lms.auth.json
```
  Kevin Falcone committed Aug 25, 2015
  65377423 Browse Files
- Add sorting controls on Teams topics page. · 382909b7
```
TNL-1936
```
  Peter Fogg committed Aug 25, 2015
  382909b7 Browse Files
- Allow configuring sensitive third_party_auth settings via lms.auth.json · 79a07532
  Braden MacDonald committed Aug 25, 2015
  
  79a07532 Browse Files
- Merge pull request #9393 from… · dc2e1c0b
```
Merge pull request #9393 from edx/muhhshoaib/PHX-12-css-changes-instructor-dashboard-proctored-attempts

PHX-112 css styling for proctoring tab student attempts in instructor dashboard
```
  Muhammad Shoaib committed Aug 26, 2015
  dc2e1c0b Browse Files
- Merge pull request #9455 from edx/ormsbee/faster_tests_shib · 5807ae97
```
Convert Shib external auth test to use SharedModuleStoreTestCase.
```
  David Ormsbee committed Aug 25, 2015
  5807ae97 Browse Files
- Merge pull request #9442 from edx/asadiqbal08/SOL-1097 · f01fd6e7
```
asadiqbal08/SOL-1097-Certificate url do not appears correctly when student share certificate on Linkedin
```
  Matt Drayer committed Aug 25, 2015
  f01fd6e7 Browse Files
- Merge pull request #9440 from OmarIthawi/omarithawi/nav-seq-module-rtl · 4e6dbc9e
```
Flipped the direction of the seq_module arrows
```
  clrux committed Aug 25, 2015
  4e6dbc9e Browse Files
- Merge pull request #9460 from edx/bderusha/edx-search-for-teams-TNL-3013-patch · cd751ab5
```
Remove pylint: disable invalid-name for paginator error and fix syntax
```
  Bill DeRusha committed Aug 25, 2015
  cd751ab5 Browse Files
- SOL-1097 · c230f22b
  asadiqbal committed Aug 25, 2015
  
  c230f22b Browse Files
- Merge pull request #9457 from edx/ormsbee/faster_tests_user_api · 154c9bae
```
Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase
```
  David Ormsbee committed Aug 25, 2015
  154c9bae Browse Files
- Merge pull request #9446 from edx/muhhshoaib/PHX-124-alignment-issues-in-proctoring-exam-screens · dff2688c
```
PHX-124
```
  Muhammad Shoaib committed Aug 25, 2015
  dff2688c Browse Files
- Merge pull request #9456 from edx/derf/add_setting_for_DISPLAY_ANALYTICS_ENROLLMENTS · c1f18219
```
DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…
```
  Fred Smith committed Aug 25, 2015
  c1f18219 Browse Files
- Remove disable pylint for paginator error and fix syntax · 81ced1c9
  Bill DeRusha committed Aug 25, 2015
  
  81ced1c9 Browse Files
- Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase · a1a9a2a5
  David Ormsbee committed Aug 25, 2015
  
  a1a9a2a5 Browse Files
- Merge pull request #9453 from edx/ormsbee/faster_tests_class_dashboard · 3e4325dc
```
Convert class dashboard tests to use SharedModuleStoreTestCase.
```
  David Ormsbee committed Aug 25, 2015
  3e4325dc Browse Files
- DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENROLLMENTS · 28368a0d
  Fred Smith committed Aug 25, 2015
  
  28368a0d Browse Files
- Merge pull request #9449 from edx/ormsbee/faster_tests_ccx · fdfaa565
```
Move some CCX view tests to use SharedModuleStoreTestCase (performance).
```
  David Ormsbee committed Aug 25, 2015
  fdfaa565 Browse Files
- Convert Shib external auth test to use SharedModuleStoreTestCase. · 83c91e24
  David Ormsbee committed Aug 25, 2015
  
  83c91e24 Browse Files
- Merge pull request #9438 from edx/ormsbee/instructor_dash_tests_speedup · 08343b96
```
Speed up Instructor Dash tests + add manual reset for SharedModuleStoreTestCase
```
  David Ormsbee committed Aug 25, 2015
  08343b96 Browse Files