Commits · a3b144045cd48fea002822a5f5f79f1c19e8d183 · edx / edx-platform · GitLab

16 Aug, 2012 15 commits
- Merge pull request #427 from MITx/feature/bridger/new_wiki · a3b14404
```
New wiki installed from pip
```
  Calen Pennington committed Aug 16, 2012
  a3b14404 Browse Files
- Removed old path include for django-wiki. · c4b362ca
  Bridger Maxwell committed Aug 16, 2012
  
  c4b362ca Browse Files
- Moved django-wiki submodule to be a pip install from git. · 337f109a
  Bridger Maxwell committed Aug 16, 2012
  
  337f109a Browse Files
- Merge pull request #425 from MITx/feature/bridger/new_wiki · 3efea9cb
```
Feature/bridger/new wiki
```
  Calen Pennington committed Aug 16, 2012
  3efea9cb Browse Files
- Merge pull request #423 from MITx/feature/ichuang/fix-capa-answers-static-urls · 884f33c9
```
capa problem answers may have static urls - needs replace_urls
```
  Calen Pennington committed Aug 16, 2012
  884f33c9 Browse Files
- Merge pull request #422 from MITx/kimth/sjsu · e60f2e3d
```
Don't display 'None points' on problem rendering
```
  Calen Pennington committed Aug 16, 2012
  e60f2e3d Browse Files
- Merge pull request #416 from MITx/feature/kfiedler/askbot · 1a8e5485
```
Fix all of askbots style
```
  thomasxiii committed Aug 16, 2012
  1a8e5485 Browse Files
- Updated django-wiki submodule. · 326a0f61
  Bridger Maxwell committed Aug 15, 2012
  
  326a0f61 Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · d064d29c
  Bridger Maxwell committed Aug 15, 2012
  
  d064d29c Browse Files
- Added django-wiki as a submodule. · 8fb83ee3
  Bridger Maxwell committed Aug 15, 2012
  
  8fb83ee3 Browse Files
- doc update - LMS migrate reload · 033211a5
  ichuang committed Aug 15, 2012
  
  033211a5 Browse Files
- do replace_urls within capa_module get_answer (eg for img in <solution>s) · f39e5896
  ichuang committed Aug 15, 2012
  
  f39e5896 Browse Files
- Added template for inline preview. · 2b29c952
  Bridger Maxwell committed Aug 15, 2012
  
  2b29c952 Browse Files
- Permissions on root article no longer allow students to edit it. · 262a49a6
  Bridger Maxwell committed Aug 15, 2012
  
  262a49a6 Browse Files
- Added bootstrap-modal for the wiki preview modals. · 48e9dc80
  Bridger Maxwell committed Aug 15, 2012
  
  48e9dc80 Browse Files
15 Aug, 2012 25 commits
- Fixed up course_nav to swizzle url reversing too. · a163b486
  Bridger Maxwell committed Aug 15, 2012
  
  a163b486 Browse Files
- Middleware for changing redirects to stay in course wiki. · e76be095
  Bridger Maxwell committed Aug 15, 2012
  
  e76be095 Browse Files
- Added creation of Site() object on wiki load. · 0d28d286
  Bridger Maxwell committed Aug 15, 2012
  
  0d28d286 Browse Files
- Don't display 'None points' on problem rendering · 3519ea6b
  kimth committed Aug 15, 2012
  
  3519ea6b Browse Files
- added styles for main article, sidebar and breadcrumb · 13c2bb58
  Tom Giannattasio committed Aug 15, 2012
  
  13c2bb58 Browse Files
- Merge pull request #417 from MITx/kimth/sjsu · be1b0638
```
Kimth/sjsu
```
  Calen Pennington committed Aug 15, 2012
  be1b0638 Browse Files
- Drop import of re · 58932bb2
  kimth committed Aug 15, 2012
  
  58932bb2 Browse Files
- Merge master · 3c1e67e3
  kimth committed Aug 15, 2012
  
  3c1e67e3 Browse Files
- Merge pull request #419 from MITx/feature/url_based_course_lists · 13b9e58f
```
URL based course lists
```
  Calen Pennington committed Aug 15, 2012
  13b9e58f Browse Files
- Merge pull request #418 from MITx/feature/victor/strip-metadata · 213e3cdc
```
Feature/victor/strip metadata
```
  Calen Pennington committed Aug 15, 2012
  213e3cdc Browse Files
- Map '/course/' urls to the course's root in the multicourse hierarchy · 02d970c3
  kimth committed Aug 15, 2012
  
  02d970c3 Browse Files
- Remove stuff that I should have deleted during the rebase · 1c2b6e80
  David Ormsbee committed Aug 15, 2012
  
  1c2b6e80 Browse Files
- Add support metadata in policy.json · a4d67bab
```
* if there is a policy.json in the course dir, read it
* file format is a dict with keys {category}/{url_name}, and values metadata dictionaries
* apply the policy, overwriting keys that are in the xml
* then do metadata inheritance, inheriting any overwritten keys.

* also a management cmd to generate a policy.json from a course dir.
```
  Victor Shnayder committed Aug 15, 2012
  a4d67bab Browse Files
- Fix typo that caused two classes to not get loaded · f535f44e
  David Ormsbee committed Aug 15, 2012
  
  f535f44e Browse Files
- Drop HttpResponseRedirect import · f1f80cb1
  kimth committed Aug 15, 2012
  
  f1f80cb1 Browse Files
- courseware.get_module passes down course_id triplet (org, course, run) · 0b4b8ecf
  kimth committed Aug 15, 2012
  
  0b4b8ecf Browse Files
- Point at the new urls for the sandbox queue server LB · e524f3bf
  Calen Pennington committed Aug 15, 2012
  
  e524f3bf Browse Files
- Fix broken docstring · 573c58d0
  Calen Pennington committed Aug 15, 2012
  
  573c58d0 Browse Files
- Added some final touches to askbot · 6d7225be
  Kyle Fiedler committed Aug 15, 2012
  
  6d7225be Browse Files
- Added more fixes for askbot also fixed some of the extra padding · ff1f0907
  Kyle Fiedler committed Aug 15, 2012
  
  ff1f0907 Browse Files
- Added styles for single question and profile view · 0804ff7a
  Kyle Fiedler committed Aug 15, 2012
  
  0804ff7a Browse Files
- Lots of askbot fixes · bbe94325
  Kyle Fiedler committed Aug 15, 2012
  
  bbe94325 Browse Files
- Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki · 8daea9c4
  Tom Giannattasio committed Aug 15, 2012
  
  8daea9c4 Browse Files
- started styles · abf26dce
  Tom Giannattasio committed Aug 15, 2012
  
  abf26dce Browse Files
- Merge pull request #415 from MITx/feature/victor/start-dates · 44635421
```
Feature/victor/start dates
```
  Calen Pennington committed Aug 15, 2012
  44635421 Browse Files