Commits · 470a526d735cd6ab85c989584fc69d21813903c4 · edx / edx-platform · GitLab

21 Apr, 2017 1 commit
- Get enterprise logo image size limit from env configuration · 470a526d
```
ENT-247
```
  zubair-arbi committed Apr 21, 2017
  470a526d Browse Files
20 Apr, 2017 17 commits
- Updated CREDENTIALS_SERVICE_USERNAME setting for Docker-based devstack · 163c71e8
  Clinton Blackburn committed Apr 20, 2017
  
  163c71e8 Browse Files
- Merge pull request #14930 from edx/jmbowman/PLAT-1200 · adecfaec
```
PLAT-1200 Upgrade to bok-choy 0.7.0 take 2
```
  Jeremy Bowman committed Apr 20, 2017
  adecfaec Browse Files
- Upgrade to bok-choy 0.7.0 · f2f9874f
  Jeremy Bowman committed Apr 20, 2017
  
  f2f9874f Browse Files
- Merge pull request #13038 from OmarIthawi/edraak/bulk-email-from-addr · 64372dd5
```
Translatable bulk_email from Address based on platform`s default lang
```
  Adam committed Apr 20, 2017
  64372dd5 Browse Files
- Merge pull request #14916 from edx/noraiz/TNL-6837 · c1b148dd
```
TNL-6837 ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio
```
  Noraiz Anwar committed Apr 20, 2017
  c1b148dd Browse Files
- Merge pull request #14926 from edx/alasdair/LEARNER-602-program-card-tet-update · 7f09919c
```
LEARNER-602 Updated program card text for states
```
  AlasdairSwan committed Apr 20, 2017
  7f09919c Browse Files
- Merge pull request #14906 from edx/iivic/LEARNER-381 · 9ef91591
```
Update Order History page to reflect bundled purchase
```
  Ivan Ivic committed Apr 20, 2017
  9ef91591 Browse Files
- Merge pull request #14922 from edx/sstudent/grade_reports · 205f0723
```
additional logging for grade reports investigation
```
  sanfordstudent committed Apr 20, 2017
  205f0723 Browse Files
- Merge pull request #14894 from edx/jeskew/fix_more_django_19_warnings · 1791d141
```
Fix Django 1.9 deprecation warnings by adding app_label.
```
  John Eskew committed Apr 20, 2017
  1791d141 Browse Files
- ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio · 07490063
  noraiz-anwar committed Apr 20, 2017
  
  07490063 Browse Files
- Merge pull request #14762 from edx/mattdrayer/add-enterprise-aws-config · 56164669
```
Add environment overrides for Enterprise settings
```
  Matt Drayer committed Apr 20, 2017
  56164669 Browse Files
- LEARNER-602 Updated program card text for states · 3c1f61c9
  AlasdairSwan committed Apr 20, 2017
  
  3c1f61c9 Browse Files
- Update Order History page to reflect bundled purchase · b682c43d
```
LEARNER-381
```
  Ivan Ivic committed Apr 20, 2017
  b682c43d Browse Files
- Merge pull request #14875 from… · 1a31f251
```
Merge pull request #14875 from edx/ahsan/ECOM-7688-users-seeing-500-error-Financial-assistance-application

Financial aid for courses with no course overview
```
  Ahsan Ulhaq committed Apr 20, 2017
  1a31f251 Browse Files
- Financial aid for courses with no course overview · 65069584
```
ECOM-7688
```
  Ahsan Ulhaq committed Apr 20, 2017
  65069584 Browse Files
- Merge pull request #14909 from edx/mjevtic/LEARNER-314 · d9f17435
```
[LEARNER-314] Determine client/learner eligibility
```
  Marko Jevtić committed Apr 20, 2017
  d9f17435 Browse Files
- [LEARNER-314] Determine client/learner eligibility · 3d37635f
  Marko Jevtic committed Apr 20, 2017
  
  3d37635f Browse Files
19 Apr, 2017 18 commits
- Merge pull request #14913 from edx/efischer/rekill · 7e368e10
```
Re-kill ICRV block
```
  Eric Fischer committed Apr 19, 2017
  7e368e10 Browse Files
- Merge pull request #14923 from edx/release-mergeback-to-master · 602b737b
```
Merge release back to master
```
  edx-pipeline-bot committed Apr 19, 2017
  602b737b Browse Files
- Re-kill ICRV block · 5c26acc1
```
This reverts commit 1224e341. I've also added
NotImplementedPartitionScheme, which allows deprecated partition types to have
a valid entry point despite being unusable.

TNL-6675
```
  Eric Fischer committed Apr 19, 2017
  5c26acc1 Browse Files
- Merge pull request #14921 from edx/christina/choose-one · 7e99daac
```
Change "Choose one" to "Select a group type".
```
  Christina Roberts committed Apr 19, 2017
  7e99daac Browse Files
- additional logging · edee55d3
  Sanford Student committed Apr 19, 2017
  
  edee55d3 Browse Files
- Add model migration files for crawlers/programs. · 3aa061d4
  John Eskew committed Apr 19, 2017
  
  3aa061d4 Browse Files
- Change "Choose one" to "Select a group type". · 5e14a356
  cahrens committed Apr 19, 2017
  
  5e14a356 Browse Files
- Merge pull request #14912 from edx/sstudent/TNL-6833 · bd2025d6
```
use higher of two available grades
```
  sanfordstudent committed Apr 19, 2017
  bd2025d6 Browse Files
- Merge pull request #14803 from edx/aj/TNL-6743_GroupConfigEnrollmentPartition · 5599a451
```
Aj/tnl 6743 group config enrollment partition
```
  Christina Roberts committed Apr 19, 2017
  5599a451 Browse Files
- Merge pull request #14900 from open-craft/haikuginger/sso-provider-session-expiry · 3f05d2e6
```
[ENT-327] Allow per-SSO-provider session expiration limits
```
  Jesse Shapiro committed Apr 19, 2017
  3f05d2e6 Browse Files
- Show Enrollment Tracks in Group Configurations. · 59c62188
```
TNL-6743
```
  Albert St. Aubin committed Apr 19, 2017
  59c62188 Browse Files
- Updated program credential back-population command to account for no-id-professional · 3f215df6
```
This command has been updated to treat professional and no-id-professional
enrollments in the same manner.

ECOM-7442
```
  Clinton Blackburn committed Apr 19, 2017
  3f215df6 Browse Files
- use higher of two available grades for TNL-6833 · a1a8023b
  Sanford Student committed Apr 19, 2017
  
  a1a8023b Browse Files
- Updated program credential back-population command to account for no-id-professional · be02fdb4
```
This command has been updated to treat professional and no-id-professional
enrollments in the same manner.

ECOM-7442
```
  Clinton Blackburn committed Apr 19, 2017
  be02fdb4 Browse Files
- Merge pull request #14813 from edx/neem/backfill-problem-completion · 28d36b52
```
Estimate first_attempted for grades.
```
  Cliff Dyer committed Apr 19, 2017
  28d36b52 Browse Files
- Merge pull request #14908 from edx/ri/TNL-6666-500-error-courseware · 1cecded3
```
TNL-6666 Fix 500 error when entering courseware.
```
  Rabia Iftikhar committed Apr 19, 2017
  1cecded3 Browse Files
- TNL-6666 Fix 500 error when entering courseware. · 59d84e5b
  rabia23 committed Apr 19, 2017
  
  59d84e5b Browse Files
- Merge pull request #14905 from edx/zub/ENT-316-enterprise-version-bump-to-33.2 · 2d4a564a
```
update enterprise version from 0.33.0 to 0.33.2
```
  Zubair Afzal committed Apr 19, 2017
  2d4a564a Browse Files
18 Apr, 2017 4 commits
- Merge pull request #14737 from open-craft/mit-capa-hide-correct · e03b3914
```
MIT CAPA improvements: Add show_correctness field
```
  Eugeny Kolpakov committed Apr 19, 2017
  e03b3914 Browse Files
- Estimate creation time for subsections grades based on timestamp of · 4f6d5d9c
```
incoming scores.

TNL-6697
```
  J. Cliff Dyer committed Apr 18, 2017
  4f6d5d9c Browse Files
- Merge pull request #14863 from edx/christina/tnl-6746 · 529df7c6
```
Show messages about component visibility.
```
  Christina Roberts committed Apr 18, 2017
  529df7c6 Browse Files
- Merge pull request #14879 from OmarIthawi/omar/translate-discussion-question · 8d14deb8
```
Translate "discussion" in "discussion posted 2 minutes ago by X"
```
  Christina Roberts committed Apr 18, 2017
  8d14deb8 Browse Files