Commits · eff6f1d182e014b3c30e4fa7053663bb94ed41bd · edx / edx-platform · GitLab

18 Mar, 2013 4 commits
- Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash · eff6f1d1
```
Skip over fields that are scoped to students when looping through the Co...
```
  chrisndodge committed Mar 18, 2013
  eff6f1d1 Browse Files
- Merge pull request #1689 from MITx/fix/cale/pylint-cleanup · 2b149605
```
Small pylint cleanup
```
  Jay Zoldak committed Mar 18, 2013
  2b149605 Browse Files
- Skip over fields that are scoped to students when looping through the… · 3fbde821
```
Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard
```
  Calen Pennington committed Mar 18, 2013
  3fbde821 Browse Files
- Small pylint cleanup · a4f10bfd
  Calen Pennington committed Mar 18, 2013
  
  a4f10bfd Browse Files
17 Mar, 2013 2 commits
- Merge pull request #1685 from MITx/feature/cale/string_days_early · 27be7e15
```
Handle days_early_for_beta possibly being a string
```
  chrisndodge committed Mar 16, 2013
  27be7e15 Browse Files
- Handle days_early_for_beta possibly being a string · 9dda977e
  Calen Pennington committed Mar 16, 2013
  
  9dda977e Browse Files
15 Mar, 2013 18 commits
- Merge pull request #1679 from MITx/content/rocha/xblocks-announcement · b5cf9b32
```
Content/rocha/xblocks announcement
```
  brianhw committed Mar 15, 2013
  b5cf9b32 Browse Files
- XBlock SDK announcement · 93a59f24
```
LMS Lighthouse [#261]
```
  Carlos Andrés Rocha committed Mar 15, 2013
  93a59f24 Browse Files
- Pin versions of testing tools · 6ed279ce
  Calen Pennington committed Mar 15, 2013
  
  6ed279ce Browse Files
- Fix typo in signup forms · 7697a43c
```
LMS Lighthouse [#263]
```
  Carlos Andrés Rocha committed Mar 15, 2013
  7697a43c Browse Files
- Merge pull request #1572 from MITx/feature/alex/poll-merged · 3b0aed5d
```
Feature/alex/poll merged
```
  Calen Pennington committed Mar 15, 2013
  3b0aed5d Browse Files
- Merge pull request #1673 from MITx/jmpm-analytics · 0f5a05c8
```
Addressing some pep8/pylint concerns
```
  Calen Pennington committed Mar 15, 2013
  0f5a05c8 Browse Files
- Mark snippets as raw strings to avoid having to escape backslashes · f1d4096b
  Calen Pennington committed Mar 15, 2013
  
  f1d4096b Browse Files
- Squelch a few more pylint exceptions · 10de617d
  Calen Pennington committed Mar 15, 2013
  
  10de617d Browse Files
- Fix up capa tests · 9f99c900
  Calen Pennington committed Mar 15, 2013
  
  9f99c900 Browse Files
- Make relative imports explicitly relative · 6b64b421
  Calen Pennington committed Mar 15, 2013
  
  6b64b421 Browse Files
- Make common/djangoapps not a python module either · f1c66e91
  Calen Pennington committed Mar 15, 2013
  
  f1c66e91 Browse Files
- Addressing some pep8/pylint concerns · 67a0cccb
  David Ormsbee committed Mar 15, 2013
  
  67a0cccb Browse Files
- Don't make cms.djangoapps a python module · fd3ba7db
  Calen Pennington committed Mar 15, 2013
  
  fd3ba7db Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · fb8352e2
  Calen Pennington committed Mar 15, 2013
  
  fb8352e2 Browse Files
- Merge pull request #1665 from MITx/jmpm-analytics · 8531d562
```
Enables basic analytics tab in instructor dashboard
```
  Calen Pennington committed Mar 15, 2013
  8531d562 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged · 029d8c80
```
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
```
  Calen Pennington committed Mar 15, 2013
  029d8c80 Browse Files
- Disable sequence nav buttons when the sequence is empty · 116ecf2a
  Calen Pennington committed Mar 15, 2013
  
  116ecf2a Browse Files
- Make StringyInteger and StringyFloat return None when they can't parse the… · 44e6572e
```
Make StringyInteger and StringyFloat return None when they can't parse the string from json, and don't try to overwrite max_attempts if it's ''
```
  Calen Pennington committed Mar 15, 2013
  44e6572e Browse Files
14 Mar, 2013 16 commits
- Merge pull request #1671 from MITx/fix/will/save_button_regression · 7eb4970f
```
Fix/will/save button regression
```
  Victor Shnayder committed Mar 14, 2013
  7eb4970f Browse Files
- Fixed pep8 · ce5e8689
  Will Daly committed Mar 14, 2013
  
  ce5e8689 Browse Files
- Clarified comments about the logic of showing the save button · 5e433cda
  Will Daly committed Mar 14, 2013
  
  5e433cda Browse Files
- Save button no longer appears for non-randomized problems unlimited attempts · 4dabb4ce
  Will Daly committed Mar 14, 2013
  
  4dabb4ce Browse Files
- Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged · 5070e5b2
  Chris Dodge committed Mar 14, 2013
  
  5070e5b2 Browse Files
- move the instantiation of the metadata cache out of modulestore.py as it was… · d2f21661
```
move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled
```
  Chris Dodge committed Mar 14, 2013
  d2f21661 Browse Files
- Better positioning of elements draggables with labels in slider. · c54ad38f
  Valera Rozuvan committed Mar 14, 2013
  
  c54ad38f Browse Files
- Merge pull request #1668 from MITx/bugfix/dave/bad_route_in_rss · 4b5837ff
```
Removed reverse() call that was breaking in RSS feed.
```
  brianhw committed Mar 14, 2013
  4b5837ff Browse Files
- Removed reverse() call that was breaking in RSS feed. · e818efb0
  David Ormsbee committed Mar 14, 2013
  
  e818efb0 Browse Files
- Merge pull request #1667 from MITx/content/rocha/2.01x-announcement · 5576c549
```
Add 2.01x announcement to news feed
```
  David Ormsbee committed Mar 14, 2013
  5576c549 Browse Files
- Add location note to jobs page · 80d809a8
```
LMS Lighthouse [#190]
```
  Carlos Andrés Rocha committed Mar 14, 2013
  80d809a8 Browse Files
- Add 2.01x announcement to news feed · b4d83a5f
```
LMS Lighthouse [#259]
```
  Carlos Andrés Rocha committed Mar 14, 2013
  b4d83a5f Browse Files
- Fix ids in feed.rss · 15d8727f
  Carlos Andrés Rocha committed Mar 14, 2013
  
  15d8727f Browse Files
- Merge pull request #1666 from MITx/feature/kevin/pinning · 753cc9ec
```
Feature/kevin/pinning
```
  David Ormsbee committed Mar 13, 2013
  753cc9ec Browse Files
- fix conflict · 8d766c4b
  Kevin Chugh committed Mar 13, 2013
  
  8d766c4b Browse Files
- Merge pull request #1664 from MITx/feature/cdodge/cache-metadata-inheritence-in-django-cache · 3211221f
```
use django caching to hold computed metadata inheritence. Also invalidat...
```
  Calen Pennington committed Mar 13, 2013
  3211221f Browse Files