Commits · e0c3234faf2b31942675e075986a3fbb14114d14 · edx / edx-platform · GitLab

05 Sep, 2014 9 commits
- Merge pull request #5094 from edx/renzo/readd-embargo-changes · e0c3234f
```
Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""
```
  Renzo Lucioni committed Sep 05, 2014
  e0c3234f Browse Files
- Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" · aa28fba9
```
This reverts commit 371dfd61.
```
  Renzo Lucioni committed Sep 05, 2014
  aa28fba9 Browse Files
- Merge pull request #5063 from edx/christina/cohorts-bok-choy · 5fc4e02f
```
Christina/cohorts bok choy
```
  Christina Roberts committed Sep 05, 2014
  5fc4e02f Browse Files
- Merge pull request #5027 from edx/clytwynec/make_devstack_default_settings_instead_of_dev · f39d29ae
```
change default settings for servers/assets paver tasks from "dev" to "de...
```
  clytwynec committed Sep 05, 2014
  f39d29ae Browse Files
- Merge pull request #5072 from edx/ammar/tooltip-test · 5bcfaaaa
```
Tooltip Acceptance Test
```
  Muhammad Ammar committed Sep 05, 2014
  5bcfaaaa Browse Files
- Merge pull request #5087 from edx/release · 385b3ff4
```
Release
```
  Adam committed Sep 05, 2014
  385b3ff4 Browse Files
- Merge pull request #5089 from edx/ahodges/doc/repairs20140904 · c000201e
```
Corrections to guides for 4 Sep release
```
  Alison Hodges committed Sep 05, 2014
  c000201e Browse Files
- Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error · 32d9234b
```
Handle the indexerror exception on create_order
```
  Waqas Khalid committed Sep 05, 2014
  32d9234b Browse Files
- Corrections to guides for 4 Sep release · b4ca1c12
```
Items repaired:
- Pin_discussion.png file in wring directory
- Discussion_filters.png image in discussion_students unreadable,
replaced
- updated  release date in Research guide change log
- updated  release date in Course Author’s guide change log
- updated  “History” dates for fields added to research guide
```
  Alison Hodges committed Sep 04, 2014
  b4ca1c12 Browse Files
04 Sep, 2014 27 commits
- Merge pull request #5082 from edx/hotfix/2014-09-04 · cef61497
```
Revert "Merge pull request #4976 from edx/will/ecom-128"
```
  Adam committed Sep 04, 2014
  cef61497 Browse Files
- Merge pull request #5070 from edx/reruns/error-handling · 08a0c639
```
Course Rerun: include stack trace in errors and Log errors.
```
  Nimisha Asthagiri committed Sep 04, 2014
  08a0c639 Browse Files
- Merge pull request #5081 from edx/ahodges/doc/help_fixes · 97527266
```
Fixes to improve help experience& correct HTML build errors
```
  Alison Hodges committed Sep 04, 2014
  97527266 Browse Files
- Bok choy test for cohort group label in post. · bc483eba
  cahrens committed Sep 04, 2014
  
  bc483eba Browse Files
- Revert "Merge pull request #4976 from edx/will/ecom-128" · 371dfd61
```
This reverts commit a03baee2, reversing
changes made to 12e2d442.
```
  Diana Huang committed Sep 04, 2014
  371dfd61 Browse Files
- Fixes to improve help experience& correct HTML build errors · 5263f15e
  Alison Hodges committed Sep 04, 2014
  
  5263f15e Browse Files
- Merge branch 'release' · 578be6cc
  Han Su Kim committed Sep 04, 2014
  
  578be6cc Browse Files
- Merge pull request #5062 from Stanford-Online/jbau/shib-unicode · 07b81446
```
external_auth: handle request.META values as str, not unicode
```
  Jason Bau committed Sep 04, 2014
  07b81446 Browse Files
- Merge pull request #5046 from edx/andya/cohort-visibility-labels-2 · e1c7bb83
```
Implement forum cohort visibility labels correctly
```
  Andy Armstrong committed Sep 04, 2014
  e1c7bb83 Browse Files
- Merge pull request #5041 from edx/sylvia/docs/relnotes_9-3 · c98ffa77
```
Release notes draft
```
  srpearce committed Sep 04, 2014
  c98ffa77 Browse Files
- Course staff release notes 9/4/14 · 2a0c3520
  Sylvia Pearce committed Sep 04, 2014
  
  2a0c3520 Browse Files
- Include stack trace in Course Rerun errors; Log errors. · bdd91dae
  Nimisha Asthagiri committed Sep 04, 2014
  
  bdd91dae Browse Files
- Implement forum cohort visibility labels correctly · 8349dbfa
```
TNL-25
```
  Andy Armstrong committed Sep 04, 2014
  8349dbfa Browse Files
- Merge pull request #5075 from edx/zoldak/fix-typo · 7eb3a22d
```
Fix capitilization on verified flow
```
  Jesse Zoldak committed Sep 04, 2014
  7eb3a22d Browse Files
- Fix capitilization on verified flow · 814f6b91
  Jesse Zoldak committed Sep 04, 2014
  
  814f6b91 Browse Files
- Merge pull request #5071 from edx/split/re-import-issue · 272dd2aa
```
LMS-11342 Fix Split reimport issue.
```
  Nimisha Asthagiri committed Sep 04, 2014
  272dd2aa Browse Files
- Merge pull request #5074 from edx/alex/fix_lti_description · f591f381
```
Fix description for LTI passports field.
```
  Alexander Kryklia committed Sep 04, 2014
  f591f381 Browse Files
- Merge pull request #5026 from edx/dan-f/test-lms-passes-group-id · 15c05319
```
Test passing `group_id` in thread creation
```
  Daniel Friedman committed Sep 04, 2014
  15c05319 Browse Files
- Merge pull request #4975 from edx/reruns/analytics_i4x · 01fb81b8
```
Remove client side parsing of module_id
```
  Nimisha Asthagiri committed Sep 04, 2014
  01fb81b8 Browse Files
- Merge pull request #5073 from edx/ecom/fix-user-id · 23d3a918
```
Analytics should use user.id not anon id
```
  Julia Hansbrough committed Sep 04, 2014
  23d3a918 Browse Files
- Fix description for LTI passports field. · 62afe9c3
  Alexander Kryklia committed Sep 04, 2014
  
  62afe9c3 Browse Files
- Analytics should use user.id not anon id · 0dea82e4
  Julia Hansbrough committed Sep 04, 2014
  
  0dea82e4 Browse Files
- Tooltip Acceptance Test · da9a01a6
  muhammad-ammar committed Sep 04, 2014
  
  da9a01a6 Browse Files
- Merge pull request #5005 from edx/waheed/lms11302-fix-external-link-alignment · 90fbbe14
```
Minor styling tweaks for external resource button in LTI component.
```
  Waheed Ahmed committed Sep 04, 2014
  90fbbe14 Browse Files
- Minor styling tweaks. · 4993e223
```
LMS-11302
```
  Waheed Ahmed committed Sep 04, 2014
  4993e223 Browse Files
- LMS-11342 Fix Split reimport issue. · b6590228
  Nimisha Asthagiri committed Sep 03, 2014
  
  b6590228 Browse Files
- Remove client side parsing of module_id · afa57f50
```
in analytics dashboard.
LMS-11209
```
  Don Mitchell committed Sep 03, 2014
  afa57f50 Browse Files
03 Sep, 2014 4 commits
- Test passing `group_id` in thread creation · 25cbda66
  Daniel Friedman committed Sep 03, 2014
  
  25cbda66 Browse Files
- Merge pull request #5067 from edx/gprice/forum-nav-header-width · a8d07780
```
Cosmetic fixes for forums
```
  Greg Price committed Sep 03, 2014
  a8d07780 Browse Files
- Merge pull request #5051 from edx/jsa/fix-thing · 2cba87d0
```
remove use of ngettext in discussion jasmine test
```
  Jim Abramson committed Sep 03, 2014
  2cba87d0 Browse Files
- Merge pull request #5058 from edx/sarina/fix-activation-email-link · 7acab41f
```
Fix link in account activation email
```
  Sarina Canelake committed Sep 03, 2014
  7acab41f Browse Files