Commits · dc78a08ce5aada188a23df96d0b1cf6006a74beb · edx / edx-platform · GitLab

18 Mar, 2013 9 commits
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio · dc78a08c
  Chris Dodge committed Mar 18, 2013
  
  dc78a08c Browse Files
- Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite · 9a59336b
```
Fix version handling for combined open ended
```
  VikParuchuri committed Mar 18, 2013
  9a59336b Browse Files
- Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests · b6e82afb
```
Fix/will/fix broken jasmine lms tests
```
  Jay Zoldak committed Mar 18, 2013
  b6e82afb Browse Files
- 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
- add HTML templates for 404/500 errors · 651465f1
  Chris Dodge committed Mar 18, 2013
  
  651465f1 Browse Files
- Small pylint cleanup · a4f10bfd
  Calen Pennington committed Mar 18, 2013
  
  a4f10bfd Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio · 2b677544
  Chris Dodge committed Mar 18, 2013
  
  2b677544 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 26 commits
- Merge pull request #1679 from MITx/content/rocha/xblocks-announcement · b5cf9b32
```
Content/rocha/xblocks announcement
```
  brianhw committed Mar 15, 2013
  b5cf9b32 Browse Files
- Reformat code · e4efda9a
  Vik Paruchuri committed Mar 15, 2013
  
  e4efda9a Browse Files
- Fix version tuples to be a dictionary · cd3e88fd
  Vik Paruchuri committed Mar 15, 2013
  
  cd3e88fd Browse Files
- Convert versions to tuples · 500c4ab8
  Vik Paruchuri committed Mar 15, 2013
  
  500c4ab8 Browse Files
- Address review comment · 01b1974f
  Vik Paruchuri committed Mar 15, 2013
  
  01b1974f Browse Files
- Convert to using versioninteger class · b609ab0e
  Vik Paruchuri committed Mar 15, 2013
  
  b609ab0e Browse Files
- Remove copy.copy · 405ea8d6
  Vik Paruchuri committed Mar 15, 2013
  
  405ea8d6 Browse Files
- Fix default version string integer issues · 97839d9d
  Vik Paruchuri committed Mar 15, 2013
  
  97839d9d Browse Files
- Fix version handling · c34666af
  Vik Paruchuri committed Mar 15, 2013
  
  c34666af 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 3 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