Commit graph

343 commits

Author SHA1 Message Date
Dave Hall
c2b675026b Not testing against python 3.6 2017-06-19 09:25:47 +01:00
Dave Hall
cfa38dccea Attempting to fix travis build 2017-06-19 09:08:10 +01:00
Dave Hall
a5b3c7830f Merge branch 'moggers87-django-1.11' 2017-06-19 09:07:57 +01:00
Matt Molyneaux
e1a3708e3c Update trove classifiers 2017-06-13 19:55:24 +01:00
Matt Molyneaux
f3d969c030 Use Python 3.6 in .travil.yml 2017-06-13 19:54:59 +01:00
Matt Molyneaux
b0435d0b72 Flatten context for render_to_string
This is now required for Django 1.11
2017-06-13 12:36:39 +01:00
Matt Molyneaux
5ac7bba7ba Add missing context processor to test app 2017-06-13 12:30:22 +01:00
Matt Molyneaux
c326e089f5 Add Django-1.11 to test matrix 2017-06-13 12:30:09 +01:00
Dave Hall
e018598248 Merge pull request #200 from unaizalakain/issue_188
Fix #188: Get rid of the workaround for django's __in bug
2017-05-03 10:11:09 +01:00
Unai Zalakain
ba2f9d1341 Fix #188: Get rid of the workaround for django's __in bug
Related bug: https://code.djangoproject.com/ticket/15145
2017-05-01 23:08:30 +02:00
Dave Hall
f3c6de2809 Merge pull request #198 from sorokins/master
Support multiple databases
2017-04-18 09:34:55 +01:00
sorokins
3f589b361c Simplify 635192fa4c 2017-04-13 15:08:41 +03:00
sorokins
635192fa4c Multiple databases support 2017-04-13 14:56:46 +03:00
Dave Hall
f8d1ed0052 v1.3.1 2017-04-03 14:17:51 +01:00
Dave Hall
44d74d0c21 Updating changelog 2017-04-03 14:16:36 +01:00
Dave Hall
cb3d12c137 Merge pull request #195 from blodone/master
fix middleware object, use MiddlewareMixin if present for Django 1.10
2017-03-27 11:18:25 +01:00
Amin Dandache
78ca1c1523 fix middleware object, use MiddlewareMixin if present 2017-03-22 09:30:41 +01:00
Dave Hall
e200526dd3 v1.3.0 2016-12-19 11:06:08 +00:00
Dave Hall
71b4682b11 Merge pull request #191 from devxplorer/master
Adding WATSON_POSTGRES_SEARCH_CONFIG setting
2016-11-16 10:23:41 +00:00
Dmitriev Alexander
ab34cae822 Adding WATSON_POSTGRES_SEARCH_CONFIG setting 2016-11-14 23:34:30 +03:00
Dave Hall
97af9a75f9 Combining coverage report, and adding flake8 to tox 2016-11-08 11:58:04 +00:00
Dave Hall
fcd362a7a5 Merge pull request #187 from amureki/flake8_fixes
Added flake8, fixed syntax, flattened package structure
2016-11-08 11:24:47 +00:00
Rustem Sayargaliev
fb1a3991f1 Added flake8, fixed syntax, flattened package structure 2016-11-07 21:33:33 +01:00
Rustem Sayargaliev
03c929c571 Added tox tests structure 2016-11-07 20:56:04 +01:00
Dave Hall
37699fed8d v1.2.4 2016-11-07 10:42:34 +00:00
Dave Hall
5c939a19d3 Merge pull request #183 from amureki/issues/182/separate_backend_escaping
Fixed #182 -- split different backends escaping
2016-11-01 12:22:37 +00:00
Rustem Sayargaliev
e6f645904e review fixes 2016-10-31 18:07:35 +01:00
Rustem Sayargaliev
0c5eaf63a0 Fixed #182 -- split different backends escaping 2016-10-22 15:50:54 +02:00
Dave Hall
e6c718d9b9 Bumping release 2016-08-23 10:55:32 +01:00
Dave Hall
dd4cbc8db3 Merge pull request #173 from SimonGreenhill/master
removing patterns import
2016-08-22 11:04:45 +01:00
SimonGreenhill
6519e364cf fixing args handling in buildwatson 2016-08-16 13:52:40 +02:00
SimonGreenhill
a0372683a1 remove 1.7 from travis 2016-08-14 10:11:15 +12:00
SimonGreenhill
777e3b0d28 backing out settings overrides in tests.py and moving to runtests.py 2016-08-13 14:09:29 +12:00
SimonGreenhill
8705c763be another tweak 2016-08-12 19:07:41 +12:00
SimonGreenhill
08fbd996a6 tweak 2016-08-12 18:45:36 +12:00
SimonGreenhill
ede900f56f converting buildwatson command to use argparse 2016-08-12 17:41:05 +12:00
SimonGreenhill
0cd1318919 fixing tests 2016-08-12 17:23:02 +12:00
SimonGreenhill
0dc92173b6 updating urls.py for new django 1.8 syntax 2016-08-12 12:00:59 +12:00
SimonGreenhill
9c5f19e147 removing deprecated TestCase.urls setting and replacing with override_settings 2016-08-12 12:00:19 +12:00
Simon J Greenhill
536c41fadc Update urls.py 2016-08-08 20:33:36 +10:00
Simon J Greenhill
8251f52213 Merge pull request #1 from SimonGreenhill/travis-1.10
Adding latest release
2016-08-06 03:17:53 +10:00
Simon J Greenhill
1f67b6b9fd Upgrading to latest release versions 2016-08-06 03:14:03 +10:00
Simon J Greenhill
30436ab028 Adding latest release 2016-08-06 03:12:35 +10:00
SimonGreenhill
90e4cd62ef removing patterns import 2016-08-06 03:06:13 +10:00
Dave Hall
328e0315a9 Merge pull request #171 from johnfraney/patch-1
Update README.markdown
2016-07-15 09:30:16 +01:00
John Franey
34eb81f68f Update README.markdown
Fix typo
2016-07-14 13:01:27 -03:00
Dave Hall
b8b3da16d9 v1.2.2 2016-07-04 10:10:27 +01:00
Dave Hall
ed0b1a89e8 Merge pull request #169 from joblicate/feature/fix-uuid
Make join work with uuid primary key models
2016-07-04 10:05:49 +01:00
Jeppe Vesterbæk
b606b67f74 Make join work with uuid primary key models 2016-07-04 10:41:57 +02:00
Dave Hall
70fb0479d3 Merge pull request #163 from amureki/tests_options
Added --database option to tests
2016-04-19 09:30:10 +01:00