Commits · 0654665b20023ba19171ef26ef3de564e5ac2cac · edx / edx-platform

15 Nov, 2012 1 commit

Enable XModule factories to work with the currently version of Factory Boy at… · 0654665b

Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy'

committed Nov 15, 2012

0654665b Browse Files

14 Nov, 2012 5 commits
- Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing · edb9f8ce
  Jay Zoldak committed Nov 14, 2012
  
  edb9f8ce Browse Files
- Create factory for Xmodule items · 6f5b3fa1
  Jay Zoldak committed Nov 14, 2012
  
  6f5b3fa1 Browse Files
- Create factory for courses · 58fef4a3
  Jay Zoldak committed Nov 14, 2012
  
  58fef4a3 Browse Files
- Merge pull request #1046 from MITx/fix/cdodge/asset-embed · a1a3b925
```
Change the Embed column in assest index page to just display the URL
```
  chrisndodge committed Nov 14, 2012
  a1a3b925 Browse Files
- Change the Embed column in assest index page to just display the URL · 5c3db6f5
  Chris Dodge committed Nov 14, 2012
  
  5c3db6f5 Browse Files
13 Nov, 2012 4 commits
- Create the test_root/log directory on git checkout · 3c90e292
  Calen Pennington committed Nov 13, 2012
  
  3c90e292 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/cale/cms-master · dbcb1adf
```
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
```
  Calen Pennington committed Nov 13, 2012
  dbcb1adf Browse Files
- Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing · eb92ad1f
```
Feature/jzoldak/cms unit testing
```
  Calen Pennington committed Nov 13, 2012
  eb92ad1f Browse Files
- Use xmodule.templates instead of hard coding them in the test · a060b8de
  Jay Zoldak committed Nov 13, 2012
  
  a060b8de Browse Files
12 Nov, 2012 15 commits
- add meta tag for google verification · 5f97533c
  Arjun Singh committed Nov 12, 2012
  
  5f97533c Browse Files
- Merge pull request #1038 from MITx/vik/add_self_assessment · f54d4241
```
Vik/add self assessment
```
  Victor Shnayder committed Nov 12, 2012
  f54d4241 Browse Files
- only ask for hints if assessed as wrong · 3f95116a
  Victor Shnayder committed Nov 12, 2012
  
  3f95116a Browse Files
- bigger error messages · 92ab5af6
  Victor Shnayder committed Nov 12, 2012
  
  92ab5af6 Browse Files
- make textboxes read-only when that makes sense. · 6e5a6f97
```
- also make reset hide the original output
```
  Victor Shnayder committed Nov 12, 2012
  6e5a6f97 Browse Files
- Move point where input box is disabled · 39210fa9
  Vik Paruchuri committed Nov 12, 2012
  
  39210fa9 Browse Files
- Add in ability to define score points · d5702fc7
  Vik Paruchuri committed Nov 12, 2012
  
  d5702fc7 Browse Files
- Modify to store scores instead of correct/incorrect, remove student ability to edit response · ba8781dd
  Vik Paruchuri committed Nov 12, 2012
  
  ba8781dd Browse Files
- Merge pull request #1011 from MITx/vik/add_self_assessment · b378af87
```
Vik/add self assessment
```
  Victor Shnayder committed Nov 12, 2012
  b378af87 Browse Files
- more css tweaks · 6a313fd5
  Victor Shnayder committed Nov 12, 2012
  
  6a313fd5 Browse Files
- merge in origin/master · 0ad2154b
  Victor Shnayder committed Nov 12, 2012
  
  0ad2154b Browse Files
- css tweaks · 2b55c590
  Victor Shnayder committed Nov 12, 2012
  
  2b55c590 Browse Files
- bugfixes re: button state · 68fb5c97
  Victor Shnayder committed Nov 12, 2012
  
  68fb5c97 Browse Files
- hook up reset button · 4922ab33
  Victor Shnayder committed Nov 12, 2012
  
  4922ab33 Browse Files
- mostly working version of self-assessment · 0ec7043e
```
TODO:
* better css
* green checkmark
* reset button
* tests
```
  Victor Shnayder committed Nov 12, 2012
  0ec7043e Browse Files
10 Nov, 2012 8 commits
- Do not display the grade when student is not passing · 1e956d44
  John Jarvis committed Nov 10, 2012
  
  1e956d44 Browse Files
- http->https · ca6cfe42
  John Jarvis committed Nov 09, 2012
  
  ca6cfe42 Browse Files
- Merge pull request #1037 from MITx/fix/rocha/dashboard-without-certificates · 50415acb
```
Fix syntax on dashboard template
```
  jarv committed Nov 09, 2012
  50415acb Browse Files
- Fix syntax on dashboard template · 5f5f56bb
  Carlos Andrés Rocha committed Nov 09, 2012
  
  5f5f56bb Browse Files
- Merge pull request #1036 from MITx/fix/rocha/dashboard-without-certificates · e37a71b6
```
Quickfix to render the dashboard when there is no certificate db tables
```
  jarv committed Nov 09, 2012
  e37a71b6 Browse Files
- Quickfix to render the dashboard when there is no certificate db tables · 8c2cbede
  Carlos Andrés Rocha committed Nov 09, 2012
  
  8c2cbede Browse Files
- Merge pull request #1035 from MITx/feature/jarv/cert-feature-flag · 39a5b6eb
```
only check cert_status when certificates feature flag is enabled
```
  Carlos Andrés Rocha committed Nov 09, 2012
  39a5b6eb Browse Files
- only check cert_status when certificates feature flag is enabled · 157c98a7
  John Jarvis committed Nov 09, 2012
  
  157c98a7 Browse Files
09 Nov, 2012 7 commits
- Merge pull request #1034 from MITx/feature/rocha/cert · 6857dae0
```
Feature/rocha/cert
```
  jarv committed Nov 09, 2012
  6857dae0 Browse Files
- Cleanup django-admin commands · fc32032b
  John Jarvis committed Nov 09, 2012
  
  fc32032b Browse Files
- renmaing unusual to unicode, fixing syntax and removing id in · d6403fe3
```
enrolled_students query
```
  John Jarvis committed Nov 09, 2012
  d6403fe3 Browse Files
- Cleanup and django-admin commands · 2c41b94d
  John Jarvis committed Nov 09, 2012
  
  2c41b94d Browse Files
- add note about new end_of_course_survey_url flag to docs · 35acbc84
  Victor Shnayder committed Nov 09, 2012
  
  35acbc84 Browse Files
- bugfixes in template · c27913c5
  Victor Shnayder committed Nov 09, 2012
  
  c27913c5 Browse Files
- always return grade as part of cert status · aedb0254
  Victor Shnayder committed Nov 09, 2012
  
  aedb0254 Browse Files