Commits · 95b813473151d42609ec556b52ad3f5c8610d0d6 · Hsin-Yu Chien / edx-platform-release

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

Admin message