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

Aug 01, 2012
- updating prod-requirements · a68cb545
  John Jarvis authored 12 years ago
  
  a68cb545
- Merge branch 'master' of github.com:MITx/mitx into jarv/prod-requirements · 04f82b7b
  John Jarvis authored 12 years ago
  
  04f82b7b
- Merge pull request #331 from MITx/feature/victor/xml-verify · 7350243d
  Calen Pennington authored 12 years ago
  
  add back-compat code to customtag
  7350243d
- add back-compat code to customtag · ea26c25c
  Victor Shnayder authored 12 years ago
  
  * apparently 6002x is using the impl-as-child structure already.
  ea26c25c
- Merge pull request #326 from MITx/feature/victor/xml-verify · 3b34d842
  Calen Pennington authored 12 years ago
  
  Feature/victor/xml verify
  3b34d842
- Record warning on bad html files · 7fb831a2
  Victor Shnayder authored 12 years ago
  
  7fb831a2
- Prettier error display · 05c22c49
  Victor Shnayder authored 12 years ago
  
  * Log formatted traceback string instead of exc_info tuple itself * display as a list
  05c22c49
- Import error cleanup · 32253510
  Victor Shnayder authored 12 years ago
  
  * call error tracker when needed * remove duplicate logging--just add info and re-raise * xml modulestore uses error tracker to capture load errors * add unstyled list of import errors to courseware homepage!
  32253510
- fixed args in call to add_histogram · 463b7584
  Victor Shnayder authored 12 years ago
  
  463b7584
- fixed docstring for customtag · 740c9b7d
  Victor Shnayder authored 12 years ago
  
  740c9b7d
- Turn error_handlers into error_trackers · 0b67d1c4
  Victor Shnayder authored 12 years ago
  
  * simplify logic--tracker just tracks errors. Trackers should not raise, and are not be responsible for logging. * adapted code to use trackers. * Started cleanup of error handling code: - if need to add info and re-raise, just do that. No logging. - if working around a problem, log and track as needed.
  0b67d1c4
- save LazyLoadingDict in case we do want it later · 009bd230
  Victor Shnayder authored 12 years ago
  
  009bd230
- definition and metadata no longer lazy-loaded · 58543bd8
  Victor Shnayder authored 12 years ago
  
  * get rid of dump to json * formatting
  58543bd8
- make cms users look like staff by default · 119ab639
  Victor Shnayder authored 12 years ago
  
  * so they get the staff view of problems * does NOT actually set User.is_staff
  119ab639
- add template I forgot · bc14441a
  Victor Shnayder authored 12 years ago
  
  bc14441a
- Make courseware index view more bulletproof · e2e52445
  Victor Shnayder authored 12 years ago
  
  e2e52445
- Rename MalformedDescriptor to ErrorDescriptor · c0cdff70
  Victor Shnayder authored 12 years ago
  
  * change references and tests * add staff/non-staff display * added is_staff to ModuleSystem
  c0cdff70
- local variable naming tweak · 707551b0
  Victor Shnayder authored 12 years ago
  
  707551b0
- Address minor comments in #313 · 0edc40de
  Victor Shnayder authored 12 years ago
  
  0edc40de
- Move path_to_location out of mongo.py · 0ae434cc
  Victor Shnayder authored 12 years ago
  
  * also bugfix for load_definition in html_module * a bit of refactoring of Location checking code in mongo.py
  0ae434cc
- Fix html file handling. · ed35cefa
  Victor Shnayder authored 12 years ago
  
  * html files are now stored as follows: If the html file is valid xml, store as html/stuff.xml If it's not, store as html/stuff.xml, which contains <html meta1="..." filename="stuff.html">, and html/stuff.html, which actually contains the contents. Warn if the contents are not parseable with lxml's html parser, but don't error. * for parseable html, strip out the html tag when storing, so that it isn't rendered into the middle of a page * lots of backcompat to deal with paths. Can go away soon. * fix output ordering in clean_xml
  ed35cefa
- make CACHE_TIMEOUT messages go away · 46775386
  Victor Shnayder authored 12 years ago
  
  46775386
- Remove malformed tags when contents aren't malformed anymore. · d750d945
  Victor Shnayder authored 12 years ago
  
  d750d945
- remove some debugging messages · c53ed6a2
  Victor Shnayder authored 12 years ago
  
  c53ed6a2
- add message to import command · 10054e95
  Victor Shnayder authored 12 years ago
  
  10054e95
- Add roundtrip test for malformed module · 0d83d2e6
  Victor Shnayder authored 12 years ago
  
  * also fix error message in backcompat_module
  0d83d2e6
- Make the malformed descriptor import properly · 53608922
  Victor Shnayder authored 12 years ago
  
  * Also get rid of lazy loading of metadata and definition
  53608922
- Add a fallback MalformedDescriptor · ef6da22a
  Victor Shnayder authored 12 years ago
  
  * when things don't load normally, use this * separate raw editing functionality into EditingDescriptor * raw descriptor just enforces that xml is valid * add a MalformedDescriptor that just saves a string * Fallback to it on import.
  ef6da22a
- Add kwargs back to DescriptorSystem init()s · 4e6a9b0d
  Victor Shnayder authored 12 years ago
  
  * allow future expansion without breaking interface.
  4e6a9b0d
- Merge pull request #327 from MITx/fix-beautifulsoup4 · 0bfcefd2
  Calen Pennington authored 12 years ago
  
  djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4
  0bfcefd2
- Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading · ef8a211b
  Calen Pennington authored 12 years ago
  
  Got profile page working again.
  ef8a211b
- Got profile page working again. The grader for each course is now defined in... · ae3da772
  Bridger Maxwell authored 12 years ago
  
  Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
  ae3da772
- Merge pull request #328 from MITx/jarv/dev-script-updates · a2e1409d
  jarv authored 12 years ago
  
  Jarv/dev script updates
  a2e1409d
- trailing whitespace · 94c19059
  John Jarvis authored 12 years ago
  
  94c19059
- removing matplotlib from requirements.txt · 71898e48
  John Jarvis authored 12 years ago
  
  71898e48
- sanity checking /usr/local, updating coffee script install location, old location no longer works · 8c1bb0ca
  John Jarvis authored 12 years ago
  
  8c1bb0ca
- Merge pull request #323 from MITx/kimth/lms-coderesponse · b9773b5d
  ichuang authored 12 years ago
  
  Kimth/lms coderesponse
  b9773b5d
- djangoapps/student/views.py now uses soup.getText, which needs beautifulsoup4 · 381d2475
  ichuang authored 12 years ago
  
  381d2475
Jul 31, 2012
- Merge pull request #324 from MITx/jarv/dev-script-updates · f0999281
  jarv authored 12 years ago
  
  Jarv/dev script updates
  f0999281
- Merge branch 'master' of github.com:MITx/mitx into jarv/dev-script-updates · b08ea47b
  John Jarvis authored 12 years ago
  
  b08ea47b