Commits · 4f0ef1aa5dcfa67e92efd1e9c02800621e8bbdf6 · OpenEdx / django-wiki

04 Apr, 2013 10 commits
- pull #139 - form data from args or kwargs · 4f0ef1aa
  benjaoming committed Apr 04, 2013
  
  4f0ef1aa Browse Files
- Merge pull request #139 from hynekcer/master · 159025bc
```
Fixed broken Preview (displaying the old article content)
```
  benjaoming committed Apr 04, 2013
  159025bc Browse Files
- Revert "Fixed posting data to views.article.Preview" · 634c3c0a
```
This reverts commit df27e510 due to broken Preview.
The previous test can pass now.
```
  Hynek Cernoch committed Apr 04, 2013
  634c3c0a Browse Files
- Added recursion test for the current bug in preview. · 1bba4ecc
  Hynek Cernoch committed Apr 04, 2013
  
  1bba4ecc Browse Files
- Do not use kwargs for permission methods · c3bbc377
  benjaoming committed Apr 04, 2013
  
  c3bbc377 Browse Files
- Do not use kwargs for permission methods · 37d99390
  benjaoming committed Apr 04, 2013
  
  37d99390 Browse Files
- Do not use kwargs for permission methods · 2d7957aa
  benjaoming committed Apr 04, 2013
  
  2d7957aa Browse Files
- #137 place permission logic ONLY in core.permissions and make article.can_read… · d37e09cd
```
#137 place permission logic ONLY in core.permissions and make article.can_read and article.can_write configurable
```
  benjaoming committed Apr 04, 2013
  d37e09cd Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · fdd36cde
  benjaoming committed Apr 04, 2013
  
  fdd36cde Browse Files
- fix wrong form target on clicking 'Switch to selected version' + modal window height · 71c59d68
  benjaoming committed Apr 04, 2013
  
  71c59d68 Browse Files
02 Apr, 2013 9 commits
- Merge pull request #138 from jdcaballero/master · de555063
```
Spanish Translation
```
  benjaoming committed Apr 02, 2013
  de555063 Browse Files
- Merge remote-tracking branch 'origin/master' · 054b3af7
```
Conflicts:
	README.md
```
  Juan Diego Caballero committed Apr 02, 2013
  054b3af7 Browse Files
- More clear PIL instructions. · 84dc39f3
  benjaoming committed Apr 02, 2013
  
  84dc39f3 Browse Files
- Spanish translations added. · 5468b9aa
  Juan Diego Caballero committed Apr 02, 2013
  
  5468b9aa Browse Files
- Do not use HttpResponseRedirectBase anyways, just check status_code · b74303ec
  benjaoming committed Apr 02, 2013
  
  b74303ec Browse Files
- fix imporerror for HttpResponseRedirectBase · 43dbdd9c
  benjaoming committed Apr 02, 2013
  
  43dbdd9c Browse Files
- JSON view can return HttpResponseRedirect · bc0eff84
  benjaoming committed Apr 02, 2013
  
  bc0eff84 Browse Files
- changing apt-get to use python-imaging · 71a64575
```
Per @benjaoming.
```
  Dennis Coldwell committed Apr 02, 2013
  71a64575 Browse Files
- adding PIL pre-req documentation · f76bc85d
```
Without libjpeg PIL won't be able to install with jpeg support and users will see IOErrors on their wikis.  Highlighting this in a "prerequisites" section on the README.

Documentation now has a little bit of background as well as installation instructions for Linux/OS X.
```
  Dennis Coldwell committed Apr 02, 2013
  f76bc85d Browse Files
29 Mar, 2013 5 commits
- Do not use HttpResponseRedirectBase anyways, just check status_code · beb75715
  benjaoming committed Mar 29, 2013
  
  beb75715 Browse Files
- fix imporerror for HttpResponseRedirectBase · 6da0fd98
  benjaoming committed Mar 29, 2013
  
  6da0fd98 Browse Files
- JSON view can return HttpResponseRedirect · 3f1ac960
  benjaoming committed Mar 29, 2013
  
  3f1ac960 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 6a9539de
  benjaoming committed Mar 29, 2013
  
  6a9539de Browse Files
- Fix #136 · 0ff3fd44
  benjaoming committed Mar 29, 2013
  
  0ff3fd44 Browse Files
27 Mar, 2013 3 commits

Merge pull request #135 from coldwd/patch-1 · f4f3a1d1
```
adding PIL pre-req documentation
```
benjaoming committed Mar 27, 2013
f4f3a1d1 Browse Files
changing apt-get to use python-imaging · ef837448
```
Per @benjaoming.
```
Dennis Coldwell committed Mar 27, 2013
ef837448 Browse Files

adding PIL pre-req documentation · 4cf921fb

Without libjpeg PIL won't be able to install with jpeg support and users will see IOErrors on their wikis.  Highlighting this in a "prerequisites" section on the README.

Documentation now has a little bit of background as well as installation instructions for Linux/OS X.

committed Mar 26, 2013

4cf921fb Browse Files

26 Mar, 2013 12 commits
- add clearfix for article tocs and indexes · e9bd9467
  benjaoming committed Mar 26, 2013
  
  e9bd9467 Browse Files
- fix #130 - display disabled dropdown when no assignment permission · 5fdb93d1
  benjaoming committed Mar 26, 2013
  
  5fdb93d1 Browse Files
- clean up block tags to be prefixed 'wiki_*' · 45cd25e6
  benjaoming committed Mar 26, 2013
  
  45cd25e6 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 0911c58b
  benjaoming committed Mar 26, 2013
  
  0911c58b Browse Files
- Update to Bootstrap 2.3.1 and simplify LESS import statements · 03449289
  benjaoming committed Mar 26, 2013
  
  03449289 Browse Files
- Merge pull request #132 from hynekcer/master · 914ecf5f
```
Fixed typo in admin - Article revision list columns
```
  benjaoming committed Mar 26, 2013
  914ecf5f Browse Files
- Fixed typo in admin - Article revision list columns · 8f60a119
  Hynek Cernoch committed Mar 26, 2013
  
  8f60a119 Browse Files
- Update README.md · a908af49
  benjaoming committed Mar 26, 2013
  
  a908af49 Browse Files
- Bump to 0.0.18 · 428d236e
  benjaoming committed Mar 26, 2013
  
  428d236e Browse Files
- Fix #125 - missing redirect call · 85602fe3
  benjaoming committed Mar 26, 2013
  
  85602fe3 Browse Files
- Merge pull request #131 from daltonmatos/translation/pt_BR · 807611b9
```
Adding translation for pt_BR
```
  benjaoming committed Mar 26, 2013
  807611b9 Browse Files
- Adding translation for pt_BR · 5779039c
  Dalton Barreto committed Mar 26, 2013
  
  5779039c Browse Files
19 Mar, 2013 1 commit
- Merge pull request #129 from TomLottermann/master · 2cd0dbed
```
German translation
```
  benjaoming committed Mar 19, 2013
  2cd0dbed Browse Files