Commit Graph

385 Commits

Author SHA1 Message Date
Dave Hall e92d942d60 Updating changelog 2017-12-21 16:21:11 +00:00
Dave Hall ac90ba92b8 Trying to lose tox. It's been a right pain. 2017-12-21 16:08:28 +00:00
Dave Hall c8fcb69099
Merge pull request #229 from dustinrb/non-atomic-batches
Non-atomic option for buildwatson
2017-12-07 08:47:04 +00:00
Dustin Broderick 0a8fe02844 Fixes issue with Flake8 linting 2017-12-06 11:42:57 -07:00
Dustin Broderick 1641b73d60 Renames non-atomic flag to non_atomic (to prevent flag being non) 2017-12-06 11:13:10 -07:00
Dustin Broderick c3f00935ff Adds logic for non-atomic indexing 2017-12-06 10:38:20 -07:00
Dustin Broderick 92020f42f1 Adds non-atomic option to buildwatson 2017-12-06 09:58:43 -07:00
Dave Hall d6084f7a90 Fixing filter() with a UUID field. Closes #227. 2017-12-06 16:51:57 +00:00
Dustin Broderick 53c7012681 Merge branch 'master' of github.com:etianen/django-watson into working 2017-12-06 09:46:05 -07:00
Dave Hall 2f6ccc8bec
Merge pull request #226 from dustinrb/slim-indexing
"Slim" Indexing
2017-12-06 15:21:27 +00:00
Dustin Broderick c187407932 Fixed whitepace linting issues 2017-11-29 09:27:11 -07:00
Dustin Broderick c5cd52d227 Addesses linter issues 2017-11-29 09:25:44 -07:00
Dustin Broderick 1d293535b4 Adds missing paren 2017-11-28 14:33:58 -07:00
Dustin Broderick c0ee2cef68 Merge branch 'batches' into working 2017-11-28 14:31:54 -07:00
Dustin Broderick 9da4d9300c Merge branch 'slim-indexing' into working 2017-11-28 14:28:04 -07:00
Dustin Broderick 8fd2573747 Adds batch_size functionality to buildwatson 2017-11-28 14:22:55 -07:00
Dustin Broderick ab65d162ee Adds batch_size option to buildwatson 2017-11-28 14:19:06 -07:00
Dustin Broderick 0a9ccc4e2e Adds functional 'slim' indexing 2017-11-28 13:42:36 -07:00
Dustin Broderick 5bb313971f Adds 'slim' option to buildwatson 2017-11-28 13:40:54 -07:00
Dustin Broderick 3c6c342129 Removes atomic transaction for buildwatson 2017-11-28 12:58:57 -07:00
Dave Hall 2226de139b Fixing flake8 2017-11-27 08:54:17 +00:00
Dave Hall 30fcd4f77a Updating changelog 2017-11-27 08:53:13 +00:00
Dave Hall 2180ccdc7e
Merge pull request #224 from danielquinn/python3-support
Support stringifying objects in both Python 2 & 3
2017-11-24 10:35:52 +00:00
Daniel Quinn fcfe6eae6d Support stringifying objects in both Python 2 & 3
Without this fix, a Python3-based admin will simply show `Search object`
instead of `self.title`.
2017-11-23 14:06:52 +00:00
Dave Hall 993171a358 Merge pull request #222 from amureki/badges
Add badges to README
2017-10-23 11:14:19 +01:00
Rustem Sayargaliev ea7942fa93 Add badges to README 2017-10-21 12:35:44 +02:00
Dave Hall f0383241e3 v1.4.3 2017-09-28 11:30:34 +01:00
Dave Hall 7b35ba0c76 Fixing escaping of <> characters in postgres. Closes #219 2017-09-27 10:24:45 +01:00
Dave Hall 11784a5cc7 v1.4.2 2017-09-22 12:27:42 +01:00
Dave Hall 055b7d1e92 Fixing caching for default search backend 2017-09-22 12:22:20 +01:00
Dave Hall 1a1521a865 Updating changelog 2017-08-22 14:10:51 +01:00
Dave Hall 22c36d7d47 v1.4.1 2017-08-22 14:08:52 +01:00
Dave Hall 10c2051f7b Merge branch 'master' of github.com:etianen/django-watson 2017-08-22 13:55:13 +01:00
Dave Hall 2fd2bb66c0 Allowing joins to UUID columns in search(). Refs #214 2017-08-22 13:55:00 +01:00
Dave Hall 43e51ce760 Merge pull request #212 from alorence/master
Avoid "RemovedInDjango20Warning: on_delete will be a required arg for ForeignKey in Django 2.0" with recent versions of Django
2017-07-24 09:59:05 +01:00
Antoine Lorence 967a049985 Fix coding style issue
This should remove PEP8 issues introduced with last commit and reported by Flake8
2017-07-22 13:43:29 +02:00
Antoine Lorence f5e173e1a2 Set on_delete=CASCADE for ForeignKey model fields
This is the default behavior, but since on_delete argument will be required in Django 2.0, and a warning is thrown in recent versions of Django when the attribute is missing, it's better to set it in code. In addition, "explicit is better than implicit"
2017-07-22 12:46:36 +02:00
Dave Hall fa2ebaec13 v1.4.0 2017-07-07 10:23:34 +01:00
Dave Hall f72ba151bf Merge pull request #206 from moggers87/travis-tox
Re-enable Python 3.6 in tests
2017-06-20 11:44:23 +01:00
Matt Molyneaux 3eb3d19c45 Try testing with 3.3 and Django 1.8 2017-06-19 22:26:58 +01:00
Matt Molyneaux 729115994a Make sure coverage reports are done for each run on travis
Also, rename coverage-erase and coverage-report to begin and end to make
tox.ini easier to read.
2017-06-19 22:26:04 +01:00
Matt Molyneaux 300b9c70fe Use tox-travis when running tests on travis
This means we can now run tests against Python 3.5 and 3.6, where
previously we could not.
2017-06-19 19:13:12 +01:00
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