Commits · 056eebf755b61843936134204bc8f08a518c80e6 · edx / edx-platform · GitLab

23 Sep, 2012 5 commits
- Merge pull request #756 from MITx/feature/arjun/minor_style_changes · 056eebf7
```
Feature/arjun/minor style changes
```
  kimth committed Sep 22, 2012
  056eebf7 Browse Files
- Add slides nowrap · 38c0a034
  Arjun Singh committed Sep 22, 2012
  
  38c0a034 Browse Files
- Fix syllabus in static_tab_wrapper; don't wrap slides · eca21e7c
  Arjun Singh committed Sep 22, 2012
  
  eca21e7c Browse Files
- Merge pull request #755 from MITx/feature/arjun/188_styling · 31ff5f28
```
Some 188-specific styling + default styling for static tabs
```
  kimth committed Sep 22, 2012
  31ff5f28 Browse Files
- more 188 styling · 015328ed
  Arjun Singh committed Sep 22, 2012
  
  015328ed Browse Files
22 Sep, 2012 1 commit
- Some 188-specific styling + default styling for static tabs · 987d8ea4
  Arjun Singh committed Sep 22, 2012
  
  987d8ea4 Browse Files
21 Sep, 2012 21 commits
- Fix broken submission in firefox · ae06f13b
```
- apparently have to define functions before using them...
```
  Victor Shnayder committed Sep 21, 2012
  ae06f13b Browse Files
- Merge pull request #754 from MITx/feature/victor/add-request-debug-view · 0a4a523e
```
Add more info to debug view
```
  Victor Shnayder committed Sep 21, 2012
  0a4a523e Browse Files
- more info · 450a2022
  Victor Shnayder committed Sep 21, 2012
  
  450a2022 Browse Files
- Merge pull request #752 from MITx/feature/victor/less-greedy-urls · b4ae3abe
```
Make static tab url pattern less greedy
```
  David Ormsbee committed Sep 21, 2012
  b4ae3abe Browse Files
- 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
- add a trailing slash to avoid conflicts with slash-appending redirects · cc13b61e
  Victor Shnayder committed Sep 21, 2012
  
  cc13b61e Browse Files
- Make static tab url pattern less greedy · 8a570933
```
* should fix links without trailing slash
```
  Victor Shnayder committed Sep 21, 2012
  8a570933 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 13 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