Commits · 24c0b5145d8d2d3e9080d427574dbf18ee60c8db · Hsin-Yu Chien / edx-platform-release · GitLab

Snippets Groups Projects

Aug 19, 2012
- Updated django-wiki and plugin imports. · 24c0b514
  Bridger Maxwell authored 12 years ago
  
  24c0b514
Aug 18, 2012
- Added MathJax to wiki pages. · 1e08164d
  Bridger Maxwell authored 12 years ago
  
  1e08164d
- Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. · 0598a471
  Bridger Maxwell authored 12 years ago
  
  0598a471
- Added javascript groups to wiki preview modal so circuits show up. · 3fc59b3d
  Bridger Maxwell authored 12 years ago
  
  3fc59b3d
- Wiki circuit editors zoom to fit contents. · 55f3a971
  Bridger Maxwell authored 12 years ago
  
  55f3a971
- Got the tests passing! · 361e409d
  Bridger Maxwell authored 12 years ago
  
  361e409d
- Fixed wiki circuit editor modal to be a little better styled. · 1470045b
  Bridger Maxwell authored 12 years ago
  
  1470045b
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · a4b97c5f
  Bridger Maxwell authored 12 years ago
  
  a4b97c5f
- Merge pull request #451 from MITx/feature/kfiedler/courseware-style · 40b49224
  kimth authored 12 years ago
```
Added new styles for sequence nav and reset some of the styles for inputs
```
  40b49224
- Fixed a sizing bug in circuit editor. · 2a84d147
  Bridger Maxwell authored 12 years ago
  
  2a84d147
- Updated CodeMirror modes for better syntax highlighting. · d3962ecd
  Bridger Maxwell authored 12 years ago
  
  d3962ecd
Aug 17, 2012
- Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki · 0fbfaf61
  Bridger Maxwell authored 12 years ago
  
  0fbfaf61
- Updated django-wiki requirement. · 68f3aabc
  Bridger Maxwell authored 12 years ago
  
  68f3aabc
- Added new styles for sequence nav and reset some of the styles for inputs · 8473188f
  Kyle Fiedler authored 12 years ago
  
  8473188f
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 58620ebc
  Bridger Maxwell authored 12 years ago
  
  58620ebc
- Added markdown extensions from 6.002x · 93d15d15
  Bridger Maxwell authored 12 years ago
  
  93d15d15
- styled settings page · a2d0ada8
  Tom Giannattasio authored 12 years ago
  
  a2d0ada8
- finished attachment styles · 1bd790fa
  Tom Giannattasio authored 12 years ago
  
  1bd790fa
- added modal functionality for attachments page · c2534742
  Tom Giannattasio authored 12 years ago
  
  c2534742
- added CodeMirror styles for the circuit editor · e47f3ccf
  Tom Giannattasio authored 12 years ago
  
  e47f3ccf
- added Code Mirror styles · 63ba133f
  Tom Giannattasio authored 12 years ago
  
  63ba133f
- Leave management of services and package installation to puppet · 445ce72b
  Calen Pennington authored 12 years ago
  
  445ce72b
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · af06dd94
  Tom Giannattasio authored 12 years ago
  
  af06dd94
- Updated django-wiki requirement. · 90eeaa05
  Bridger Maxwell authored 12 years ago
  
  90eeaa05
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 411fcfd0
  Tom Giannattasio authored 12 years ago
  
  411fcfd0
- started tweaking upload interface · 1411c0e0
  Tom Giannattasio authored 12 years ago
  
  1411c0e0
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · b05bace1
  Bridger Maxwell authored 12 years ago
```
Conflicts:
	lms/templates/wiki/base.html
```
  b05bace1
- started attachments rework · e96a5fcb
  Tom Giannattasio authored 12 years ago
  
  e96a5fcb
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 8595cb24
  Bridger Maxwell authored 12 years ago
```
Conflicts:
	lms/templates/wiki/base.html
```
  8595cb24
- Merge pull request #449 from MITx/feature/dave/wiki_proxy · 656ee847
  jarv authored 12 years ago
```
Config changes relating to course server split
```
  656ee847
- add course-specific askbot URLs for AWS course servers · 83ea5efa
  David Ormsbee authored 12 years ago
  
  83ea5efa
- Put in CodeMirror editor with inline circuits. · 6b716c28
  Bridger Maxwell authored 12 years ago
  
  6b716c28
- added additional bootstrap js files · f67a3564
  Tom Giannattasio authored 12 years ago
  
  f67a3564
- Add proxy rule for wiki for local testing of split servers · 9806deee
  David Ormsbee authored 12 years ago
  
  9806deee
- started styling attachments page · b5b59781
  Tom Giannattasio authored 12 years ago
  
  b5b59781
- Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change · 53006700
  ichuang authored 12 years ago
```
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver

merging now so it stops holding up content teams.
```
  53006700
- added bootstrap js and other dependencies; tweaked settings template · ad45a44a
  Tom Giannattasio authored 12 years ago
  
  ad45a44a
- hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver · 4dbcfe92
  ichuang authored 12 years ago
```
This needs a more permanent solution.
```
  4dbcfe92
- Fix the tests of the book url · b0627efc
  Calen Pennington authored 12 years ago
  
  b0627efc
- Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus · 427c400f
  Calen Pennington authored 12 years ago
```
Fix user replication to Courses you're already enrolled in
```
  427c400f