Commits · 43ef4f6482e61ffa0e27f18fc3a7bee0e92c8e17 · edx / edx-platform · GitLab

23 Aug, 2012 7 commits
- fixed recent threads & tags links · 43ef4f64
  Rocky Duan committed Aug 22, 2012
  
  43ef4f64 Browse Files
- Merge pull request #511 from MITx/feature/dave/forum_fixes · 99614ea3
```
Forum refactoring/fixes
```
  David Ormsbee committed Aug 22, 2012
  99614ea3 Browse Files
- Merge branch 'master' into feature/dave/forum_fixes · baa6eadf
  David Ormsbee committed Aug 22, 2012
  
  baa6eadf Browse Files
- Merge pull request #509 from MITx/feature/victor/better-courseware-errors · 3fa52057
```
Feature/victor/better courseware errors
```
  David Ormsbee committed Aug 22, 2012
  3fa52057 Browse Files
- Allow error-template-rendering errors to propagate to top-level 500 handler · 1b25433a
```
* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
```
  Victor Shnayder committed Aug 22, 2012
  1b25433a Browse Files
- Fix undefined variables if LMS_MIGRATION was off · 44ee0200
  Victor Shnayder committed Aug 22, 2012
  
  44ee0200 Browse Files
- Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes · aeee2791
```
Conflicts:
	lms/lib/comment_client/utils.py
	lms/templates/discussion/mustache/_content.mustache
```
  David Ormsbee committed Aug 22, 2012
  aeee2791 Browse Files
22 Aug, 2012 33 commits
- Tiny fix to handle when data_or_params isn't passed in · 2e39131b
  David Ormsbee committed Aug 22, 2012
  
  2e39131b Browse Files
- moved some stuff · 952c9d56
  Rocky Duan committed Aug 22, 2012
  
  952c9d56 Browse Files
- Merge branch 'merge' · ee217518
  Rocky Duan committed Aug 22, 2012
  
  ee217518 Browse Files
- removed unnecessary file · 631aaaf5
  Rocky Duan committed Aug 22, 2012
  
  631aaaf5 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 05d28200
  Rocky Duan committed Aug 22, 2012
  
  05d28200 Browse Files
- Profiles and permalinks both appear to be broken, so disabling both for now · ebf971fa
  David Ormsbee committed Aug 22, 2012
  
  ebf971fa Browse Files
- Merge pull request #507 from MITx/kimth/fix_syllabus · 3913427c
```
Quick workaround on syllabus_present that broke staging
```
  David Ormsbee committed Aug 22, 2012
  3913427c Browse Files
- Quick workaround on syllabus_present that broke staging · 0d689b31
  kimth committed Aug 22, 2012
  
  0d689b31 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 908a5c5d
  Rocky Duan committed Aug 22, 2012
  
  908a5c5d Browse Files
- Merge pull request #506 from MITx/feature/tomg/fall-design · ca36fb67
```
additional firefox bug
```
  David Ormsbee committed Aug 22, 2012
  ca36fb67 Browse Files
- fixed autosubscribe · 3cbaba19
  Rocky Duan committed Aug 22, 2012
  
  3cbaba19 Browse Files
- Merge branch 'master' into feature/tomg/fall-design · c1befd5f
  Tom Giannattasio committed Aug 22, 2012
  
  c1befd5f Browse Files
- fixed tutorial sequence nav bug · 1a7b5b85
  Tom Giannattasio committed Aug 22, 2012
  
  1a7b5b85 Browse Files
- make inline page working · 3b76fe16
  Rocky Duan committed Aug 22, 2012
  
  3b76fe16 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 951fb063
```
Conflicts:
	lms/envs/dev.py
```
  Rocky Duan committed Aug 22, 2012
  951fb063 Browse Files
- Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack · fafbe416
```
Enrollment hack for allowing Berkeley to add their students.
```
  David Ormsbee committed Aug 22, 2012
  fafbe416 Browse Files
- Merge pull request #505 from MITx/feature/tomg/fall-design · e206bf2f
```
Feature/tomg/fall design
```
  Calen Pennington committed Aug 22, 2012
  e206bf2f Browse Files
- Fixed minor issues (removed two unnecessary lines) · 69a3ea63
  Piotr Mitros committed Aug 22, 2012
  
  69a3ea63 Browse Files
- Merge pull request #501 from MITx/kimth/autodisable-syllabus · 3b24ae10
```
Dynamically disable syllabus per-course
```
  David Ormsbee committed Aug 22, 2012
  3b24ae10 Browse Files
- Added missing file · 3777cd2f
  Piotr Mitros committed Aug 22, 2012
  
  3777cd2f Browse Files
- Merge pull request #504 from MITx/feature/bridger/new_wiki · c86ee73b
```
Feature/bridger/new wiki
```
  David Ormsbee committed Aug 22, 2012
  c86ee73b Browse Files
- Merge branch 'master' into feature/tomg/fall-design · a05cf054
  Tom Giannattasio committed Aug 22, 2012
  
  a05cf054 Browse Files
- fixed firefox outline bugs · 2c827c46
  Tom Giannattasio committed Aug 22, 2012
  
  2c827c46 Browse Files
- Merge pull request #503 from MITx/feature/ichuang/fix-staff-debug · e093a365
```
staff debug view currently presents an empty window - this fixes
```
  Calen Pennington committed Aug 22, 2012
  e093a365 Browse Files
- We use django-wiki's built-in wikilinks markdown extension. They were clashing. · a694d103
  Bridger Maxwell committed Aug 22, 2012
  
  a694d103 Browse Files
- fix staff debug view, and also add new source_link · 7c242939
  ike committed Aug 22, 2012
  
  7c242939 Browse Files
- Enrollment hack for allowing Berkeley to add their students. · a301abd5
  Piotr Mitros committed Aug 22, 2012
  
  a301abd5 Browse Files
- Delete page · cca5fe2f
  Kyle Fiedler committed Aug 22, 2012
  
  cca5fe2f Browse Files
- Added delete page and padding and hid th on overflow · f4f8b7bf
  Kyle Fiedler committed Aug 22, 2012
  
  f4f8b7bf Browse Files
- Merge master · f4660771
  kimth committed Aug 22, 2012
  
  f4660771 Browse Files
- Remove ENABLE_SYLLABUS flag from envs/common · 64788a73
  kimth committed Aug 22, 2012
  
  64788a73 Browse Files
- Add more excludes to rakefile · 5b7ae1a9
  Calen Pennington committed Aug 22, 2012
  
  5b7ae1a9 Browse Files
- Dynamically disable syllabus per-course · 960cf579
  kimth committed Aug 22, 2012
  
  960cf579 Browse Files