Commits · release-2017-08-23-09.56 · edx / edx-platform

22 Aug, 2017 18 commits
- Merge pull request #15865 from edx/efischer/ora_2.0.3 · d16363d6
```
update edx-ora2
```
  Eric Fischer committed Aug 22, 2017
  d16363d6 Browse Files
- Merge pull request #15843 from edx/robrap/LEARNER-1858-show-join-date-2 · 40a5b066
```
Support for joined date to profile.
```
  Diana Huang committed Aug 22, 2017
  40a5b066 Browse Files
- Merge pull request #15861 from edx/LEARNER-174 · 04da157e
```
LEARNER-174 Make country label and error message more user friendly
```
  Ayub khan committed Aug 23, 2017
  04da157e Browse Files
- update edx-ora2 · 926e5a49
  Eric Fischer committed Aug 22, 2017
  
  926e5a49 Browse Files
- Updated Country Label and help text · e737728c
```
Country Label was causing confusions for learners if it was country of origin or in which they
are living so changed it to a more appropriate message.
LEARNER-174
Also updated some other error messages to some more appropriate error messages.
```
  ayub-khan committed Aug 22, 2017
  e737728c Browse Files
- Merge pull request #15864 from edx/revert-15828-LEARNER-1510 · 6e607fcc
```
Revert "Un-revert unenrollment survey and only show it for edx.org users"
```
  Matthew Piatetsky committed Aug 22, 2017
  6e607fcc Browse Files
- Revert "Un-revert unenrollment survey and only show it for edx.org users" · e2ee48c3
  Matthew Piatetsky committed Aug 22, 2017
  
  e2ee48c3 Browse Files
- Merge pull request #15859 from edx/bexline/enterprise_version_bump · 8c2586f6
```
ENT-585 Enterprise: Change course modal to use discovery api
```
  Brittney Exline committed Aug 22, 2017
  8c2586f6 Browse Files
- EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't… · 2cc87952
```
EDUCATOR-1204 | can always view certs when ready for self-paced courses; don't hide cert buttons; update messaging.
```
  Alex Dusenbery committed Aug 22, 2017
  2cc87952 Browse Files
- Support for joined date to profile. · 7cc9400b
```
LEARNER-1858
```
  Robert Raposa committed Aug 22, 2017
  7cc9400b Browse Files
- Merge pull request #15813 from edx/yro/update_cert · b8aa3052
```
Update Certificate Task Call
```
  Gregory Martin committed Aug 22, 2017
  b8aa3052 Browse Files
- Merge pull request #15828 from edx/LEARNER-1510 · 839b5320
```
Un-revert unenrollment survey and only show it for edx.org users
```
  Matthew Piatetsky committed Aug 22, 2017
  839b5320 Browse Files
- Merge pull request #15821 from edx/bmedx/upgrade_django_model_utils · 6f30dedb
```
Upgrade of django-model-utils to 3.0.0 for Django 1.11 support
```
  Brian Mesick committed Aug 22, 2017
  6f30dedb Browse Files
- Update unenrollment survey to only be included for edx.org and rebase with master · 25ffb356
  Matthew Piatetsky committed Aug 22, 2017
  
  25ffb356 Browse Files
- Revert "Revert "LEARNER-1510 Add unenrollment reason survey"" · 98cf69ba
```
This reverts commit 441bccf4.
```
  Matthew Piatetsky committed Aug 22, 2017
  98cf69ba Browse Files
- Merge pull request #15857 from edx/diana/change-icon · 2cd20d28
```
Use an X icon instead of text.
```
  Diana Huang committed Aug 22, 2017
  2cd20d28 Browse Files
- Update Task · b19d8059
  Gregory Martin committed Aug 22, 2017
  
  b19d8059 Browse Files
- Use an X icon instead of text. · cb381a7c
  Diana Huang committed Aug 22, 2017
  
  cb381a7c Browse Files
21 Aug, 2017 6 commits
- ENT-585 Enterprise: Change course modal to use discovery api · b6e4e175
  Brittney Exline committed Aug 21, 2017
  
  b6e4e175 Browse Files
- Merge pull request #15838 from edx/McKenzieW/learner-2228 · ff54a771
```
Track program purchase attempts from learner programs dashboard
```
  McKenzie Welter committed Aug 21, 2017
  ff54a771 Browse Files
- bundle purchase tracking · 3e4d20e0
  McKenzie Welter committed Aug 21, 2017
  
  3e4d20e0 Browse Files
- Merge pull request #15856 from edx/nedbat/fix-field-i18n · eeb70ca3
```
XBlock fields with formatted-in values can now translate properly
```
  Ned Batchelder committed Aug 21, 2017
  eeb70ca3 Browse Files
- Merge pull request #15782 from edx/mroytman/PLAT-1612-upgrade-django-babel-underscore · e8e01a99
```
PLAT-1612: Upgrade edx-platform to use new django-babel-underscore (0.5.2)
```
  Michael Roytman committed Aug 21, 2017
  e8e01a99 Browse Files
- Merge pull request #15837 from edx/waheed/LEARNER-2110-add-activation-key-var-in-sailthru · 6c74cf48
```
Add activation_key var to user profile in SailThru.
```
  Waheed Ahmed committed Aug 21, 2017
  6c74cf48 Browse Files
19 Aug, 2017 3 commits
- XBlock fields with formatted-in values can now translate properly · fee0c41c
  Ned Batchelder committed Aug 19, 2017
  
  fee0c41c Browse Files
- Merge pull request #15852 from edx/yro/neem_bugbash · e00867cc
```
Yro/neem bugbash
```
  Gregory Martin committed Aug 19, 2017
  e00867cc Browse Files
- Update Flag handling · 147405df
  Gregory Martin committed Aug 19, 2017
  
  147405df Browse Files
18 Aug, 2017 11 commits
- Merge pull request #15855 from edx/andya/bootstrap-update-lang-page-3 · a506486f
```
Convert /update_lang/ page to use Bootstrap
```
  Andy Armstrong committed Aug 18, 2017
  a506486f Browse Files
- Merge pull request #15854 from edx/douglashall/ENT-585 · 93d84396
```
Upgrading the edx-organizations package to 0.4.6.
```
  Douglas Hall committed Aug 18, 2017
  93d84396 Browse Files
- Convert /update_lang/ page to use Bootstrap · 82f7d6ee
```
LEARNER-1922
```
  Andy Armstrong committed Aug 18, 2017
  82f7d6ee Browse Files
- Upgrading the edx-organizations package to 0.4.6. · 79660788
```
This fixes a bug with the organizations API's get_organization function.
```
  Douglas Hall committed Aug 18, 2017
  79660788 Browse Files
- Merge pull request #15850 from edx/andya/fix-features-i18n-part-2 · 2b4fe140
```
Allow i18n strings to be scraped from openedx/features
```
  Andy Armstrong committed Aug 18, 2017
  2b4fe140 Browse Files
- Allow i18n strings to be scraped from openedx/features · 41f7502a
```
LEARNER-2304
```
  Andy Armstrong committed Aug 18, 2017
  41f7502a Browse Files
- Merge pull request #15587 from open-craft/jill/tpa-hint-setting · 98ee25fb
```
Adds settings.FEATURES['THIRD_PARTY_AUTH_HINT']
```
  George Song committed Aug 18, 2017
  98ee25fb Browse Files
- Merge pull request #15848 from edx/LEARNER-1426-Render_Issue · 36e4c801
```
LEARNER-1426 Fix for dialog rendering
```
  Ayub khan committed Aug 18, 2017
  36e4c801 Browse Files
- Add activation_key var to user profile in SailThru. · 33e077d4
```
As an email marketer, I would like to send an account activation reminder to learners who haven't activated
their accounts to increase their chances of coming back and engaging with our platform. Each user profile in
SailThru will have a var with the correct activation_key originally assigned to the user.

LEARNER-2110
```
  Waheed Ahmed committed Aug 18, 2017
  33e077d4 Browse Files
- update to new version of django-babel-underscore, which supports Django 1.8 - Django 1.11 · f2c24020
  Michael Roytman committed Aug 18, 2017
  
  f2c24020 Browse Files
- Fix for dialog rendering · 558490e7
  ayub-khan committed Aug 18, 2017
  
  558490e7 Browse Files
17 Aug, 2017 2 commits
- Merge pull request #15845 from edx/mjfrey/increase-enrollment-rate · acc208b6
```
increase staff user rate limit
```
  Michael Frey committed Aug 17, 2017
  acc208b6 Browse Files
- increase staff user rate limit · fb7b98da
  Michael Frey committed Aug 17, 2017
  
  fb7b98da Browse Files