Commits · edx_release_rebase · edx / django-wiki · GitLab

03 Jun, 2014 2 commits
- Fixes MAT-4 · 1fc65727
  Dave St.Germain committed Jun 03, 2014
  
  1fc65727 Browse Files
- Use ugettext_lazy to prevent early translation. · d46446e3
  Ned Batchelder committed Jun 03, 2014
  
  d46446e3 Browse Files
27 May, 2014 1 commit
- Add explanation of current build status. · 3125d7d8
  benjaoming committed May 27, 2014
  
  3125d7d8 Browse Files
20 May, 2014 6 commits
- Travis should not test Django 1.4 against Python 3 · f1a4aa69
  benjaoming committed May 21, 2014
  
  f1a4aa69 Browse Files
- Fix #234 by adding @friedmud's suggestion and a max-height om <pre>'s · 9f265e58
  benjaoming committed May 21, 2014
  
  9f265e58 Browse Files
- Fix filter() call in get_content_snippet not working on Python 2.7+ · 44dcfdd5
  benjaoming committed May 20, 2014
  
  44dcfdd5 Browse Files
- Adding prepopulated DB with front page article · e60cae57
  benjaoming committed May 20, 2014
  
  e60cae57 Browse Files
- Merge branch 'mastak-master' · 8c45e4a2
  benjaoming committed May 20, 2014
  
  8c45e4a2 Browse Files
- Merge branch 'master' of github.com:mastak/django-wiki into mastak-master · c971cb48
```
Conflicts:
	wiki/tests/__init__.py
```
  benjaoming committed May 20, 2014
  c971cb48 Browse Files
19 May, 2014 8 commits
- once again correcting travis config and adding py3 fixed requirement for django_nyt · d6cf63f8
  benjaoming committed May 19, 2014
  
  d6cf63f8 Browse Files
- travis pip syntax err · aa2980dc
  benjaoming committed May 19, 2014
  
  aa2980dc Browse Files
- Only Django 1.4.2+ is support because of django-mptt · 53fda7f1
  benjaoming committed May 19, 2014
  
  53fda7f1 Browse Files
- Only Django 1.4.2+ is support because of django-mptt · 3d37d9fc
  benjaoming committed May 19, 2014
  
  3d37d9fc Browse Files
- Add list of known issues and include a note on Dj 1.4 and sorl with that. · a2192962
  benjaoming committed May 19, 2014
  
  a2192962 Browse Files
- fix travis syntax err · abbaceec
  benjaoming committed May 19, 2014
  
  abbaceec Browse Files
- Reconstructing Travis YML to only use selected combinations of django and python versions · 53cf3dcb
  benjaoming committed May 19, 2014
  
  53cf3dcb Browse Files
- Travis requirements to get sorl 11.12.1b and fix django 1.7 beta from tarball instead of pip · 8dbcc7d0
  benjaoming committed May 19, 2014
  
  8dbcc7d0 Browse Files
18 May, 2014 10 commits
- start testing south migrations again · 1c01ed83
  benjaoming committed May 19, 2014
  
  1c01ed83 Browse Files
- Fix broken images.south_migrations (0001_initial), add new .travis requirements · 25a02068
  benjaoming committed May 19, 2014
  
  25a02068 Browse Files
- Adding draft notice to release notes · d1aeea86
  benjaoming committed May 18, 2014
  
  d1aeea86 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · 9e518c24
  benjaoming committed May 18, 2014
  
  9e518c24 Browse Files
- removing migration testing for now due to unknown error · fa16ac39
  benjaoming committed May 18, 2014
  
  fa16ac39 Browse Files
- removing migration testing for now due to unknown erro · 3fc67456
  benjaoming committed May 18, 2014
  
  3fc67456 Browse Files
- add release note link · 9221c154
  benjaoming committed May 18, 2014
  
  9221c154 Browse Files
- (Missing from previous commit) · cf789ec8
```
Refactor old South migration modules "migrations"->"south_migrations", add AppConfigs for future Django 1.7 (not supported yet), initial release notes, delete odd notifications migration that by mistake deletes the notifications subscriptions tables!
```
  benjaoming committed May 18, 2014
  cf789ec8 Browse Files
- Refactor old South migration modules "migrations"->"south_migrations", add… · ddf6aa30
```
Refactor old South migration modules "migrations"->"south_migrations", add AppConfigs for future Django 1.7 (not supported yet), initial release notes, delete odd notifications migration that by mistake deletes the notifications subscriptions tables!
```
  benjaoming committed May 18, 2014
  ddf6aa30 Browse Files
- south migration and django 1.7 transitional support, remove django_notify and use django_nyt · 102b015a
  benjaoming committed May 18, 2014
  
  102b015a Browse Files
17 May, 2014 13 commits
- Tests should reflect forced lowercase paths. · bb82b468
  benjaoming committed May 17, 2014
  
  bb82b468 Browse Files
- Merge branch 'master' of github.com:benjaoming/django-wiki · b032b613
  benjaoming committed May 17, 2014
  
  b032b613 Browse Files
- Make tests run on django<1.6 · 38dc640d
  benjaoming committed May 17, 2014
  
  38dc640d Browse Files
- Merge branch 'python3' of github.com:benjaoming/django-wiki into python3 · efae942c
```
Conflicts:
	.travis/requirements.txt
	wiki/models/urlpath.py
	wiki/tests/__init__.py
	wiki/views/article.py
```
  benjaoming committed May 17, 2014
  efae942c Browse Files
- Fix py3 syntax error, refactor tests to be run with DiscoverRunner · 3f88b01e
  benjaoming committed May 17, 2014
  
  3f88b01e Browse Files
- Specified a version for sorl-thumbnails that is compatible with Python3 · 77413fee
  Antonin Lenfant committed May 17, 2014
  
  77413fee Browse Files
- Fix image upload when IMAGE_PATH_OBSCURIFY setting is enabled · d6ba3715
  Antonin Lenfant committed May 17, 2014
  
  d6ba3715 Browse Files
- Fixed tox.ini dependencies for Python 3 support · 4c54b9a4
  Luke Plant committed May 17, 2014
  
  4c54b9a4 Browse Files
- Added python3.3 environment to the envs to test in tox.ini · 606592b2
  Luke Plant committed May 17, 2014
  
  606592b2 Browse Files
- Removed use of unicode_literals in migrations, because it causes many migrations… · 2e4f15c6
```
Removed use of unicode_literals in migrations, because it causes many migrations to generate TypeError
```
  Luke Plant committed May 17, 2014
  2e4f15c6 Browse Files
- Move from __future__ to the beginning of the file · d82e3b17
  Russell-Jones committed May 17, 2014
  
  d82e3b17 Browse Files
- Try change made by benjaoming on django-nyt · a0d18621
  Russell-Jones committed May 17, 2014
  
  a0d18621 Browse Files
- Move to python3-style unicode everywhere str() · e9c244fc
  Russell Jones committed May 17, 2014
  
  e9c244fc Browse Files