Commits · 38f96b72a158dbc45943e026a6ecc02ff6e167bc · edx / edx-platform · GitLab

20 Aug, 2012 7 commits
- Merge pull request #463 from MITx/feature/kfiedler/courseware-style · 38f96b72
```
Feature/kfiedler/courseware style
```
  thomasxiii committed Aug 20, 2012
  38f96b72 Browse Files
- Removed profile info from Profile page and renamed it to Progress. · 92a293f0
  Bridger Maxwell committed Aug 20, 2012
  
  92a293f0 Browse Files
- Added new button classes · ab28e085
  Kyle Fiedler committed Aug 20, 2012
  
  ab28e085 Browse Files
- removed h2 column · e61b6842
  Kyle Fiedler committed Aug 20, 2012
  
  e61b6842 Browse Files
- Merge pull request #460 from MITx/kimth/multiple-fileupload · 6a05a812
```
Kimth/multiple fileupload
```
  David Ormsbee committed Aug 19, 2012
  6a05a812 Browse Files
- Submission of files through requests.POST depletes the file pointer. Need to rewind for replay · 891797a3
  kimth committed Aug 19, 2012
  
  891797a3 Browse Files
- Limit number of files that can be uploaded at once · 2f63a9b4
  kimth committed Aug 19, 2012
  
  2f63a9b4 Browse Files
19 Aug, 2012 14 commits
- Merge pull request #459 from MITx/feature/bridger/new_wiki · a729e16e
```
Fix broken dependency updates for wiki
```
  David Ormsbee committed Aug 19, 2012
  a729e16e Browse Files
- Use -e in django-wiki requirement · e79d5637
  David Ormsbee committed Aug 19, 2012
  
  e79d5637 Browse Files
- Updated django-wiki and plugin imports. · 24c0b514
  Bridger Maxwell committed Aug 19, 2012
  
  24c0b514 Browse Files
- Merge pull request #452 from MITx/feature/bridger/new_wiki · 6c3b28b5
```
Feature/bridger/new wiki
```
  David Ormsbee committed Aug 19, 2012
  6c3b28b5 Browse Files
- Merge pull request #456 from MITx/kimth/multiple-fileupload · 9c4b1d70
```
Kimth/multiple fileupload
```
  David Ormsbee committed Aug 19, 2012
  9c4b1d70 Browse Files
- Use list comprehension · 20adaa81
  kimth committed Aug 19, 2012
  
  20adaa81 Browse Files
- Default param is None rather than [] · 9b94bb17
  kimth committed Aug 19, 2012
  
  9b94bb17 Browse Files
- Simplify is_list_of_files · e2bca44c
  kimth committed Aug 19, 2012
  
  e2bca44c Browse Files
- Adjust tests to reflect list of file objects, not just file · 52d24320
  kimth committed Aug 19, 2012
  
  52d24320 Browse Files
- Send multiple files to xqueue · f5e60412
  kimth committed Aug 19, 2012
  
  f5e60412 Browse Files
- Send multiple files to xqueue · b2599f07
  kimth committed Aug 19, 2012
  
  b2599f07 Browse Files
- Multiple file submissions · d2cb6458
  kimth committed Aug 19, 2012
  
  d2cb6458 Browse Files
- AJAX permits multiple file upload · d920e718
  kimth committed Aug 19, 2012
  
  d920e718 Browse Files
- Filesubmission template allows multiple file selection · 588444c4
  kimth committed Aug 19, 2012
  
  588444c4 Browse Files
18 Aug, 2012 13 commits
- Merge pull request #455 from MITx/kimth/circuitsim-link-fix · 9aeec690
```
Remove outdated hardcoded url from circuit simulator
```
  ichuang committed Aug 18, 2012
  9aeec690 Browse Files
- Added MathJax to wiki pages. · 1e08164d
  Bridger Maxwell committed Aug 18, 2012
  
  1e08164d Browse Files
- Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. · 0598a471
  Bridger Maxwell committed Aug 18, 2012
  
  0598a471 Browse Files
- More info in comment · 78b3ca05
  kimth committed Aug 18, 2012
  
  78b3ca05 Browse Files
- Remove outdated hardcoded url from circuit simulator · 25d38905
  kimth committed Aug 18, 2012
  
  25d38905 Browse Files
- Added javascript groups to wiki preview modal so circuits show up. · 3fc59b3d
  Bridger Maxwell committed Aug 18, 2012
  
  3fc59b3d Browse Files
- Wiki circuit editors zoom to fit contents. · 55f3a971
  Bridger Maxwell committed Aug 18, 2012
  
  55f3a971 Browse Files
- Got the tests passing! · 361e409d
  Bridger Maxwell committed Aug 18, 2012
  
  361e409d Browse Files
- Fixed wiki circuit editor modal to be a little better styled. · 1470045b
  Bridger Maxwell committed Aug 17, 2012
  
  1470045b Browse Files
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · a4b97c5f
  Bridger Maxwell committed Aug 17, 2012
  
  a4b97c5f Browse Files
- Merge pull request #451 from MITx/feature/kfiedler/courseware-style · 40b49224
```
Added new styles for sequence nav and reset some of the styles for inputs
```
  kimth committed Aug 17, 2012
  40b49224 Browse Files
- Fixed a sizing bug in circuit editor. · 2a84d147
  Bridger Maxwell committed Aug 17, 2012
  
  2a84d147 Browse Files
- Updated CodeMirror modes for better syntax highlighting. · d3962ecd
  Bridger Maxwell committed Aug 17, 2012
  
  d3962ecd Browse Files
17 Aug, 2012 6 commits
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · 0fbfaf61
  Bridger Maxwell committed Aug 17, 2012
  
  0fbfaf61 Browse Files
- Updated django-wiki requirement. · 68f3aabc
  Bridger Maxwell committed Aug 17, 2012
  
  68f3aabc Browse Files
- Added new styles for sequence nav and reset some of the styles for inputs · 8473188f
  Kyle Fiedler committed Aug 17, 2012
  
  8473188f Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 58620ebc
  Bridger Maxwell committed Aug 17, 2012
  
  58620ebc Browse Files
- Added markdown extensions from 6.002x · 93d15d15
  Bridger Maxwell committed Aug 17, 2012
  
  93d15d15 Browse Files
- styled settings page · a2d0ada8
  Tom Giannattasio committed Aug 17, 2012
  
  a2d0ada8 Browse Files