Commits · 6cd2a14b8e91df5426d04b0fa1d2495258185c82 · edx / edx-platform · GitLab

21 Sep, 2012 15 commits
- Merge pull request #753 from MITx/feature/victor/add-request-debug-view · 6cd2a14b
```
add a debug_request view that prints the request.
```
  David Ormsbee committed Sep 21, 2012
  6cd2a14b Browse Files
- add a debug_request view that prints the request. · 8d0cc100
  Victor Shnayder committed Sep 21, 2012
  
  8d0cc100 Browse Files
- Merge pull request #650 from MITx/feature/bridger/course_grading · a4d4a3b0
```
Feature/bridger/course grading
```
  David Ormsbee committed Sep 21, 2012
  a4d4a3b0 Browse Files
- Merge pull request #745 from MITx/feature/lyla/optionresponseformatting · 68fe164b
```
removed line from optioninput field formatting
```
  Tom Giannattasio committed Sep 21, 2012
  68fe164b Browse Files
- Merge pull request #749 from MITx/hotfix/arjun/discussion_trailing_slash · 0ff14d7e
```
Better fix for trailing slash
```
  Ibrahim Awwal committed Sep 21, 2012
  0ff14d7e Browse Files
- Better fix for trailing slash · 8fb62040
  Arjun Singh committed Sep 21, 2012
  
  8fb62040 Browse Files
- Merge pull request #748 from MITx/hotfix/arjun/discussion_trailing_slash · e7e0c2c1
```
New URLs require a trailing slash
```
  Ibrahim Awwal committed Sep 21, 2012
  e7e0c2c1 Browse Files
- New URLs require a trailing slash · 663e38aa
  Arjun Singh committed Sep 21, 2012
  
  663e38aa Browse Files
- Merge pull request #744 from MITx/bug/tomg/collapsible-hint · b799d9b7
```
Bug/tomg/collapsible hint
```
  Calen Pennington committed Sep 21, 2012
  b799d9b7 Browse Files
- Merge pull request #716 from MITx/feature/ibrahim/followed-threads · 1a06efc5
```
Feature/ibrahim/followed threads
```
  arjun810 committed Sep 21, 2012
  1a06efc5 Browse Files
- Remove commented out block and pull some stuff into a function to load the first… · 57d5ba07
```
Remove commented out block and pull some stuff into a function to load the first page of results for a thread query.
```
  Ibrahim Awwal committed Sep 21, 2012
  57d5ba07 Browse Files
- DjDT redirect intercept is annoying, especially for tests, so disable it · 91de5633
  Ibrahim Awwal committed Sep 21, 2012
  
  91de5633 Browse Files
- Merge branch 'master' into feature/ibrahim/followed-threads · 939b927f
```
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
```
  Ibrahim Awwal committed Sep 20, 2012
  939b927f Browse Files
- Merge pull request #747 from MITx/feature/ibrahim/fix-discussion-urls · 40d25acf
```
Match custom static tabs after discussion URLs so that discussion can actually work.
```
  arjun810 committed Sep 20, 2012
  40d25acf Browse Files
- Match custom static tabs after discussion URLs so that discussion can actually work. · 7727e9f2
  Ibrahim Awwal committed Sep 20, 2012
  
  7727e9f2 Browse Files
20 Sep, 2012 25 commits
- removed line from optioninput field - it makes it look like the end of a question · 1dfb7457
  Lyla Fischer committed Sep 20, 2012
  
  1dfb7457 Browse Files
- fixed large collapsible text and triple toggle · 4af134b2
  Tom Giannattasio committed Sep 20, 2012
  
  4af134b2 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading · 68ab1973
```
Conflicts:
	lms/djangoapps/courseware/views.py
```
  Bridger Maxwell committed Sep 20, 2012
  68ab1973 Browse Files
- Removed accidental symlink. · 188eeed3
  Bridger Maxwell committed Sep 20, 2012
  
  188eeed3 Browse Files
- Grading test now tries a weighted problem. · 997c0ee1
  Bridger Maxwell committed Sep 20, 2012
  
  997c0ee1 Browse Files
- Merge pull request #733 from MITx/feature/victor/static-tabs · 26a63850
```
Feature/victor/static tabs
```
  Victor Shnayder committed Sep 20, 2012
  26a63850 Browse Files
- Fixed problem weighting bug. Attribute is on descriptor, not module. · dfa977db
  Bridger Maxwell committed Sep 20, 2012
  
  dfa977db Browse Files
- Added course grading test. · 92171ea5
  Bridger Maxwell committed Sep 20, 2012
  
  92171ea5 Browse Files
- Small cleanup tweaks in grading. · 9ec38176
  Bridger Maxwell committed Sep 20, 2012
  
  9ec38176 Browse Files
- tweaked sound lab styles · 99a009ab
  Tom Giannattasio committed Sep 20, 2012
  
  99a009ab Browse Files
- Added a simple course for testing the grading functions. · 9ce3b83b
  Bridger Maxwell committed Sep 20, 2012
  
  9ce3b83b Browse Files
- Fixed new implementation of abtest's displayable_items. · a43b09c0
  Bridger Maxwell committed Sep 20, 2012
  
  a43b09c0 Browse Files
- broken tabs are important enough to count as an error, not a warning · 621acd20
  Victor Shnayder committed Sep 20, 2012
  
  621acd20 Browse Files
- add some error handling · a19319f7
  Victor Shnayder committed Sep 20, 2012
  
  a19319f7 Browse Files
- Merge pull request #740 from MITx/feature/jarv/add-pkg-config-to-dev-env · fc61a456
```
adding pkg-config
```
  jarv committed Sep 20, 2012
  fc61a456 Browse Files
- adding pkg-config · b2925193
  John Jarvis committed Sep 20, 2012
  
  b2925193 Browse Files
- Merge pull request #736 from MITx/feature/arjun/fix_install · ec0352f0
```
fix ubuntu graphviz lib install
```
  kimth committed Sep 20, 2012
  ec0352f0 Browse Files
- Merge pull request #739 from MITx/feature/ibrahim/unread_count · c6be3ff0
```
Properly puluralize comments tooltip and change "unread" to "new".
```
  arjun810 committed Sep 20, 2012
  c6be3ff0 Browse Files
- Properly puluralize comments tooltip and change "unread" to "new". · d1e8f4c0
  Ibrahim Awwal committed Sep 20, 2012
  
  d1e8f4c0 Browse Files
- Merge pull request #738 from MITx/feature/arjun/unread_count · 2ccff103
```
Show total comments instead of unread only, and use a tooltip to show th...
```
  arjun810 committed Sep 20, 2012
  2ccff103 Browse Files
- Merge pull request #737 from MITx/feature/tomg/discussion-read · 53f524ed
```
darker background for read posts
```
  arjun810 committed Sep 20, 2012
  53f524ed Browse Files
- darker background for read posts · 2b144686
  Tom Giannattasio committed Sep 20, 2012
  
  2b144686 Browse Files
- Show total comments instead of unread only, and use a tooltip to show the unread count. · afdd1134
  Ibrahim Awwal committed Sep 20, 2012
  
  afdd1134 Browse Files
- fix ubuntu graphviz lib install · ed034ff1
  Arjun Singh committed Sep 20, 2012
  
  ed034ff1 Browse Files
- Merge pull request #735 from MITx/feature/arjun/unread_count · d6cff4d5
```
Unread counts + tracking for discussion
```
  Ibrahim Awwal committed Sep 20, 2012
  d6cff4d5 Browse Files