Commits · d9219c608610f123b4c345b170e3676194c4dea8 · edx / edx-platform

18 Sep, 2012 1 commit

Custom tabs · d9219c60

* specify in tabs list in course policy
  - active page tracking now done in tabs.py
  - properly handle the fact that there may be multiple textbooks

* Still need:
  - wiki pages
  - (if that's delayed, special-case syllabus support)

committed Sep 18, 2012

d9219c60 Browse Files

17 Sep, 2012 1 commit
- Merge pull request #646 from MITx/feature/dave/disable_query_count · 5fbbd0dd
```
Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py ...
```
  David Ormsbee committed Sep 17, 2012
  5fbbd0dd Browse Files
16 Sep, 2012 14 commits
- Merge pull request #703 from MITx/kimth/tiny-detailed-soln-style-fix · f43c485d
```
Tiny fix to style
```
  kimth committed Sep 16, 2012
  f43c485d Browse Files
- Tiny fix to style · 9e01b51f
  kimth committed Sep 16, 2012
  
  9e01b51f Browse Files
- Merge pull request #699 from MITx/kimth/remember-caption · 0e1a56d9
```
Kimth/remember caption
```
  arjun810 committed Sep 16, 2012
  0e1a56d9 Browse Files
- Merge pull request #702 from MITx/kimth/fix-dynamath · b681e2bd
```
Escape quotations, lt/gt, ampersand
```
  arjun810 committed Sep 16, 2012
  b681e2bd Browse Files
- Escape quotations, lt/gt, ampersand · 1dfd222b
  kimth committed Sep 16, 2012
  
  1dfd222b Browse Files
- Merge pull request #701 from MITx/kimth/solution-style · 9b6007fc
```
Trivial fix to detailed-solution style
```
  kimth committed Sep 16, 2012
  9b6007fc Browse Files
- Trivial fix to detailed-solution style · 44d5bfa9
  kimth committed Sep 16, 2012
  
  44d5bfa9 Browse Files
- Merge pull request #700 from MITx/kimth/H1P1-debug · 86217379
```
Reset CapaProblem when state HTML is corrupt
```
  David Ormsbee committed Sep 15, 2012
  86217379 Browse Files
- Make broken problem error a bit scarier and fix typo in message · 7682663e
  Arjun Singh committed Sep 15, 2012
  
  7682663e Browse Files
- Change wording of warning slightly · 2c239f87
  kimth committed Sep 16, 2012
  
  2c239f87 Browse Files
- Add basic styles · f5d6f080
  kimth committed Sep 16, 2012
  
  f5d6f080 Browse Files
- Add TODO comment · eac80378
  kimth committed Sep 16, 2012
  
  eac80378 Browse Files
- Reveal student input at state of problem reset back to student · 827e211a
  kimth committed Sep 16, 2012
  
  827e211a Browse Files
- Reset CapaProblem when state HTML is corrupt · 1a02cfec
  kimth committed Sep 15, 2012
  
  1a02cfec Browse Files
15 Sep, 2012 18 commits
- Remove extra line · 68e07011
  kimth committed Sep 15, 2012
  
  68e07011 Browse Files
- Write setter, toggle uses setter · 439ca1dd
  kimth committed Sep 15, 2012
  
  439ca1dd Browse Files
- Respect object boundaries · 1625125e
  kimth committed Sep 15, 2012
  
  1625125e Browse Files
- Merge branch 'master' into kimth/remember-caption · c0310200
  kimth committed Sep 15, 2012
  
  c0310200 Browse Files
- Merge pull request #656 from MITx/kimth/fix-dynamath-6002x · f1349eea
```
Kimth/fix dynamath 6002x
```
  David Ormsbee committed Sep 15, 2012
  f1349eea Browse Files
- Merge pull request #697 from MITx/feature/arjun/run_specific_syllabi · b06aafd5
```
Try and find a run-specific syllabus before loading a course-specific syllabus
```
  David Ormsbee committed Sep 15, 2012
  b06aafd5 Browse Files
- Merge pull request #698 from MITx/feature/arjun/new-discussions · 53191d32
```
New Discussions
```
  David Ormsbee committed Sep 15, 2012
  53191d32 Browse Files
- Try and find a run-specific syllabus before loading a course-specific syllabus · 08464725
  Arjun Singh committed Sep 15, 2012
  
  08464725 Browse Files
- blockquotes may be fixed · 2ee41ebf
  Arjun Singh committed Sep 15, 2012
  
  2ee41ebf Browse Files
- Merge whitespace fix · 3b13013e
  Arjun Singh committed Sep 15, 2012
  
  3b13013e Browse Files
- fix up whitespace causing weirdness in inline response comment rendering · 4efe1135
  Arjun Singh committed Sep 15, 2012
  
  4efe1135 Browse Files
- Hopefully fix code formatting showing up on comments? But it doesn't seem to happen everywhere... · c47f0ffb
  Ibrahim Awwal committed Sep 15, 2012
  
  c47f0ffb Browse Files
- Fixes the one broken thread in prod; it had no lettters in its ID, so the id was… · 7c86f324
```
Fixes the one broken thread in prod; it had no lettters in its ID, so the id was being cast to a number.
```
  Arjun Singh committed Sep 14, 2012
  7c86f324 Browse Files
- Support legacy anonymity · b5351cc5
  Arjun Singh committed Sep 14, 2012
  
  b5351cc5 Browse Files
- Discussioninfo needs to be multicourse-friendly.. · 033ce7ef
  Arjun Singh committed Sep 14, 2012
  
  033ce7ef Browse Files
- Ensure that ability is present when showing endorse button · 6d753ae3
  Arjun Singh committed Sep 14, 2012
  
  6d753ae3 Browse Files
- Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into… · 3e241182
```
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
```
  Rocky Duan committed Sep 14, 2012
  3e241182 Browse Files
- for students, only display endorse icon if endorsed · 9c19f64c
  Rocky Duan committed Sep 14, 2012
  
  9c19f64c Browse Files
14 Sep, 2012 6 commits
- Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into… · aa615691
```
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
```
  Arjun Singh committed Sep 14, 2012
  aa615691 Browse Files
- fix font colors · 84d2ebf6
  Arjun Singh committed Sep 14, 2012
  
  84d2ebf6 Browse Files
- Merge pull request #696 from MITx/feature/dave/new-discussions · 3ee0f39b
```
Add AWS storage bucket name for S3 to make file uploads work
```
  David Ormsbee committed Sep 14, 2012
  3ee0f39b Browse Files
- Tooltips on follow and vote. · 17c3dd91
  Ibrahim Awwal committed Sep 14, 2012
  
  17c3dd91 Browse Files
- Add AWS storage bucket name for S3 to make file uploads work · 239e6e8c
  David Ormsbee committed Sep 14, 2012
  
  239e6e8c Browse Files
- fix deep comment links · b2c88575
  Arjun Singh committed Sep 14, 2012
  
  b2c88575 Browse Files