Commits · 143ca802ae455bf3fba06a5322cc7f7d380d5435 · edx / edx-platform · GitLab

05 Oct, 2015 9 commits
- Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app · 143ca802
```
Revert "Upgrade django-pipeline and staticfiles"
```
  Brian Beggs committed Oct 05, 2015
  143ca802 Browse Files
- Merge pull request #9979 from edx/bderusha/boardman-traffic · fe230525
```
Add IP to all python Segment tracking calls
```
  Bill DeRusha committed Oct 05, 2015
  fe230525 Browse Files
- Revert "Upgrade django-pipeline and staticfiles" · 0ca679e2
  Brian Beggs committed Oct 05, 2015
  
  0ca679e2 Browse Files
- Merge pull request #10027 from edx/ned/better-immutable-field-exception · b7cf3920
```
Include a message in the teams.ImmutableMembershipFieldException
```
  Ned Batchelder committed Oct 05, 2015
  b7cf3920 Browse Files
- Merge pull request #10013 from edx/asadiqbal08/SOL-1262 · 0a347e12
```
SOL-1262 Update Studio Button Copy
```
  Matt Drayer committed Oct 05, 2015
  0a347e12 Browse Files
- Merge pull request #10012 from edx/ziafazal/MAYN-129 · 1d121b81
```
MAYN-129: additional payment details were not shown
```
  Matt Drayer committed Oct 05, 2015
  1d121b81 Browse Files
- Merge pull request #10018 from edx/saleem-latif/MAYN-141 · 86e523e6
```
MAYN-141: WL Favicon not displaying correctly
```
  Matt Drayer committed Oct 05, 2015
  86e523e6 Browse Files
- Merge pull request #10005 from edx/saleem-latif/MAYN-131-complete-fix · 890a6750
```
MAYN-131: Update Unsupported Browser message
```
  Matt Drayer committed Oct 05, 2015
  890a6750 Browse Files
- SOL-1262 · aec1b959
  asadiqbal committed Oct 05, 2015
  
  aec1b959 Browse Files
02 Oct, 2015 25 commits
- Include a message in the teams.ImmutableMembershipFieldException · 84a94c23
```
Also add a __repr__ to CourseTeam so that it could be useful too.
```
  Ned Batchelder committed Oct 02, 2015
  84a94c23 Browse Files
- Merge pull request #10025 from edx/markhoeber-intersphinx-fix · d3f39b2f
```
Doc Label fix for Intersphinx
```
  Mark Hoeber committed Oct 02, 2015
  d3f39b2f Browse Files
- Merge pull request #10024 from edx/benp/tnl-3492-flaky-test · c8782f14
```
Flag test as flaky. See TNL-3492.
```
  Ben Patterson committed Oct 02, 2015
  c8782f14 Browse Files
- Merge pull request #10020 from edx/benp/TNL3489-flag-flaky-test · 6570552c
```
TNL-3489. Flag test as flaky.
```
  Ben Patterson committed Oct 02, 2015
  6570552c Browse Files
- Merge pull request #9999 from edx/bbeggs/TNL-3452-master · 5550ca30
```
Fixed select_related fields for course embargos and the mobile user api. TNL-3452
```
  Brian Beggs committed Oct 02, 2015
  5550ca30 Browse Files
- Doc Label fix for Intersphinx · 35034841
  Mark Hoeber committed Oct 02, 2015
  
  35034841 Browse Files
- Merge pull request #9934 from edx/usman/use-included-staticfiles-app · 0ce679fc
```
Upgrade django-pipeline and staticfiles.
```
  Usman Khalid committed Oct 02, 2015
  0ce679fc Browse Files
- Flag test as flaky. See TNL-3492. · ecdba730
  Ben Patterson committed Oct 02, 2015
  
  ecdba730 Browse Files
- Merge pull request #9984 from edx/ahodges/enroll_api · eab5c607
```
Updates the description provided for a new enrollment report
```
  Alison Hodges committed Oct 02, 2015
  eab5c607 Browse Files
- Merge pull request #10023 from edx/release · 0219e18f
```
Release into master
```
  David Baumgold committed Oct 02, 2015
  0219e18f Browse Files
- Merge pull request #10022 from edx/rc/2015-10-01 · a3f8ed3f
```
Rc/2015 10 01
```
  David Baumgold committed Oct 02, 2015
  a3f8ed3f Browse Files
- Merge pull request #10004 from Gadal/master · 241ce4a6
```
Update AUTHORS
```
  Sarina Canelake committed Oct 02, 2015
  241ce4a6 Browse Files
- TNL-3489. Flag test as flaky. · ed13815b
```
See ticket for details.
```
  Ben Patterson committed Oct 02, 2015
  ed13815b Browse Files
- Merge pull request #10016 from edx/bderusha/segment-fix · 9d13ccdb
```
Rename SEGMENT_KEY to have a unique key name for both CMS and LMS
```
  Fred Smith committed Oct 02, 2015
  9d13ccdb Browse Files
- Merge pull request #9771 from edx/diana/add-team-to-reports · 7bfb1127
```
Add team column to grade reports.
```
  Diana Huang committed Oct 02, 2015
  7bfb1127 Browse Files
- Use django.contrib.staticfiles instead of django-staticfiles. · 2b59d46a
```
TNL-3137
```
  Usman Khalid committed Oct 02, 2015
  2b59d46a Browse Files
- Upgrade to django-pipeline v.1.5.3. · 98df2336
```
TNL-3137
```
  Usman Khalid committed Oct 02, 2015
  98df2336 Browse Files
- favicon display bug corrected · 4725f7f5
  Saleem Latif committed Oct 02, 2015
  
  4725f7f5 Browse Files
- Merge pull request #9986 from mitocw/fix/jf/enroll-ccx-coaches · 94d5f736
```
Enroll CCX coaches in the courses to which they're added
```
  Peter Pinch committed Oct 02, 2015
  94d5f736 Browse Files
- fixed form submit selector · 460b19fa
```
reduced left margin
```
  Zia Fazal committed Oct 02, 2015
  460b19fa Browse Files
- Update AUTHORS · 5106c7c6
  Dustin Gadal committed Oct 02, 2015
  
  5106c7c6 Browse Files
- Merge pull request #10003 from Gadal/master · 4f34377b
```
Fix import error
```
  Sarina Canelake committed Oct 01, 2015
  4f34377b Browse Files
- Fix import error · dfc0a357
```
See also:
https://github.com/edx/edx-platform/pull/9969

I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.
```
  Dustin Gadal committed Oct 01, 2015
  dfc0a357 Browse Files
- Merge pull request #9977 from edx/cdodge/flaky-test · 4b37d788
```
Mark test_can_add_remove_allowance Bokchoy test as flaky for now
```
  chrisndodge committed Oct 01, 2015
  4b37d788 Browse Files
- Add IP to all python Segment tracking calls · ca6633bd
  Bill DeRusha committed Oct 01, 2015
  
  ca6633bd Browse Files
01 Oct, 2015 6 commits
- Rename SEGMENT_KEY to have a unique key name for both CMS and LMS · bcb71a32
  Bill DeRusha committed Oct 01, 2015
  
  bcb71a32 Browse Files
- Merge pull request #9958 from edx/cdyer/MA-1280-restful-conventions · b85ea12a
```
Make the profile_image api more restful.
```
  Cliff Dyer committed Oct 01, 2015
  b85ea12a Browse Files
- Merge pull request #9997 from edx/clintonb/credit-grade-length · d1f4d3a6
```
Limited grades to seven characters
```
  Clinton Blackburn committed Oct 01, 2015
  d1f4d3a6 Browse Files
- Updates the description provided for a new enrollment report · adffb10c
```
https://github.com/edx/edx-platform/pull/9345
```
  Alison Hodges committed Oct 01, 2015
  adffb10c Browse Files
- Merge pull request #9978 from mitocw/fix/gs/min_count_keyerror · 972196fe
```
Fixed KeyError in CCX
```
  Sarina Canelake committed Oct 01, 2015
  972196fe Browse Files
- Merge pull request #9950 from lduarte1991/lti-allow-fullscreen · cdd59b5a
```
Allow fullscreen within lti
```
  Sarina Canelake committed Oct 01, 2015
  cdd59b5a Browse Files