Commits · 371dfd6187ff1a2c2fa3f0ad293f12a66b714b4e · edx / edx-platform

04 Sep, 2014 3 commits
- 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
- 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
- Analytics should use user.id not anon id · 0dea82e4
  Julia Hansbrough committed Sep 04, 2014
  
  0dea82e4 Browse Files
03 Sep, 2014 9 commits
- 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 #5058 from edx/sarina/fix-activation-email-link · 7acab41f
```
Fix link in account activation email
```
  Sarina Canelake committed Sep 03, 2014
  7acab41f Browse Files
- Fix size of endorser username in forum responses · d303041c
  Greg Price committed Sep 03, 2014
  
  d303041c Browse Files
- Fix forum nav header width · a703cc8f
  Greg Price committed Sep 03, 2014
  
  a703cc8f Browse Files
- Merge pull request #5056 from edx/renzo/third-party-auth-copy · 6a151f0d
```
Fix 3rd party auth copy string interpolation, address design feedback
```
  Renzo Lucioni committed Sep 03, 2014
  6a151f0d Browse Files
- Fix link in account activation email · 046b9b15
  Sarina Canelake committed Sep 03, 2014
  
  046b9b15 Browse Files
- Fix 3rd party auth string interpolation, address design feedback · 9219cbdc
  Renzo Lucioni committed Sep 03, 2014
  
  9219cbdc Browse Files
- Merge pull request #5047 from edx/renzo/third-party-auth-copy · a81ff984
```
Correct 3rd party auth login page message and styling
```
  Renzo Lucioni committed Sep 03, 2014
  a81ff984 Browse Files
- Correct 3rd party auth login page message and styling · 93a263b9
  Renzo Lucioni committed Sep 03, 2014
  
  93a263b9 Browse Files
02 Sep, 2014 18 commits
- Merge pull request #4771 from edx/cdodge/ecommerce-invoicing · c5fc9b2f
```
Cdodge/ecommerce invoicing
```
  chrisndodge committed Sep 02, 2014
  c5fc9b2f Browse Files
- Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 · 1e2d5ffe
```
Merge hotfix-2014-08-29 to master
```
  Calen Pennington committed Sep 02, 2014
  1e2d5ffe Browse Files
- Implement mediated bulk purchase epic · 2cc04338
```
Updating EX-60 logic
```
  Muhammad Shoaib committed Sep 02, 2014
  2cc04338 Browse Files
- Merge pull request #5040 from edx/revert-5039-pmitros/aws-djpyfs · 27c83d51
```
Revert "AWS settings for XBlocks to have filesystem-like storage"
```
  Ben Patterson committed Sep 02, 2014
  27c83d51 Browse Files
- Revert "AWS settings for XBlocks to have filesystem-like storage" · fe85223f
  Ben Patterson committed Sep 02, 2014
  
  fe85223f Browse Files
- Merge pull request #5037 from edx/ammar-ben/bok-choy-shard-3 · 1abb8de2
```
Split bok-choy tests into 3 shards (merge)
```
  Ben Patterson committed Sep 02, 2014
  1abb8de2 Browse Files
- Merge pull request #5039 from edx/pmitros/aws-djpyfs · e5286a14
```
AWS settings for XBlocks to have filesystem-like storage
```
  Piotr Mitros committed Sep 02, 2014
  e5286a14 Browse Files
- Merge pull request #4988 from edx/benp/all-tests-update · 91cbc192
```
jenkins scripts: provide 'all' shard for bok-choy, use as default.
```
  Ben Patterson committed Sep 02, 2014
  91cbc192 Browse Files
- Merge pull request #5036 from edx/sanchez/fix_django_header_tests · 8eeb091d
```
Sanchez/fix django header tests
```
  Stephen Sanchez committed Sep 02, 2014
  8eeb091d Browse Files
- AWS settings for XBlocks to have filesystem-like storage · ce2e5138
  Piotr Mitros committed Sep 02, 2014
  
  ce2e5138 Browse Files
- Tweak mongo count numbers · fb565880
  Calen Pennington committed Sep 02, 2014
  
  fb565880 Browse Files
- Merge pull request #4501 from htareque/lti_revision_3 · 9a0d9f70
```
username and email request for lti module
```
  Alexander Kryklia committed Sep 02, 2014
  9a0d9f70 Browse Files
- Merge remote-tracking branch 'edx/master' into andya/merge-hotfix-2014-08-29 · 880673b9
  Calen Pennington committed Sep 02, 2014
  
  880673b9 Browse Files
- Cleaning up ddt syntax for new footer test. · 2f4fb305
  Stephen Sanchez committed Sep 02, 2014
  
  2f4fb305 Browse Files
- Split Bok-Choy Tests into 3 shards · 94c90556
```
TE-447
```
  muhammad-ammar committed Sep 02, 2014
  94c90556 Browse Files
- Create shard 3 for bok-choy; handle unknown shards. · e3b40a8c
```
This accomplishes three things:
1. Create a 3rd bok-choy shard
2. Allow the script to run 'all' shards
3. If the script receives an unknown shard, it will pass through empty tests.

The last one (3) is intended to allow us to expand to additional shards
on our Jenkins infrastructure. If we have, for example, a 4th shard introduced,
but someone attemps to run a commit that is older (and therefore still
has 3 shards); the script will just pass-through shard '4'. This means
older commits can still get tested. In that case, the older commit
will still test all cases, because the last shard (n) is basically an
'everything else' shard.
```
  Ben Patterson committed Sep 02, 2014
  e3b40a8c Browse Files
- username and email request for lti module · 3f159ea5
```
added username and email functionality, so that username and email can be passed to the lti third party app

rev2: added customizable text box

rev3: added revisions from auraz
```
  htareque committed Sep 02, 2014
  3f159ea5 Browse Files
- The main django template needs header and footer feature flags. · 75d6f99f
  Stephen Sanchez committed Sep 02, 2014
  
  75d6f99f Browse Files
30 Aug, 2014 1 commit
- Merge pull request #4915 from edx/flowerhack/redo-third-party · c7d41833
```
Facebook auth support.
```
  Julia Hansbrough committed Aug 30, 2014
  c7d41833 Browse Files
29 Aug, 2014 9 commits
- Merge pull request #4957 from edx/forums/new-post-type · b8049c01
```
Add post types to forums

This requires cs_comments_service@66482b54
```
  Greg Price committed Aug 29, 2014
  b8049c01 Browse Files
- Merge pull request #5028 from edx/pmitros/update-xblock · b89dccdc
```
New XBlock with final/tested/non-prototype scope_key
```
  Ned Batchelder committed Aug 29, 2014
  b89dccdc Browse Files
- Merge branch 'release' into andya/merge-hotfix-2014-08-29 · 4fcc59b3
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
```
  Andy Armstrong committed Aug 29, 2014
  4fcc59b3 Browse Files
- Merge branch 'release' into andya/merge-hotfix-2014-08-29 · 7b26e854
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
```
  Andy Armstrong committed Aug 29, 2014
  7b26e854 Browse Files
- Merge pull request #5030 from edx/revert-5024-sanchez/ECOM-216-django-template-settings · 765cd93d
```
Revert "The main django template needs header and footer feature flags."
```
  Jesse Zoldak committed Aug 29, 2014
  765cd93d Browse Files
- Revert "The main django template needs header and footer feature flags." · 96153cee
  Jesse Zoldak committed Aug 29, 2014
  
  96153cee Browse Files
- Merge pull request #5006 from edx/will/ecom-199 · 5cc6455f
```
ECOM-199: Auto-registration bugfix
```
  Will Daly committed Aug 29, 2014
  5cc6455f Browse Files
- Merge pull request #5020 from edx/hotfix/reduce-studio-mongo-calls · 1838d9d4
```
Hotfix - reduce number of Studio mongo calls
```
  Andy Armstrong committed Aug 29, 2014
  1838d9d4 Browse Files
- New UI for discussions · c9bf9ada
  Alison Hodges committed Aug 29, 2014
  
  c9bf9ada Browse Files