Commits · 2b1a7eece25886e49d8c0a2bac3679406485ad72 · edx / edx-platform

10 Mar, 2016 1 commit

Asynchronous download button for ORA2 data · 2b1a7eec

Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html

committed Mar 10, 2016

2b1a7eec Browse Files

09 Mar, 2016 6 commits
- Merge pull request #11749 from edx/hasnain-naveed/SOL-1654 · 2c3b728c
```
SOL-1654 / Testing flakiness
```
  Douglas Hall committed Mar 09, 2016
  2c3b728c Browse Files
- Merge pull request #11756 from edx/sstudent/MA-2103 · 5c0ca8c6
```
Sstudent/ma 2103
```
  sanfordstudent committed Mar 09, 2016
  5c0ca8c6 Browse Files
- Merge pull request #10645 from CourseTalk/coursetalk_widget · ab8fc07b
```
Integration CourseTalk widgets with OpenEdx.
```
  Peter Fogg committed Mar 09, 2016
  ab8fc07b Browse Files
- Removing Flaky decorator from lms instructor dashboard test · 5e24225c
  Hasnain committed Mar 09, 2016
  
  5e24225c Browse Files
- add CourseTalk widget · 41424383
```
Move tests to one test class
```
  erm0l0v committed Mar 09, 2016
  41424383 Browse Files
- Merge pull request #11769 from edx/peter-fogg/disable-order-closed-course · 91fd6dbe
```
Prevent ordering closed courses, and give a good user message.
```
  Peter Fogg committed Mar 08, 2016
  91fd6dbe Browse Files
08 Mar, 2016 12 commits
- Prevent ordering closed courses, and give a good user message. · fd2f3b69
```
When Drupal attempts to enroll a user in a closed course, a 406 will
be returned. This causes the marketing site to redirect to the track
selection page for that course, which will then redirect to the
dashboard with a nice message.

ECOM-2317
```
  Peter Fogg committed Mar 08, 2016
  fd2f3b69 Browse Files
- MA-2103 · 6490551f
  Sanford Student committed Mar 08, 2016
  
  6490551f Browse Files
- Merge pull request #11770 from edx/release · 7f7886be
```
Weekly release for 08 Mar 2016
```
  clrux committed Mar 08, 2016
  7f7886be Browse Files
- Merge pull request #11626 from ubc/ubcpi-0.5.1 · d127fb4b
```
Update UBCPI Xblock to 0.5.1
```
  Ned Batchelder committed Mar 08, 2016
  d127fb4b Browse Files
- Merge pull request #11757 from stvstnfrd/debt/ie67 · a17eff77
```
Remove deprecated IE6/7 polyfill
```
  Ned Batchelder committed Mar 08, 2016
  a17eff77 Browse Files
- Merge pull request #11754 from edx/rc/2016-03-08 · cf5e4c9b
```
Release Candidate rc/2016-03-08
```
  clrux committed Mar 08, 2016
  cf5e4c9b Browse Files
- Merge pull request #11743 from edx/PERF-272 · 23ae5f76
```
Send 'Vary: Origin' so XHR/CORS requests can work properly.
```
  Toby Lawrence committed Mar 08, 2016
  23ae5f76 Browse Files
- Merge branch 'master' into PERF-272 · 5a20f0b5
  Toby Lawrence committed Mar 08, 2016
  
  5a20f0b5 Browse Files
- Merge pull request #11662 from edx/shr/bug/AN-6713-decoding-errors · 7bdc762e
```
Add latin1 decoding to HTTP Headers
```
  Syed Hasan raza committed Mar 08, 2016
  7bdc762e Browse Files
- Merge pull request #11580 from… · ca936a7f
```
Merge pull request #11580 from edx/waheed/ecom-2947-support-entire-password-reset-flow-in-logistration

Fixed the other half of forgot password flow accourding to logistration.
```
  Waheed Ahmed committed Mar 08, 2016
  ca936a7f Browse Files
- Add latin1 decoding to HTTP Headers · 0d6e0ac7
  Syed Hassan Raza committed Mar 08, 2016
  
  0d6e0ac7 Browse Files
- Fixed the other half of forgot password flow accourding to logistration. · 178f5a60
```
ECOM-2947
```
  Waheed Ahmed committed Mar 08, 2016
  178f5a60 Browse Files
07 Mar, 2016 20 commits
- Switch to header_control in contentserver. · 1a346415
  Toby Lawrence committed Mar 07, 2016
  
  1a346415 Browse Files
- Merge pull request #11762 from open-craft/smarnach/update-dndv2-version · 5f51db0a
```
Bump the version of the Drag&Drop XBlock to 2.0.3.
```
  Braden MacDonald committed Mar 07, 2016
  5f51db0a Browse Files
- Merge pull request #11660 from edx/hassan/dump-course-ids-fix · fb299817
```
Include CCX courses in dump_course_ids.
```
  Hassan committed Mar 08, 2016
  fb299817 Browse Files
- Merge pull request #11755 from edx/SOL-1690 · 5dcdf9a4
```
Redirect to otto checkout for prof ed courses if enabled
```
  Michael Frey committed Mar 07, 2016
  5dcdf9a4 Browse Files
- Merge pull request #11765 from edx/efischer/ora_bump · efa289ba
```
ORA release
```
  clrux committed Mar 07, 2016
  efa289ba Browse Files
- Merge pull request #11764 from edx/clrux/ac-328-lessening-specificity · 4f5290e4
```
Lessening specificity for headings
```
  clrux committed Mar 07, 2016
  4f5290e4 Browse Files
- Redirect to otto checkout for prof ed courses if enabled · 8502093f
  Michael Frey committed Mar 07, 2016
  
  8502093f Browse Files
- Merge pull request #11763 from edx/christina/remove-unnecessary-escaping · e1889fb8
```
The escaping is unnecessary and confusing to the user.
```
  Christina Roberts committed Mar 07, 2016
  e1889fb8 Browse Files
- ORA release · c35f5ba9
  Eric Fischer committed Mar 07, 2016
  
  c35f5ba9 Browse Files
- Removing importants from heading styles · 6b549bf1
  Chris Rodriguez committed Mar 07, 2016
  
  6b549bf1 Browse Files
- Lessening specificity for headings · 08937ce5
  Chris Rodriguez committed Mar 07, 2016
  
  08937ce5 Browse Files
- Merge pull request #11761 from edx/clrux/ac-328-removing-importants · 40b5f8e6
```
Removing importants from heading styles
```
  clrux committed Mar 07, 2016
  40b5f8e6 Browse Files
- Bump the version of the Drag&Drop XBlock to 2.0.3. · b0260385
  Sven Marnach committed Mar 07, 2016
  
  b0260385 Browse Files
- The escaping is unnecessary and confusing to the user. · 2eabaccb
  cahrens committed Mar 07, 2016
  
  2eabaccb Browse Files
- Removing importants from heading styles · fed1d4b4
  Chris Rodriguez committed Mar 07, 2016
  
  fed1d4b4 Browse Files
- Merge pull request #11751 from edx/christina/remove-profile-name · e6fcfae9
```
Remove unused profile name.
```
  Christina Roberts committed Mar 07, 2016
  e6fcfae9 Browse Files
- Merge pull request #11748 from edx/jibsheet/course_overview_0009_on_migrate_from_scratch · ec6eccce
```
Migrate correctly from scratch also
```
  Kevin Falcone committed Mar 07, 2016
  ec6eccce Browse Files
- Use CourseOverview for dump_course_ids · 48a5b954
  Hassan committed Mar 07, 2016
  
  48a5b954 Browse Files
- Remove unused profile name. · 2f3e3a55
```
The profile name requires escaping when displayed. Proactively removing since it is not being used. Also discovered some dead code.
```
  cahrens committed Mar 07, 2016
  2f3e3a55 Browse Files
- Merge pull request #11752 from edx/christina/remove-hinter · dbc2b416
```
Delete hinter manager.
```
  Christina Roberts committed Mar 07, 2016
  dbc2b416 Browse Files
06 Mar, 2016 1 commit

Remove deprecated IE6/7 polyfill · 1ff2ec15

This polyfill was added in late 2012 [1].
The final reference appears to have been removed in mid-2013 [2].

Regardless, we certainly are no longer supporting IE6/7.

[1] bf9f9c1c
[2] 13886841

committed Mar 06, 2016

1ff2ec15 Browse Files