in analytics dashboard.
LMS-11209

Cdodge/ecommerce invoicing

Merge hotfix-2014-08-29 to master

Updating EX-60 logic

Revert "AWS settings for XBlocks to have filesystem-like storage"

Split bok-choy tests into 3 shards (merge)

AWS settings for XBlocks to have filesystem-like storage

jenkins scripts: provide 'all' shard for bok-choy, use as default.

Sanchez/fix django header tests

username and email request for lti module

TE-447

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.

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

Facebook auth support.

Add post types to forums

This requires cs_comments_service@66482b54

New XBlock with final/tested/non-prototype scope_key

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

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

Revert "The main django template needs header and footer feature flags."

ECOM-199: Auto-registration bugfix

Hotfix - reduce number of Studio mongo calls

The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>

This feature is supplanted by the flagged option in the filter menu,
which can work within topics as well as across all topics.

The menu allows filtering to unread, unanswered, or flagged threads.
This includes passing through the appropriate query parameters to the
comments service.

A link to show the comments appears in their place.

Co-authored-by: jsa <jsa@edx.org>

Also change server to pass post type through to the comments service.