Commits · 6e10d2a5568580c784eebbf736b304a089a090f1 · edx / edx-platform · GitLab

07 Sep, 2017 1 commit
- Update to use Bootstrap beta release · 6e10d2a5
```
FEDX-375
```
  Andy Armstrong committed Sep 06, 2017
  6e10d2a5 Browse Files
06 Sep, 2017 17 commits
- Merge pull request #15953 from edx/yro/update_cert_display_date · a51b9597
```
Update Cert Display Date
```
  Gregory Martin committed Sep 06, 2017
  a51b9597 Browse Files
- Merge pull request #15965 from edx/jmbowman/pytest_compatibility · f15a6867
```
pytest compatibility fixes
```
  Jeremy Bowman committed Sep 06, 2017
  f15a6867 Browse Files
- Merge pull request #15964 from edx/efischer/ora_again · 804dc361
```
edx-ora2 2.1.1
```
  Eric Fischer committed Sep 06, 2017
  804dc361 Browse Files
- Merge pull request #15957 from edx/andya/learner-certificate-filtering · 2d408543
```
Only show passing certificates on a learner profile
```
  Andy Armstrong committed Sep 06, 2017
  2d408543 Browse Files
- Update cert display date · 4d59eff8
```
EDUCATOR-1266
```
  Gregory Martin committed Sep 06, 2017
  4d59eff8 Browse Files
- edx-ora2 2.1.1 · 179774e1
  Eric Fischer committed Sep 06, 2017
  
  179774e1 Browse Files
- pytest compatibility fixes · ded294c4
  Jeremy Bowman committed Sep 06, 2017
  
  ded294c4 Browse Files
- Merge pull request #15962 from edx/jmbowman/pytest_database · d342a562
```
Fixes for pytest database usage
```
  Jeremy Bowman committed Sep 06, 2017
  d342a562 Browse Files
- Fixes for pytest database usage · 97f5fe03
  Jeremy Bowman committed Sep 06, 2017
  
  97f5fe03 Browse Files
- Merge pull request #15960 from edx/jmbowman/fragile_test_fixes · cebf6d3e
```
Fixes for test order dependence
```
  Jeremy Bowman committed Sep 06, 2017
  cebf6d3e Browse Files
- Only show passing certificates on a learner profile · d05b62a2
```
LEARNER-2486
```
  Andy Armstrong committed Sep 06, 2017
  d05b62a2 Browse Files
- Merge pull request #15949 from edx/diana/update-sock-copy · 50c287ad
```
Update sock copy.
```
  Diana Huang committed Sep 06, 2017
  50c287ad Browse Files
- Fixes for test order dependence · 6fb7d63c
  Jeremy Bowman committed Sep 06, 2017
  
  6fb7d63c Browse Files
- Merge pull request #15922 from edx/ssemenova/ed-1101 · 038d5182
```
"View/Request Certificate" button logic on progress page and dashboard
```
  Sofiya Semenova committed Sep 06, 2017
  038d5182 Browse Files
- Merge pull request #15951 from edx/jmbowman/ddt_cleanup · ae44f184
```
ddt usage cleanup
```
  Jeremy Bowman committed Sep 06, 2017
  ae44f184 Browse Files
- Merge pull request #15956 from edx/HarryRein/LEARNER-2485-profile-issues · d6e89e7b
```
LEARNER-2485: Fix styling issues on learner profile.
```
  Harry Rein committed Sep 06, 2017
  d6e89e7b Browse Files
- Merge pull request #15565 from jspayd/caption-centering · f1c574cf
```
Fix video caption centering
```
  Muzaffar yousaf committed Sep 06, 2017
  f1c574cf Browse Files
05 Sep, 2017 12 commits
- ddt usage cleanup · fd6af6b0
  Jeremy Bowman committed Sep 05, 2017
  
  fd6af6b0 Browse Files
- EDUCATOR-1241 | make a separate file to make decisions about auto generated certs. · 0137e38e
  Alex Dusenbery committed Sep 05, 2017
  
  0137e38e Browse Files
- educator-1101 view/request certificate button logic on progress page and dashboard · f3f7e78e
  Sofiya Semenova committed Sep 05, 2017
  
  f3f7e78e Browse Files
- Fix styling issues on learner profile. · d0bc499f
```
LEARNER-2485

1) Joined Date is shown in bold and there is no line below to separate
it from the next section.
2) The bio shows up below the certificates.
3) Switching to 'limited profile' does not correctly hide the language,
location and joined date fields.
```
  Harry Rein committed Sep 05, 2017
  d0bc499f Browse Files
- Merge pull request #15954 from edx/ora/2.0.5 · 29f6d5d6
```
ORA patch release
```
  Eric Fischer committed Sep 05, 2017
  29f6d5d6 Browse Files
- Merge pull request #15950 from edx/bexline/ENT-496_follow_up · 89a7eb7e
```
ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint
```
  Brittney Exline committed Sep 05, 2017
  89a7eb7e Browse Files
- ORA patch release · a67f9ee7
  Eric Fischer committed Sep 05, 2017
  
  a67f9ee7 Browse Files
- ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint · ba597331
```
Since we have a separate call to grant consent, we shouldn't try to set that value on
the enterprise course enrollment anymore, because it causes errors.
```
  Brittney Exline committed Sep 05, 2017
  ba597331 Browse Files
- Merge pull request #15948 from edx/HarryRein/LEARNER-2453-social-link-period · 92d9327b
```
LEARNER-2453: Allow social usernames to contain periods.
```
  Harry Rein committed Sep 05, 2017
  92d9327b Browse Files
- Update sock copy. · 020c027f
  Diana Huang committed Sep 05, 2017
  
  020c027f Browse Files
- Merge pull request #15936 from edx/bmedx/oauth_token_delete_setting · 94400d21
```
Add default OAUTH_DELETE_EXPIRED to LMS settings
```
  Brian Mesick committed Sep 05, 2017
  94400d21 Browse Files
- Allow social usernames to contain periods. · d36304dc
```
LEARNER-2453
```
  Harry Rein committed Sep 05, 2017
  d36304dc Browse Files
01 Sep, 2017 10 commits
- Merge pull request #15945 from edx/ret/pin-ace-version · 01e41243
```
PIN version number of ACE
```
  Nimisha Asthagiri committed Sep 01, 2017
  01e41243 Browse Files
- Merge pull request #15943 from edx/andya/fix-learner-profile · 247cbfe5
```
Fix learner profile bug and tests that didn't catch it
```
  Andy Armstrong committed Sep 01, 2017
  247cbfe5 Browse Files
- PIN version number of ACE · 7953322f
  Nimisha Asthagiri committed Sep 01, 2017
  
  7953322f Browse Files
- Merge pull request #15944 from edx/efischer/revert_ora_release · 94aed661
```
Revert "Merge pull request #15939 from edx/efischer/ora_204"
```
  Eric Fischer committed Sep 01, 2017
  94aed661 Browse Files
- Fix learner profile bug and tests that didn't catch it · 5128a4f5
  Andy Armstrong committed Sep 01, 2017
  
  5128a4f5 Browse Files
- Merge pull request #15904 from edx/bmedx/pdfjs_add_zh-hans · 1a77b98f
```
Add zh_HANS language mapping to pdfjs
```
  Brian Mesick committed Sep 01, 2017
  1a77b98f Browse Files
- Revert "Merge pull request #15939 from edx/efischer/ora_204" · 44013d70
```
This reverts commit a403fd14, reversing
changes made to b31287e2.

500 errors on prod, need to rethink this fix.
```
  Eric Fischer committed Sep 01, 2017
  44013d70 Browse Files
- Merge pull request #15923 from edx/saleem-latif/ENT-608 · 740aad4c
```
ENT-608: edx-enterprise version upgrade to 0.42.0
```
  Brittney Exline committed Sep 01, 2017
  740aad4c Browse Files
- Merge pull request #15924 from edx/ai/EDUCATOR-1267-add-logs · 66ef2cab
```
EDUCATOR-1267 Add logs in importing the course.
```
  Attiya Ishaque committed Sep 01, 2017
  66ef2cab Browse Files
- Merge pull request #15942 from edx/ret/restrict-ace-deps · 0a9a4b1f
```
restrict ace deps
```
  Gabe Mulley committed Sep 01, 2017
  0a9a4b1f Browse Files