Commits · 167f4171c45431d3c9ba4a65fb3e956e451432c2 · edx / edx-platform

07 Sep, 2014 1 commit
- XBlock argument passing support · 167f4171
  Piotr Mitros committed Sep 07, 2014
  
  167f4171 Browse Files
04 Sep, 2014 2 commits
- 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
03 Sep, 2014 8 commits
- 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
- remove use of ngettext in discussion jasmine test · 50741304
  jsa committed Sep 03, 2014
  
  50741304 Browse Files
- Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332 · 48bdeeea
```
Enable bulk operations on split
```
  Calen Pennington committed Sep 03, 2014
  48bdeeea Browse Files
- Merge pull request #5014 from edx/dcs/BLD-1189 · 6261d9c8
```
Removed spacebar event handler, because it did more harm than good.
```
  Dave St.Germain committed Sep 03, 2014
  6261d9c8 Browse Files
- Merge pull request #5043 from edx/christina/cohort-selector · bda16e2f
```
Move tests into appropriate directory structure.
```
  Christina Roberts committed Sep 03, 2014
  bda16e2f Browse Files
- Add specific bulk-operation test for LMS-11332, and a fix · f70e7025
  Calen Pennington committed Sep 03, 2014
  
  f70e7025 Browse Files
- LMS-11332 Unit test · bd54cd8c
  Nimisha Asthagiri committed Sep 03, 2014
  
  bd54cd8c Browse Files
- Merge pull request #5001 from edx/split/edit_info · 96bc5cc8
```
Split/edit info
```
  Don Mitchell committed Sep 03, 2014
  96bc5cc8 Browse Files
02 Sep, 2014 23 commits
- Implement edit info as mixin on base mongo · a65771df
```
LMS-11183, LMS-11184
```
  Don Mitchell committed Sep 02, 2014
  a65771df Browse Files
- Move tests into appropriate directory structure. · a96b2bd7
  cahrens committed Sep 02, 2014
  
  a96b2bd7 Browse Files
- 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
- Change published_date to published_on · 85fa712f
```
to make consistent with other edit info timestamps
LMS-11184
```
  Don Mitchell committed Sep 02, 2014
  85fa712f 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
- Implement edit info as mixin for split · 4878f6e8
```
LMS-11183, LMS-11184
```
  Don Mitchell committed Sep 02, 2014
  4878f6e8 Browse Files
- Move edit info into xblock and runtime mixins · 7b52d45a
```
LMS-11183, LMS-11184
```
  Don Mitchell committed Sep 02, 2014
  7b52d45a 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 5 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

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

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