Commits · 89561d2f246264d100421531d47968e8f2121a41 · edx / edx-platform · GitLab

24 Oct, 2015 2 commits
- Merge pull request #10345 from edx/revert-8942-bdero/import-export-reprise · 89561d2f
```
Revert "Public Course Import/Export API (continued)"
```
  Ben Patterson committed Oct 23, 2015
  89561d2f Browse Files
- Revert "Public Course Import/Export API (continued)" · 1032d372
  Ben Patterson committed Oct 23, 2015
  
  1032d372 Browse Files
23 Oct, 2015 8 commits
- Merge pull request #10330 from edx/bderusha/unenroll-certs · cda5c52f
```
Conditionally show unenroll action based on certificate status
```
  Bill DeRusha committed Oct 23, 2015
  cda5c52f Browse Files
- Merge pull request #8942 from mitocw/bdero/import-export-reprise · e7708e5a
```
Public Course Import/Export API (continued)
```
  Peter Pinch committed Oct 23, 2015
  e7708e5a Browse Files
- Conditionally show unenroll action based on certificat status · 60fc3f57
  Bill DeRusha committed Oct 23, 2015
  
  60fc3f57 Browse Files
- Merge pull request #10291 from edx/asadiqbal08/SOL-1312-solution · 5c178900
```
SOL-1312 changes
```
  Matt Drayer committed Oct 23, 2015
  5c178900 Browse Files
- Merge pull request #10319 from edx/sarina/20151022-update-translations · ab8edc22
```
Update translations (autogenerated message)
```
  David Baumgold committed Oct 23, 2015
  ab8edc22 Browse Files
- Merge pull request #10321 from edx/frances/teams-post-style-fix · f6a1a0df
```
Teams Discussion Post Style Fixes
```
  frances botsford committed Oct 23, 2015
  f6a1a0df Browse Files
- Merge pull request #10323 from edx/christina/tnl-3679 · e3369beb
```
Mark as flaky.
```
  Christina Roberts committed Oct 23, 2015
  e3369beb Browse Files
- Merge pull request #10300 from edx/feanil/circle_ci · 61241ae9
```
Feanil/circle ci
```
  Feanil Patel committed Oct 23, 2015
  61241ae9 Browse Files
22 Oct, 2015 17 commits
- Merge pull request #10320 from open-craft/pb-version-bump · 2d084f76
```
Bump problem builder XBlock version to include PR 80
```
  Braden MacDonald committed Oct 22, 2015
  2d084f76 Browse Files
- Mark as flaky. · bdd30162
```
TNL-3679
```
  cahrens committed Oct 22, 2015
  bdd30162 Browse Files
- allow discussion post styles to be used in the teams space · feacd0fb
  Frances Botsford committed Oct 22, 2015
  
  feacd0fb Browse Files
- Bump problem builder XBlock version to include PR 80 · 0004df20
```
See https://github.com/open-craft/problem-builder/pull/80
```
  Braden MacDonald committed Oct 22, 2015
  0004df20 Browse Files
- Update translations (autogenerated message) · 7852f76c
  Sarina Canelake committed Oct 22, 2015
  
  7852f76c Browse Files
- Merge pull request #10262 from edx/oppia · 9abf2550
```
Update Oppia XBlock
```
  Sarina Canelake committed Oct 22, 2015
  9abf2550 Browse Files
- Merge pull request #10312 from edx/andya/dev-xblock-assets · d05b7a21
```
Allow non-public XBlock assets in debug mode
```
  Andy Armstrong committed Oct 22, 2015
  d05b7a21 Browse Files
- Merge pull request #10298 from edx/christina/tnl-2419 · 9cfbbb23
```
Use waits because MathJax rendering is asynchronous.
```
  Christina Roberts committed Oct 22, 2015
  9cfbbb23 Browse Files
- Merge pull request #10275 from edx/frances/capa-problem-status-fix · cb252c31
```
Fix for problem status feedback spacing and partial credit hint
```
  Sarina Canelake committed Oct 22, 2015
  cb252c31 Browse Files
- Merge pull request #10103 from edx/ahsan/ECOM-2435-Updated-Styling-for-Courses-Existing-Messaging · ce5f7901
```
Updated Styling for Courses and Existing Messaging
```
  Ahsan Ulhaq committed Oct 22, 2015
  ce5f7901 Browse Files
- Allow non-public XBlock assets in debug mode · 054aa95b
  Andy Armstrong committed Oct 22, 2015
  
  054aa95b Browse Files
- Merge pull request #10268 from mitocw/fix/pdw/download-ccx-csv · b87634d8
```
Fix CCX grades csv file download
```
  Peter Pinch committed Oct 22, 2015
  b87634d8 Browse Files
- Move waits into the page objects. · f7e2830a
  cahrens committed Oct 22, 2015
  
  f7e2830a Browse Files
- Wipe existing version when replacing. · e8214a1d
```
CircleCI re-uses your existing venv cache.  If we don't do this, it will prompt the user for what to do and hang the build on certain kinds of updates.
```
  Feanil Patel committed Oct 22, 2015
  e8214a1d Browse Files
- Use waits because MathJax rendering is asynchronous. · 9968622c
```
TNL-2419
```
  cahrens committed Oct 22, 2015
  9968622c Browse Files
- Merge pull request #10294 from edx/christina/convert-video-test · d4f2fe12
```
Delete test that is already covered by bok choy.
```
  Christina Roberts committed Oct 22, 2015
  d4f2fe12 Browse Files
- Merge pull request #10280 from edx/tasawer/story/ecom-2538-fix-for-multiple-providers · 450e625d
```
Fix parameter name issue for multiple providers
```
  tasawernawaz committed Oct 22, 2015
  450e625d Browse Files
21 Oct, 2015 13 commits
- Merge pull request #10260 from edx/renzo/reserve-service-user · d414d74f
```
Reserve ecommerce worker username
```
  Renzo Lucioni committed Oct 21, 2015
  d414d74f Browse Files
- Reserve ecommerce worker username · fda61b52
```
Django's user model allows email addresses to be blank. However, edx-platform includes a migration requiring that email addresses be unique. Someone in our production environment already had a blank email address, so this migration was failing earlier.
```
  Renzo Lucioni committed Oct 21, 2015
  fda61b52 Browse Files
- Merge pull request #10272 from edx/christina/PLAT-878 · a48d3ebe
```
Delete dead reference to modules.css.
```
  Christina Roberts committed Oct 21, 2015
  a48d3ebe Browse Files
- Merge pull request #10274 from edx/jsa/update-erac · 88bfeafe
```
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
```
  Jim Abramson committed Oct 21, 2015
  88bfeafe Browse Files
- Merge pull request #10286 from edx/christina/deprecate-survey · 9295b37d
```
Deprecate end_of_course_survey_url until it can be removed.
```
  Christina Roberts committed Oct 21, 2015
  9295b37d Browse Files
- Delete test that is already covered by bok choy. · cc0d9429
```
TNL-3223
```
  cahrens committed Oct 21, 2015
  cc0d9429 Browse Files
- Merge pull request #10288 from edx/release · c622f03a
```
Release 2015-10-21
```
  AlasdairSwan committed Oct 21, 2015
  c622f03a Browse Files
- SOL-1312 changes · 0f394656
  asadiqbal committed Oct 21, 2015
  
  0f394656 Browse Files
- Deprecate end_of_course_survey_url until it can be removed. · 05cae8c6
  cahrens committed Oct 21, 2015
  
  05cae8c6 Browse Files
- Merge pull request #10248 from edx/ziafazal/SOL-1319 · 5ed97e90
```
SOL-1319: removed  entrance exam dependency on ENABLE_MKTG_SITE
```
  Matt Drayer committed Oct 21, 2015
  5ed97e90 Browse Files
- Merge pull request #10254 from edx/rc/2015-10-20 · 969b4995
```
Rc/2015 10 20
```
  AlasdairSwan committed Oct 21, 2015
  969b4995 Browse Files
- Fix for multiple provider ids · 65c93d7a
```
ECOM-2538
```
  Tasawer committed Oct 21, 2015
  65c93d7a Browse Files
- Merge pull request #10223 from edx/christina/upgrade-mathjax · 125930cf
```
Upgrade to MathJax 2.5.
```
  Christina Roberts committed Oct 21, 2015
  125930cf Browse Files