Commits · 3c9c2f15cf6a1da2d3ca63bc66331fe0fc4e44d8 · OpenEdx / django-wiki · GitLab

22 Aug, 2012 39 commits
- more search layout · 3c9c2f15
  benjaoming committed Aug 22, 2012
  
  3c9c2f15 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 6d20678c
  benjaoming committed Aug 22, 2012
  
  6d20678c Browse Files
- Search "optimization".... layout-wise :) · f8a6e1c3
  benjaoming committed Aug 22, 2012
  
  f8a6e1c3 Browse Files
- user.is_superuser is not a function. · 7f820b66
  Bridger Maxwell committed Aug 22, 2012
  
  7f820b66 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 0012481a
  benjaoming committed Aug 22, 2012
  
  0012481a Browse Files
- Search function · c0d7e2ab
  benjaoming committed Aug 22, 2012
  
  c0d7e2ab Browse Files
- Removed print statement accidentally left in. · 63003aa6
  Bridger Maxwell committed Aug 22, 2012
  
  63003aa6 Browse Files
- Made a workaround for django bug 15040, which made permissions forms have all checked boxes. · afdd97d5
  Bridger Maxwell committed Aug 22, 2012
  
  afdd97d5 Browse Files
- Moved subtree delete to a model method with transactions. · 6ccd08e0
  Bridger Maxwell committed Aug 22, 2012
  
  6ccd08e0 Browse Files
- A few search related things... adding search bar (doesnt work yet) · c2cfcc2a
  benjaoming committed Aug 22, 2012
  
  c2cfcc2a Browse Files
- Filtering on Directory listings. Issue #27 - never create a merged revision that… · 56d8e574
```
Filtering on Directory listings. Issue #27 - never create a merged revision that inherits the deleted or locked attribute.
```
  benjaoming committed Aug 22, 2012
  56d8e574 Browse Files
- Few things here and there in the README · 2979c984
  benjaoming committed Aug 22, 2012
  
  2979c984 Browse Files
- Issue #28 · ff8fd1ca
  benjaoming committed Aug 22, 2012
  
  ff8fd1ca Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · bf0d9cd8
  benjaoming committed Aug 22, 2012
  
  bf0d9cd8 Browse Files
- Very small commit before merge... · b03a317c
  benjaoming committed Aug 22, 2012
  
  b03a317c Browse Files
- Modal should not animate... the bootstrap animation is loo choppy · 8e691c1e
  benjaoming committed Aug 22, 2012
  
  8e691c1e Browse Files
- Changed preview to show warning when previewing a deleted revision. · 9865b5c6
  Bridger Maxwell committed Aug 22, 2012
  
  9865b5c6 Browse Files
- You can now preview deleted revisions (so they work in the history tab). · d2f08a3a
  Bridger Maxwell committed Aug 21, 2012
  
  d2f08a3a Browse Files
- Fixed confusing if statement that had the side effect of restoring every deleted… · a8dbb5f1
```
Fixed confusing if statement that had the side effect of restoring every deleted article a moderator views.
```
  Bridger Maxwell committed Aug 21, 2012
  a8dbb5f1 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · c4325748
  Bridger Maxwell committed Aug 21, 2012
  
  c4325748 Browse Files
- Was accidentally using old permission for showing purge confirm form. · 1415c85a
  Bridger Maxwell committed Aug 21, 2012
  
  1415c85a Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 6be6a0c1
  benjaoming committed Aug 22, 2012
  
  6be6a0c1 Browse Files
- oops mess · 915260d6
  benjaoming committed Aug 22, 2012
  
  915260d6 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 32416cd1
  Bridger Maxwell committed Aug 21, 2012
  
  32416cd1 Browse Files
- Removed the lost and found until it can be debugged. · ce4fd7a8
  Bridger Maxwell committed Aug 21, 2012
  
  ce4fd7a8 Browse Files
- Layout stuff · 59ecabd4
  benjaoming committed Aug 22, 2012
  
  59ecabd4 Browse Files
- Properly deletes children when purging articles. · 4ddc7cbd
  Bridger Maxwell committed Aug 21, 2012
  
  4ddc7cbd Browse Files
- Fix slug checking: Should respect case sensitivity (if configured) and feedback… · 2770ad1d
```
Fix slug checking: Should respect case sensitivity (if configured) and feedback if its a deleted article
```
  benjaoming committed Aug 22, 2012
  2770ad1d Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 632bb599
  Bridger Maxwell committed Aug 21, 2012
  
  632bb599 Browse Files
- Removing the stupid delete check once and for all · 66f357e4
  benjaoming committed Aug 22, 2012
  
  66f357e4 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 096e1493
  Bridger Maxwell committed Aug 21, 2012
  
  096e1493 Browse Files
- Removing circular permission check can_write->can_delete->can_write.... · d5d90a4f
  benjaoming committed Aug 22, 2012
  
  d5d90a4f Browse Files
- Adding user_can_read as a kwarg on Article.get_children · a3ee89da
  benjaoming committed Aug 22, 2012
  
  a3ee89da Browse Files
- Merge branch 'edx_release' · af0b2a6c
```
Conflicts:
	wiki/decorators.py
	wiki/views/article.py
```
  Bridger Maxwell committed Aug 21, 2012
  af0b2a6c Browse Files
- An article is now considered deleted if a parent is instead of explicitly… · 82806fa6
```
An article is now considered deleted if a parent is instead of explicitly needing to mark all children as deleted.
```
  Bridger Maxwell committed Aug 21, 2012
  82806fa6 Browse Files
- Removing the is_moderator decorator -- it is replaced by can_moderate · 489dcba8
  benjaoming committed Aug 22, 2012
  
  489dcba8 Browse Files
- Updating todo and comments · 9a996a74
  benjaoming committed Aug 22, 2012
  
  9a996a74 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 1e5bb80d
  benjaoming committed Aug 22, 2012
  
  1e5bb80d Browse Files
- Loads of changes in permission system. Many aspects are now configurable. · 832d7903
  benjaoming committed Aug 22, 2012
  
  832d7903 Browse Files
21 Aug, 2012 1 commit
- Fixed import for installation to run without attachments being enabled. · 02275fb4
  Bridger Maxwell committed Aug 21, 2012
  
  02275fb4 Browse Files