Commits · ba7bd9022b5d0c82a2baac673b4c5769bff6cdf9 · Hsin-Yu Chien / edx-platform-release

Feb 05, 2013
- Replace the correct /course/ urls, rather than /courses/ · ba7bd902
  Calen Pennington authored 12 years ago
  
  ba7bd902
- Pull out missing variable · 0da1467a
  Calen Pennington authored 12 years ago
  
  0da1467a
- Fix unbalanced paren in regex · 88fc2e37
  Calen Pennington authored 12 years ago
  
  88fc2e37
- Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible · 04879a83
  Calen Pennington authored 12 years ago
  
  04879a83
- Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" · b05ead86
  Calen Pennington authored 12 years ago
  
  This reverts commit c4f56620.
  b05ead86
- Merge pull request #1427 from MITx/feature/christina/misc2 · 82b2dc71
  Don Mitchell authored 12 years ago
  
  Do not do finds within the event method. Decreases likelihood of hitting...
  82b2dc71
- Do not do finds within the event method. Decreases likelihood of hitting bug... · 286616e6
  cahrens authored 12 years ago
  
  Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. https://edx.lighthouseapp.com/projects/102637/tickets/153
  286616e6
- Merge pull request #1426 from MITx/debug/dave/sass · ecce3e57
  David Ormsbee authored 12 years ago
  
  Comment out YUI compressor (cause *something* is still causing CSS compression)
  ecce3e57
- Comment out YUI compressor (cause *something* is still causing CSS compression) · 818cd3aa
  David Ormsbee authored 12 years ago
  
  818cd3aa
- Merge pull request #1425 from MITx/feature/ichuang/conditional-module-text-improvement · 2ab3d1b1
  Victor Shnayder authored 12 years ago
  
  for conditional require_attempted display "attempted" instead of "completed"
  2ab3d1b1
- for require_attempted display "attempted" instead of "completed" · 8ff3dde6
  ichuang authored 12 years ago
  
  8ff3dde6
Feb 04, 2013
- Merge pull request #1396 from MITx/feature/victor/randomization · 82afc477
  Victor Shnayder authored 12 years ago
  
  Feature/victor/randomization
  82afc477
- add initial test that only tests the descriptor · b6614f69
  Victor Shnayder authored 12 years ago
  
  b6614f69
- Merge pull request #1420 from MITx/debug/dave/sass · fae51815
  David Ormsbee authored 12 years ago
  
  Force it to do expanded mode, because it's still generating compressed CSS output
  fae51815
- Force it to do expanded mode, because it's still generating compressed CSS output · aeaad6f5
  David Ormsbee authored 12 years ago
  
  aeaad6f5
- Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging · fb777de1
  Diana Huang authored 12 years ago
  
  Feature/vik/peer grading flagging
  fb777de1
- Fix accidental commit of dev.py · 1dab4aba
  Vik Paruchuri authored 12 years ago
  
  1dab4aba
- Fix JS on after event handling · e8803985
  Vik Paruchuri authored 12 years ago
  
  e8803985
- Merge pull request #1419 from MITx/debug/dave/sass · 4999a8e9
  David Ormsbee authored 12 years ago
  
  Remove compressed flag from SASS call in pipeline so we can diff the gen...
  4999a8e9
- Remove compressed flag from SASS call in pipeline so we can diff the generated CSS · 9f634aba
  David Ormsbee authored 12 years ago
  
  9f634aba
- Fix a function call · d89ab000
  Vik Paruchuri authored 12 years ago
  
  d89ab000
- Fix reloading · f019225d
  Vik Paruchuri authored 12 years ago
  
  f019225d
- Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging · eb049bda
  Vik Paruchuri authored 12 years ago
  
  eb049bda
- Address review comments · 7f96fbb3
  Vik Paruchuri authored 12 years ago
  
  7f96fbb3
- Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display · d7570de5
  Victor Shnayder authored 12 years ago
  
  fix bug in conditional - videos were not playing, because a js function changed syntax
  d7570de5
- XModule.loadModules only takes @el as argument now · 0c07f03d
  ichuang authored 12 years ago
  
  0c07f03d
- Merge pull request #1417 from MITx/feature/christina/misc2 · 2306e7c1
  Christina Roberts authored 12 years ago
  
  Try, try again.
  2306e7c1
- Merge pull request #1416 from MITx/feature/dhm/dnd · 43c2acdb
  Christina Roberts authored 12 years ago
  
  Brian's CSS updates.
  43c2acdb
- Try, try again. · aac179f1
  cahrens authored 12 years ago
  
  aac179f1
- Merge pull request #1414 from MITx/feature/victor/showanswer-past-due · 25bede90
  Sarina authored 12 years ago
  
  Feature/victor/showanswer past due
  25bede90
- fix typo, add comment · fe42d8e9
  Victor Shnayder authored 12 years ago
  
  fe42d8e9
- studio - resolved safari/webkit display issue with unit editing window's wrapper background color · ffd585ae
  Brian Talbot authored 12 years ago
  
  ffd585ae
- studio - overview drag and drop: removed unused scss and hid new unit button while dragging · 6ca55b84
  Brian Talbot authored 12 years ago
  
  6ca55b84
- Merge pull request #1413 from MITx/feature/christina/misc2 · 517f756f
  Christina Roberts authored 12 years ago
  
  See if this helps with the tab-changing race condition.
  517f756f
- See if this helps with the tab-changing race condition. · 39479d9e
  cahrens authored 12 years ago
  
  39479d9e
- Merge pull request #1411 from MITx/feature/dhm/dnd · be5dd6d2
  Christina Roberts authored 12 years ago
  
  Attempt to patch the dnd hesitation fixes onto master
  be5dd6d2
- Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2 · 486e747b
  Victor Shnayder authored 12 years ago
  
  Provides "stop" feature via a new "conditional" XModule
  486e747b
- Merge pull request #1412 from MITx/feature/jarv/service-variant-default · 723f47f4
  jarv authored 12 years ago
  
  Defaulting service_variant to a blank string
  723f47f4
- Added comments for unused 2nd arg on generateCheckHoverState · 902cdefe
  Don Mitchell authored 12 years ago
  
  902cdefe
- Defaulting service_variant to a blank string · 7c39e385
  John Jarvis authored 12 years ago
  
  7c39e385