Commits · cdfeeb0cf12b0008cf2457e17f711d7bc430b4b1 · edx / edx-platform · GitLab

19 Aug, 2012 5 commits
- Hid wiki search bar, because it isn't implemented yet. · cdfeeb0c
  Bridger Maxwell committed Aug 19, 2012
  
  cdfeeb0c Browse Files
- Wiki create button now creates article in class wiki (never in a child of a class wiki). · 03288193
  Bridger Maxwell committed Aug 19, 2012
  
  03288193 Browse Files
- Updated to use django-wiki with significantly less sql queries. · 38a96316
  Bridger Maxwell committed Aug 19, 2012
  
  38a96316 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
18 Aug, 2012 10 commits
- 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
- 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 25 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
- finished attachment styles · 1bd790fa
  Tom Giannattasio committed Aug 17, 2012
  
  1bd790fa Browse Files
- added modal functionality for attachments page · c2534742
  Tom Giannattasio committed Aug 17, 2012
  
  c2534742 Browse Files
- added CodeMirror styles for the circuit editor · e47f3ccf
  Tom Giannattasio committed Aug 17, 2012
  
  e47f3ccf Browse Files
- added Code Mirror styles · 63ba133f
  Tom Giannattasio committed Aug 17, 2012
  
  63ba133f Browse Files
- Leave management of services and package installation to puppet · 445ce72b
  Calen Pennington committed Aug 17, 2012
  
  445ce72b Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · af06dd94
  Tom Giannattasio committed Aug 17, 2012
  
  af06dd94 Browse Files
- Updated django-wiki requirement. · 90eeaa05
  Bridger Maxwell committed Aug 17, 2012
  
  90eeaa05 Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 411fcfd0
  Tom Giannattasio committed Aug 17, 2012
  
  411fcfd0 Browse Files
- started tweaking upload interface · 1411c0e0
  Tom Giannattasio committed Aug 17, 2012
  
  1411c0e0 Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · b05bace1
```
Conflicts:
	lms/templates/wiki/base.html
```
  Bridger Maxwell committed Aug 17, 2012
  b05bace1 Browse Files
- started attachments rework · e96a5fcb
  Tom Giannattasio committed Aug 17, 2012
  
  e96a5fcb Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 8595cb24
```
Conflicts:
	lms/templates/wiki/base.html
```
  Bridger Maxwell committed Aug 17, 2012
  8595cb24 Browse Files
- Merge pull request #449 from MITx/feature/dave/wiki_proxy · 656ee847
```
Config changes relating to course server split
```
  jarv committed Aug 17, 2012
  656ee847 Browse Files
- add course-specific askbot URLs for AWS course servers · 83ea5efa
  David Ormsbee committed Aug 17, 2012
  
  83ea5efa Browse Files
- Put in CodeMirror editor with inline circuits. · 6b716c28
  Bridger Maxwell committed Aug 17, 2012
  
  6b716c28 Browse Files
- added additional bootstrap js files · f67a3564
  Tom Giannattasio committed Aug 17, 2012
  
  f67a3564 Browse Files
- Add proxy rule for wiki for local testing of split servers · 9806deee
  David Ormsbee committed Aug 17, 2012
  
  9806deee Browse Files
- started styling attachments page · b5b59781
  Tom Giannattasio committed Aug 17, 2012
  
  b5b59781 Browse Files
- Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change · 53006700
```
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver

merging now so it stops holding up content teams.
```
  ichuang committed Aug 17, 2012
  53006700 Browse Files