Commits · 23d96b25333fe1047151e7d64db30099d5d90284 · edx / edx-platform · GitLab

30 Mar, 2013 1 commit
- change submission history to be ordered by id · 23d96b25
  Brian Wilson committed Mar 29, 2013
  
  23d96b25 Browse Files
29 Mar, 2013 22 commits
- Merge pull request #1669 from MITx/fix/vik/add-oe-tab · 1c47573b
```
Fix/vik/add oe tab
```
  chrisndodge committed Mar 29, 2013
  1c47573b Browse Files
- Make process to add open ended tab to studio reversible · 033f5ce7
  Vik Paruchuri committed Mar 29, 2013
  
  033f5ce7 Browse Files
- Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint · c655c814
```
add checking for metadata that we can't support editing for in Studio. T...
```
  Don Mitchell committed Mar 29, 2013
  c655c814 Browse Files
- Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf · 80f57db7
```
Feature/cdodge/course overview perf
```
  Don Mitchell committed Mar 29, 2013
  80f57db7 Browse Files
- oops. I'm not programming in C# any longer · 599ca4d4
  Chris Dodge committed Mar 29, 2013
  
  599ca4d4 Browse Files
- remove unused parameter · 60e29589
  Chris Dodge committed Mar 29, 2013
  
  60e29589 Browse Files
- Merge pull request #1769 from MITx/fix/ned/cleanup-wacky-code · 6b1e1b14
```
Enough is enough.
```
  brianhw committed Mar 29, 2013
  6b1e1b14 Browse Files
- No need to wrap comments that tightly. · 0cfcd183
  Ned Batchelder committed Mar 29, 2013
  
  0cfcd183 Browse Files
- Enough is enough. · e8f8e9e1
  Ned Batchelder committed Mar 29, 2013
  
  e8f8e9e1 Browse Files
- add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict… · 3ce01882
```
add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials
```
  Chris Dodge committed Mar 29, 2013
  3ce01882 Browse Files
- Add in a comment · b8e6c94d
  Vik Paruchuri committed Mar 29, 2013
  
  b8e6c94d Browse Files
- Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests · a5b1428b
```
Feature/will/speed up unit tests
```
  Jay Zoldak committed Mar 29, 2013
  a5b1428b Browse Files
- Minor fixes for things that broke in the merge · 5aa35793
  Vik Paruchuri committed Mar 29, 2013
  
  5aa35793 Browse Files
- Fix some post-merge errors · 65c2fd5f
  Vik Paruchuri committed Mar 29, 2013
  
  65c2fd5f Browse Files
- a few more pep8 fixes · d044d5c4
  Jay Zoldak committed Mar 29, 2013
  
  d044d5c4 Browse Files
- Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab · 20bbf75f
```
Conflicts:
	cms/djangoapps/contentstore/utils.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_metadata.py
```
  Vik Paruchuri committed Mar 29, 2013
  20bbf75f Browse Files
- Merge pull request #1767 from MITx/hotfix/diana/input-state-fix · f6e9b2ed
```
Remove the default and prevent input_state from persisting across problems
```
  David Ormsbee committed Mar 29, 2013
  f6e9b2ed Browse Files
- Remove the default and prevent input_state from keeping around · 17adc986
```
unnecessary data.
```
  Diana Huang committed Mar 29, 2013
  17adc986 Browse Files
- Merge pull request #1764 from MITx/hotfix/diana/random_check_bug · 34899c20
```
Fixed bug in parsing of urandom struct so that seed
```
  David Ormsbee committed Mar 29, 2013
  34899c20 Browse Files
- small pep8 pylint and superclass fixes · b63aae22
  Jay Zoldak committed Mar 29, 2013
  
  b63aae22 Browse Files
- Fixed bug in parsing of urandom struct so that seed · f90dd495
```
is set to an integer (and correctly saved) instead of a tuple.
```
  Will Daly committed Mar 29, 2013
  f90dd495 Browse Files
- add some depth optimziations for edit subsection and unit pages as well · bbb53a17
  Chris Dodge committed Mar 29, 2013
  
  bbb53a17 Browse Files
28 Mar, 2013 17 commits
- Guard against trying to load a template when checking pages. · 5bf839c9
  Will Daly committed Mar 28, 2013
  
  5bf839c9 Browse Files
- Test case now drops the mongo collection · d92533bb
  Will Daly committed Mar 28, 2013
  
  d92533bb Browse Files
- Reverted cms changes back · 86bc70c3
  Will Daly committed Mar 28, 2013
  
  86bc70c3 Browse Files
- fix incorrect comment · ee5076bd
  Chris Dodge committed Mar 28, 2013
  
  ee5076bd Browse Files
- Merge pull request #1761 from MITx/content/rocha/utaustinx-courses · 252f9364
```
Content/rocha/utaustinx courses
```
  Ned Batchelder committed Mar 28, 2013
  252f9364 Browse Files
- Add UTAustinX landing page · a15baa97
  Carlos Andrés Rocha committed Mar 28, 2013
  
  a15baa97 Browse Files
- Enable meta-universities (organizations that contain other) · 4050da6b
  Carlos Andrés Rocha committed Mar 28, 2013
  
  4050da6b Browse Files
- also, we don't support metadata on chapters · c55d54b0
  Chris Dodge committed Mar 28, 2013
  
  c55d54b0 Browse Files
- Pylint and pep8 fixes · f652fb5f
  Will Daly committed Mar 28, 2013
  
  f652fb5f Browse Files
- Optimized ModuleStoreTestCase to reload templates only once · 6f8c9b4a
```
over all test runs.
```
  Will Daly committed Mar 28, 2013
  6f8c9b4a Browse Files
- remove unnecessary debug log message · 1c2a8a97
  Chris Dodge committed Mar 28, 2013
  
  1c2a8a97 Browse Files
- add some unit tests · 197f5253
  Chris Dodge committed Mar 28, 2013
  
  197f5253 Browse Files
- Merge pull request #1759 from MITx/bug/christina/grading · 210101dc
```
Bug fix for grading type not showing on course outline (#258).
```
  chrisndodge committed Mar 28, 2013
  210101dc Browse Files
- Bug fix for grading type not showing on course outline (#258). · 7279f9c4
  cahrens committed Mar 28, 2013
  
  7279f9c4 Browse Files
- Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers · c9a7be6b
```
Feature/will/lettuce test helpers
```
  Jay Zoldak committed Mar 28, 2013
  c9a7be6b Browse Files
- Randomized instructor page tests · 13c01ec3
  Will Daly committed Mar 28, 2013
  
  13c01ec3 Browse Files
- Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata · fece9376
```
Fix/cdodge/use request scoped cache for metadata inheritance
```
  Don Mitchell committed Mar 28, 2013
  fece9376 Browse Files