Commits · 2da3eba425ab8baabe642245bb04f5b91c9b93f1 · edx / edx-platform · GitLab

07 Aug, 2012 13 commits
- Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation · 2da3eba4
  Rocky Duan committed Aug 07, 2012
  
  2da3eba4 Browse Files
- to make it appear at least normal.. · 84ffc26c
  Rocky Duan committed Aug 07, 2012
  
  84ffc26c Browse Files
- Merge branch 'brittany' of github.com:dementrock/mitx · cf463698
  Rocky Duan committed Aug 07, 2012
  
  cf463698 Browse Files
- search for similar posts without any styling.. · 019746ed
  Rocky Duan committed Aug 07, 2012
  
  019746ed Browse Files
- simple blank slate · 123b60d2
  Rocky Duan committed Aug 06, 2012
  
  123b60d2 Browse Files
- make behavior consistent with normal mathjax · f5fdcb59
  Rocky Duan committed Aug 06, 2012
  
  f5fdcb59 Browse Files
- fixed escape recovering bug · 709c3c71
  Rocky Duan committed Aug 06, 2012
  
  709c3c71 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · ff9a69ba
```
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 06, 2012
  ff9a69ba Browse Files
- sort by activity · 085592e5
  Rocky Duan committed Aug 06, 2012
  
  085592e5 Browse Files
- fixed display mode single character bug · 38113382
  Rocky Duan committed Aug 06, 2012
  
  38113382 Browse Files
- fixed multiple renderer bug · 9e86ff62
  Rocky Duan committed Aug 06, 2012
  
  9e86ff62 Browse Files
- use raw title · 2d8be9d6
  Rocky Duan committed Aug 06, 2012
  
  2d8be9d6 Browse Files
- highlighting while skipping code and mathjax (ugly and slow solution) · a9280e88
  Rocky Duan committed Aug 06, 2012
  
  a9280e88 Browse Files
06 Aug, 2012 27 commits
- Merge pull request #352 from MITx/kimth/lms-coderesponse · 79c0104a
```
Don't contact queueing server on Django load
```
  kimth committed Aug 06, 2012
  79c0104a Browse Files
- Don't contact queueing server on Django load · 8dbbd141
  kimth committed Aug 06, 2012
  
  8dbbd141 Browse Files
- Merge pull request #351 from MITx/edit-link-fix · bf26bcac
```
Edit link fix
```
  ichuang committed Aug 06, 2012
  bf26bcac Browse Files
- Merge branch 'master' of github.com:MITx/mitx · b783962f
  ichuang committed Aug 06, 2012
  
  b783962f Browse Files
- Merge pull request #348 from MITx/kimth/lms-coderesponse · 46a3003d
```
merging this now because the it looks ok, and it fixes some bugs introduced by the last xserver merge, which are preventing the LMS from running in the current version of master.
```
  ichuang committed Aug 06, 2012
  46a3003d Browse Files
- added permanent link for comments · 584077f4
  Mike Chen committed Aug 06, 2012
  
  584077f4 Browse Files
- Merge branch 'kimth/lms-coderesponse' of github.com:MITx/mitx · 47000235
  ichuang committed Aug 06, 2012
  
  47000235 Browse Files
- small fix to xmodule_modifiers to fix case when filename missing · d8c02de9
  ichuang committed Aug 06, 2012
  
  d8c02de9 Browse Files
- added permanent link for threads · 112f8836
  Mike Chen committed Aug 06, 2012
  
  112f8836 Browse Files
- new post styles · 9c00284e
  Brittany Cheng committed Aug 06, 2012
  
  9c00284e Browse Files
- Handle xreply parsing errors more gracefully · 3f38046e
  kimth committed Aug 06, 2012
  
  3f38046e Browse Files
- Handle network errors more gracefully · d2e54d83
  kimth committed Aug 06, 2012
  
  d2e54d83 Browse Files
- show searched tag · 4167fc88
  Mike Chen committed Aug 06, 2012
  
  4167fc88 Browse Files
- Queue submission reports queue length · f5d2804f
  kimth committed Aug 06, 2012
  
  f5d2804f Browse Files
- Make CodeMirror more pleasant for 6.00 · 5bff26b9
  kimth committed Aug 06, 2012
  
  5bff26b9 Browse Files
- Update ModuleSystem · 8d07edee
  kimth committed Aug 06, 2012
  
  8d07edee Browse Files
- Merge master · 85744ccc
  kimth committed Aug 06, 2012
  
  85744ccc Browse Files
- Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation · 4930df48
  Mike Chen committed Aug 06, 2012
  
  4930df48 Browse Files
- merged brittany's branch & fixed stuff · 1ba76e1d
  Rocky Duan committed Aug 06, 2012
  
  1ba76e1d Browse Files
- Xqueue interface is embedded in ModuleSystem · d55b8271
  kimth committed Aug 06, 2012
  
  d55b8271 Browse Files
- added delete link · 50616629
  Mike Chen committed Aug 06, 2012
  
  50616629 Browse Files
- show endorsed checkmark based on permissions · acd2937d
  Mike Chen committed Aug 06, 2012
  
  acd2937d Browse Files
- Refactor list of inputs in ajax · 144ac8c6
  kimth committed Aug 06, 2012
  
  144ac8c6 Browse Files
- Merge branch 'discussion2' of github.com:dementrock/mitx · bb453f47
  Rocky Duan committed Aug 06, 2012
  
  bb453f47 Browse Files
- search highlighting · a75b5eb2
  Rocky Duan committed Aug 06, 2012
  
  a75b5eb2 Browse Files
- Merge pull request #340 from MITx/kimth/lms-coderesponse · bb677da7
```
Kimth/lms coderesponse
```
  Calen Pennington committed Aug 06, 2012
  bb677da7 Browse Files
- use permissions to check if one can edit or relp · 81fbe35e
  Mike Chen committed Aug 06, 2012
  
  81fbe35e Browse Files