Commits · df07dd44d1f4eec2c4c139daa291618de8cff5c1 · edx / edx-platform · GitLab

19 Aug, 2012 19 commits
- shouldn't commit env config · df07dd44
  Rocky Duan committed Aug 19, 2012
  
  df07dd44 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into merge · 0d015b8d
  Rocky Duan committed Aug 19, 2012
  
  0d015b8d Browse Files
- fixed comment retrieval · 2160c78c
  Rocky Duan committed Aug 19, 2012
  
  2160c78c Browse Files
- Merge pull request #452 from MITx/feature/bridger/new_wiki · 2a250fde
```
Feature/bridger/new wiki
```
  David Ormsbee committed Aug 19, 2012
  2a250fde Browse Files
- Merge pull request #456 from MITx/kimth/multiple-fileupload · cf20839b
```
Kimth/multiple fileupload
```
  David Ormsbee committed Aug 19, 2012
  cf20839b Browse Files
- Use list comprehension · 739e5845
  kimth committed Aug 19, 2012
  
  739e5845 Browse Files
- Default param is None rather than [] · b4eaa451
  kimth committed Aug 19, 2012
  
  b4eaa451 Browse Files
- Simplify is_list_of_files · e558684e
  kimth committed Aug 19, 2012
  
  e558684e Browse Files
- Adjust tests to reflect list of file objects, not just file · a665ed8e
  kimth committed Aug 19, 2012
  
  a665ed8e Browse Files
- Send multiple files to xqueue · 99b0c712
  kimth committed Aug 19, 2012
  
  99b0c712 Browse Files
- Send multiple files to xqueue · 6b535bcf
  kimth committed Aug 19, 2012
  
  6b535bcf Browse Files
- Multiple file submissions · 0a63ad8f
  kimth committed Aug 19, 2012
  
  0a63ad8f Browse Files
- AJAX permits multiple file upload · cc6d4757
  kimth committed Aug 19, 2012
  
  cc6d4757 Browse Files
- Filesubmission template allows multiple file selection · 088838cb
  kimth committed Aug 19, 2012
  
  088838cb Browse Files
- major refactor of templates · fe45ae0c
  Rocky Duan committed Aug 19, 2012
  
  fe45ae0c Browse Files
- some refactor · df58ca2c
  Rocky Duan committed Aug 19, 2012
  
  df58ca2c Browse Files
- minor refactoring · c381fb67
  Rocky Duan committed Aug 18, 2012
  
  c381fb67 Browse Files
- refactored code to render ajax content · 6941a560
  Rocky Duan committed Aug 18, 2012
  
  6941a560 Browse Files
- Merge branch 'master' into profile · 03370e95
```
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 18, 2012
  03370e95 Browse Files
18 Aug, 2012 15 commits
- Merge branch 'master' of github.com:MITx/mitx into profile · b0abc62b
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 18, 2012
  b0abc62b Browse Files
- cache setting · f9ede03e
  Rocky Duan committed Aug 18, 2012
  
  f9ede03e Browse Files
- Merge pull request #455 from MITx/kimth/circuitsim-link-fix · be1607b9
```
Remove outdated hardcoded url from circuit simulator
```
  ichuang committed Aug 18, 2012
  be1607b9 Browse Files
- Added MathJax to wiki pages. · c4512faf
  Bridger Maxwell committed Aug 18, 2012
  
  c4512faf Browse Files
- Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. · cecdc34f
  Bridger Maxwell committed Aug 18, 2012
  
  cecdc34f Browse Files
- More info in comment · 097a5dd2
  kimth committed Aug 18, 2012
  
  097a5dd2 Browse Files
- Remove outdated hardcoded url from circuit simulator · b7f3ea00
  kimth committed Aug 18, 2012
  
  b7f3ea00 Browse Files
- Added javascript groups to wiki preview modal so circuits show up. · 9854bd13
  Bridger Maxwell committed Aug 18, 2012
  
  9854bd13 Browse Files
- Wiki circuit editors zoom to fit contents. · 8e213c81
  Bridger Maxwell committed Aug 18, 2012
  
  8e213c81 Browse Files
- Got the tests passing! · 4e8297d1
  Bridger Maxwell committed Aug 18, 2012
  
  4e8297d1 Browse Files
- Fixed wiki circuit editor modal to be a little better styled. · 3fc7e15a
  Bridger Maxwell committed Aug 17, 2012
  
  3fc7e15a Browse Files
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · af6e0a80
  Bridger Maxwell committed Aug 17, 2012
  
  af6e0a80 Browse Files
- Merge pull request #451 from MITx/feature/kfiedler/courseware-style · 2a314fee
```
Added new styles for sequence nav and reset some of the styles for inputs
```
  kimth committed Aug 17, 2012
  2a314fee Browse Files
- Fixed a sizing bug in circuit editor. · c8d4b3bc
  Bridger Maxwell committed Aug 17, 2012
  
  c8d4b3bc Browse Files
- Updated CodeMirror modes for better syntax highlighting. · 6a09da8d
  Bridger Maxwell committed Aug 17, 2012
  
  6a09da8d Browse Files
17 Aug, 2012 6 commits
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · ff66197e
  Bridger Maxwell committed Aug 17, 2012
  
  ff66197e Browse Files
- Updated django-wiki requirement. · 7a6a93c4
  Bridger Maxwell committed Aug 17, 2012
  
  7a6a93c4 Browse Files
- Added new styles for sequence nav and reset some of the styles for inputs · 4c3e1c6c
  Kyle Fiedler committed Aug 17, 2012
  
  4c3e1c6c Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 4c21dfbc
  Bridger Maxwell committed Aug 17, 2012
  
  4c21dfbc Browse Files
- Added markdown extensions from 6.002x · a2b19322
  Bridger Maxwell committed Aug 17, 2012
  
  a2b19322 Browse Files
- styled settings page · ca27804e
  Tom Giannattasio committed Aug 17, 2012
  
  ca27804e Browse Files