Commits · da653dc3e89fe632f434c924dcdfdfd90064ea2c · OpenEdx / django-wiki

10 Sep, 2014 2 commits
- Merge pull request #301 from Fantomas42/patch-1 · da653dc3
```
Update .travis.yml
```
  benjaoming committed Sep 10, 2014
  da653dc3 Browse Files
- Update .travis.yml · 036311f0
```
Correct IRC channel for Travis builds.
```
  Julien Fache committed Sep 10, 2014
  036311f0 Browse Files
09 Sep, 2014 3 commits
- Merge pull request #300 from pknowles/master · 16063dbe
```
Added validation for slugs conflicting with 3rd party URLs
```
  benjaoming committed Sep 09, 2014
  16063dbe Browse Files
- Updated setting name ALLOW_OVERLAPPING_THIRD_PARTY_URL to CHECK_SLUG_URL_AVAILABLE · 20041bd7
  pknowles committed Sep 10, 2014
  
  20041bd7 Browse Files
- Added validation for slugs conflicting with 3rd party URLs, and option to… · 9eae449e
```
Added validation for slugs conflicting with 3rd party URLs, and option to disable with ALLOW_OVERLAPPING_THIRD_PARTY_URL = True
```
  pknowles committed Sep 10, 2014
  9eae449e Browse Files
07 Sep, 2014 2 commits
- Merge pull request #299 from tkliuxing/master · 20748ad4
```
Add Simplified Chinese translation.
```
  benjaoming committed Sep 07, 2014
  20748ad4 Browse Files
- Add Simplified Chinese translation. · a50a5cfb
  Ronald Bai committed Sep 08, 2014
  
  a50a5cfb Browse Files
30 Aug, 2014 1 commit

Updating model chart. Command used: · d0a83ce5

python manage.py wikiviz -e wiki images attachments notifications django_nyt | dot -T pdf -o ../model_chart_wiki.pdf

committed Aug 30, 2014

d0a83ce5 Browse Files

12 Aug, 2014 3 commits
- give at least anon ready access to front page · b759c5b7
  benjaoming committed Aug 13, 2014
  
  b759c5b7 Browse Files
- update test database and make front page only editable by admin · 64636dc7
  benjaoming committed Aug 13, 2014
  
  64636dc7 Browse Files
- Add a bit more info, and thanks @almereyda for noticing. · 74871db2
  benjaoming committed Aug 13, 2014
  
  74871db2 Browse Files
02 Aug, 2014 1 commit
- Add IRC notifications · bccd5b64
  benjaoming committed Aug 02, 2014
  
  bccd5b64 Browse Files
27 Jul, 2014 1 commit
- Merge pull request #293 from clincher/patch-1 · 4c3d5576
```
Update markdown_extensions.py
```
  benjaoming committed Jul 27, 2014
  4c3d5576 Browse Files
26 Jul, 2014 1 commit

Update markdown_extensions.py · e5fbd6b5

#292 fixed
We shouldn't change permission workflow, it's better to put AnonymousUser instead of None in case of unowned article.
Not tested, but should work.

@shoeki, you can try this commit for test

committed Jul 27, 2014

e5fbd6b5 Browse Files

23 Jul, 2014 2 commits
- increase django-nyt version dep · ba21cc06
  benjaoming committed Jul 23, 2014
  
  ba21cc06 Browse Files
- fix wrongly resetting notification badge color at every update · aec9c1eb
  benjaoming committed Jul 23, 2014
  
  aec9c1eb Browse Files
21 Jul, 2014 1 commit
- Add missing migration for deleted field Image.image - Fixes #281 · 25ee8b7f
  benjaoming committed Jul 21, 2014
  
  25ee8b7f Browse Files
19 Jul, 2014 7 commits
- docs change on how to handle notifications for 0.0.24 · 1ce19283
  benjaoming committed Jul 19, 2014
  
  1ce19283 Browse Files
- dependency on new django_nyt · 5dd9a984
  benjaoming committed Jul 19, 2014
  
  5dd9a984 Browse Files
- notifications plugin form to use django-nyt and management command to recreate notifications · eea0c43d
  benjaoming committed Jul 19, 2014
  
  eea0c43d Browse Files
- Merge pull request #289 from django-wiki/revert-272-fix_224 · 6f13af4d
```
Revert "Fix #224"
```
  benjaoming committed Jul 19, 2014
  6f13af4d Browse Files
- Revert "Fix #224" · 84f75080
  benjaoming committed Jul 19, 2014
  
  84f75080 Browse Files
- do not install django-mptt 0.6.1 it's broken · 1ec4e74c
  benjaoming committed Jul 19, 2014
  
  1ec4e74c Browse Files
- more info on new releases · 178aa26a
  benjaoming committed Jul 19, 2014
  
  178aa26a Browse Files
18 Jul, 2014 5 commits
- Fix #270 · eac7504a
  benjaoming committed Jul 18, 2014
  
  eac7504a Browse Files
- Merge pull request #279 from SacNaturalFoods/update-help-plugin · 25f2cd5d
```
corrected lists section of help plugin for sub items
```
  benjaoming committed Jul 18, 2014
  25f2cd5d Browse Files
- add missing paragraph · 1614eb51
  benjaoming committed Jul 18, 2014
  
  1614eb51 Browse Files
- add note about django-wiki-project-template · 9ff1ab9f
  benjaoming committed Jul 18, 2014
  
  9ff1ab9f Browse Files
- pep8 · a7acc42d
  benjaoming committed Jul 18, 2014
  
  a7acc42d Browse Files
11 Jul, 2014 1 commit
- Merge pull request #269 from fangsterr/master · bacba8d7
```
article settings form compatibility with custom user model
```
  benjaoming committed Jul 12, 2014
  bacba8d7 Browse Files
08 Jul, 2014 4 commits
- Merge pull request #278 from PolyLAN/fix_262 · 8a7f288e
```
Fix #262 for attachements
```
  benjaoming committed Jul 08, 2014
  8a7f288e Browse Files
- Merge pull request #272 from PolyLAN/fix_224 · 9100c424
```
Fix #224
```
  benjaoming committed Jul 08, 2014
  9100c424 Browse Files
- Merge pull request #273 from PolyLAN/fix_haystack_confict · daf13cfe
```
Test the presence of the plugin haystack, not haystack himself
```
  benjaoming committed Jul 08, 2014
  daf13cfe Browse Files
- Merge pull request #275 from PolyLAN/mediawiki_import · d0e77d09
```
Mediawiki import
```
  benjaoming committed Jul 08, 2014
  d0e77d09 Browse Files
25 Jun, 2014 1 commit
- corrected lists section of help plugin for sub items · d404a154
  tschmidt committed Jun 25, 2014
  
  d404a154 Browse Files
23 Jun, 2014 3 commits
- Fix #262 for attachements · 1445ad58
  Maximilien Cuony committed Jun 23, 2014
  
  1445ad58 Browse Files
- Better import: Expend templates, better url handeling and internal links · 9c5e6b00
  Maximilien Cuony committed Jun 23, 2014
  
  9c5e6b00 Browse Files
- Import mediawiki: First basic version. · c4fce27b
```
* Import page, with history and users
```
  Maximilien Cuony committed Jun 23, 2014
  c4fce27b Browse Files
19 Jun, 2014 2 commits
- Test the presence of the plugin haystack, not haystack himself · 5754e97e
  Maximilien Cuony committed Jun 19, 2014
  
  5754e97e Browse Files
- Also fix in the plugin · 4e7031dc
  Maximilien Cuony committed Jun 19, 2014
  
  4e7031dc Browse Files