Commits · 363ca7031e38c234bea97921c8176780df8ff26e · edx / edx-platform · GitLab

03 Feb, 2013 4 commits
- add coffeescript/js for conditional module, does XModule.loadModules · 363ca703
  ichuang committed Feb 03, 2013
  
  363ca703 Browse Files
- use ajax for doing conditional_module · 19051e40
  ichuang committed Feb 03, 2013
  
  19051e40 Browse Files
- conditional_module.html · 8db96abb
  ichuang committed Feb 03, 2013
  
  8db96abb Browse Files
- initial implementation of conditional_module; doesn't load dynamically yet · 95b81347
  ichuang committed Feb 03, 2013
  
  95b81347 Browse Files
01 Feb, 2013 14 commits
- Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes · 01fab2ec
```
Feature/vik/combined xmodule changes
```
  VikParuchuri committed Feb 01, 2013
  01fab2ec Browse Files
- Remove reload test · 9310dcbe
  Vik Paruchuri committed Feb 01, 2013
  
  9310dcbe Browse Files
- Fix JS tests · b609bbee
  Vik Paruchuri committed Feb 01, 2013
  
  b609bbee Browse Files
- For prod environments only log info and up · 1c09d9ca
  John Jarvis committed Feb 01, 2013
  
  1c09d9ca Browse Files
- pep8 cleanup · f525b17b
  John Jarvis committed Feb 01, 2013
  
  f525b17b Browse Files
- Removing duplicate loggers · 8b012989
  John Jarvis committed Feb 01, 2013
  
  8b012989 Browse Files
- Adding service_variant and a little pep8 cleanup · 4a08bc77
  John Jarvis committed Feb 01, 2013
  
  4a08bc77 Browse Files
- Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems. · 6b6d8a94
  Ned Batchelder committed Feb 01, 2013
  
  6b6d8a94 Browse Files
- Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists · 14ca42a5
```
temporary style sync up for course info lists
```
  Christina Roberts committed Feb 01, 2013
  14ca42a5 Browse Files
- Merge pull request #1404 from MITx/feature/edz/service-variant · dce65f2a
```
service variant code for loading different config
```
  Calen Pennington committed Feb 01, 2013
  dce65f2a Browse Files
- temporary style sync up for course info lists - more work needs to be done once… · 61de4c02
```
temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)
```
  Brian Talbot committed Feb 01, 2013
  61de4c02 Browse Files
- Add comment describing why commented out code is there · c4b9288c
  Vik Paruchuri committed Feb 01, 2013
  
  c4b9288c Browse Files
- Fix jasmine tests? · 78dda497
  Vik Paruchuri committed Feb 01, 2013
  
  78dda497 Browse Files
- service variant code for loading different config · 969737c5
  e0d committed Jan 31, 2013
  
  969737c5 Browse Files
31 Jan, 2013 22 commits
- Merge pull request #1403 from MITx/style/btalbot/lms-calendartables · a8950343
```
lms - syllabus/calendar table styling fixes
```
  David Ormsbee committed Jan 31, 2013
  a8950343 Browse Files
- lms - revising xmodule HTML display styles and overwriting some to retain old… · f6cd4c75
```
lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling
```
  Brian Talbot committed Jan 31, 2013
  f6cd4c75 Browse Files
- Fix open ended module tests · c5e80b95
  Vik Paruchuri committed Jan 31, 2013
  
  c5e80b95 Browse Files
- Move over rubric parsing logic to rubric module · d6f8def7
  Vik Paruchuri committed Jan 31, 2013
  
  d6f8def7 Browse Files
- Add in some removed imports (fix tests) · b22bad7f
  Vik Paruchuri committed Jan 31, 2013
  
  b22bad7f Browse Files
- Fix max score in combined xmodule tests · 5eff483c
  Vik Paruchuri committed Jan 31, 2013
  
  5eff483c Browse Files
- Fix key error in open ended child · 524047a1
  Vik Paruchuri committed Jan 31, 2013
  
  524047a1 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes · 01cdc6e7
```
Conflicts:
	common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
```
  Vik Paruchuri committed Jan 31, 2013
  01cdc6e7 Browse Files
- Merge pull request #1398 from MITx/feature/christina/misc2 · aad5015a
```
Fixes date bug (#149).
```
  Don Mitchell committed Jan 31, 2013
  aad5015a Browse Files
- Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs · fbd9a126
```
add exporting of course info
```
  Don Mitchell committed Jan 31, 2013
  fbd9a126 Browse Files
- Merge pull request #1395 from MITx/bug/dhm/mar13 · 5f170d11
```
Remove format field as it's the one for grading type.
```
  Christina Roberts committed Jan 31, 2013
  5f170d11 Browse Files
- Add vendor files to files.json for the cms jasmine tests to work. · c590c24e
  Jay Zoldak committed Jan 31, 2013
  
  c590c24e Browse Files
- Fixes date bug (#149). · b613bdc3
  cahrens committed Jan 31, 2013
  
  b613bdc3 Browse Files
- Meant to add the file here · f257f121
  Don Mitchell committed Jan 31, 2013
  
  f257f121 Browse Files
- Fix keyerror · a6174660
  Vik Paruchuri committed Jan 31, 2013
  
  a6174660 Browse Files
- Remove format field as it's the one for grading type. · 64913636
  Don Mitchell committed Jan 31, 2013
  
  64913636 Browse Files
- Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests · 6fe209b0
```
New tests for OpenEndedGrading
```
  Jay Zoldak committed Jan 31, 2013
  6fe209b0 Browse Files
- Possibly fix self assessment tests · ee06afcb
  Vik Paruchuri committed Jan 31, 2013
  
  ee06afcb Browse Files
- Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs · ab9d30cb
  Chris Dodge committed Jan 31, 2013
  
  ab9d30cb Browse Files
- add testing for course info export. Plus DRY things out a bit · fc57e7af
  Chris Dodge committed Jan 31, 2013
  
  fc57e7af Browse Files
- add exporting of course info · 0d20c192
  Chris Dodge committed Jan 31, 2013
  
  0d20c192 Browse Files
- Create a test framework and make it so that we force a mock backend · 32524727
```
when we don't have an ajax url
```
  Diana Huang committed Jan 31, 2013
  32524727 Browse Files