Commits · ee203ed930a55b5867b830fd1fd9512600fae7f6 · edx / edx-platform

07 Oct, 2015 1 commit

Merge pull request #10015 from… · ee203ed9

Merge pull request #10015 from edx/afeef/bugfix/tnl-3258-fix-confirm-navigation-popup-unmodified-group-configurations

TNL-3258 Reset group configuration model when a child content group i…

committed Oct 07, 2015

ee203ed9 Browse Files

06 Oct, 2015 15 commits
- Merge pull request #10060 from edx/release · 8afb3605
```
Release
```
  Edward Zarecor committed Oct 06, 2015
  8afb3605 Browse Files
- Merge pull request #10062 from edx/markhoeber-doc2326 · dc5ed684
```
Add Video File Size Warning to Upload Template
```
  Mark Hoeber committed Oct 06, 2015
  dc5ed684 Browse Files
- Add Video File Size Warning to Upload Template · 34820aba
  Mark Hoeber committed Oct 06, 2015
  
  34820aba Browse Files
- Update accounts.rst · 574807f0
  wajeeha-khalid committed Oct 06, 2015
  
  574807f0 Browse Files
- Merge pull request #10058 from edx/hotfix/2015-10-06b · 7427d82c
```
Hotfix/2015 10 06b
```
  Edward Zarecor committed Oct 06, 2015
  7427d82c Browse Files
- Merge pull request #10054 from edx/robrap/im-an-author · 8954d00a
```
Add self to AUTHORS
```
  Robert Raposa committed Oct 06, 2015
  8954d00a Browse Files
- Merge pull request #10056 from edx/asadiqbal08/SOL-1255 · ada5fda9
```
asadiqbal08/SOL-1255: Remove all character limits in signatory fields
```
  Matt Drayer committed Oct 06, 2015
  ada5fda9 Browse Files
- Merge pull request #10009 from edx/jia/MA-1341 · c17078b8
```
MA-1341 User Account: returned updated value from Patch
```
  wajeeha-khalid committed Oct 06, 2015
  c17078b8 Browse Files
- MA-1341 User Account: returned updated value from Patch · 9472f70d
```
updated docstring
```
  wajeeha-khalid committed Oct 06, 2015
  9472f70d Browse Files
- SOL-1225 · 0b28fd23
  asadiqbal committed Oct 06, 2015
  
  0b28fd23 Browse Files
- Add self to AUTHORS · 10e02066
  Robert Raposa committed Oct 06, 2015
  
  10e02066 Browse Files
- Allow retry_failed_photo_verifications to take a list of receipt_ids to retry · 7e55437d
  Calen Pennington committed Oct 05, 2015
  
  7e55437d Browse Files
- When retrying, use the previously copied photo_id · e57619b0
  Calen Pennington committed Oct 05, 2015
  
  e57619b0 Browse Files
- Add management command to set SoftwareSecure verification status. · 7f4bd900
  Peter Fogg committed Oct 05, 2015
  
  7f4bd900 Browse Files
- add new column 'copy_id_photo_from' for 'SoftwareSecurePhotoVerification' model… · c78b1be5
```
add new column 'copy_id_photo_from' for 'SoftwareSecurePhotoVerification' model to track initial verification with 'photo_id_key'
```
  zubair-arbi committed Oct 05, 2015
  c78b1be5 Browse Files
05 Oct, 2015 17 commits
- Merge pull request #10042 from edx/peter-fogg/flaky-tests · 87e3988c
```
Mark flaky tests (TNL-3514 and TNL-3515).
```
  Peter Fogg committed Oct 05, 2015
  87e3988c Browse Files
- Merge pull request #10044 from edx/merge-release-into-master · 17f01933
```
Merging changes for hotfix/2015-10-05
```
  Clinton Blackburn committed Oct 05, 2015
  17f01933 Browse Files
- 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
- Mark flaky tests (TNL-3514 and TNL-3515). · dbeb9beb
  Peter Fogg committed Oct 05, 2015
  
  dbeb9beb Browse Files
- Merged release to master · f967cfce
```
Resolved conflicts from hotfix-2015-10-05
```
  Clinton Blackburn committed Oct 05, 2015
  f967cfce 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 #10030 from edx/hotfix/2015-10-05 · 882c2fa3
```
Hotfix for 2015-10-05
```
  Clinton Blackburn committed Oct 05, 2015
  882c2fa3 Browse Files
- Limited grades to seven characters · 775ca26c
```
ECOM-2433
```
  Clinton Blackburn committed Oct 05, 2015
  775ca26c 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
- Multiple credit fixes · 0dba8436
```
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
```
  Clinton Blackburn committed Oct 05, 2015
  0dba8436 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
- bump to edx-proctoring v. 0.9.16 · 46606457
  Chris Dodge committed Oct 05, 2015
  
  46606457 Browse Files
- SOL-1262 · aec1b959
  asadiqbal committed Oct 05, 2015
  
  aec1b959 Browse Files
02 Oct, 2015 7 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