Commit Graph

371 Commits

Author SHA1 Message Date
Daniel Quinn 524d64c694 Merge branch 'master' of github.com:danielquinn/paperless 2016-09-06 17:53:41 +01:00
Daniel Quinn ddf4214080 Merge pull request #152 from RubenWaterman/patch-1
Update setup.rst
2016-09-06 17:53:41 +01:00
Daniel Quinn 38b63fbe77 Updated changelog to include #150 2016-09-06 17:53:41 +01:00
Ruben Waterman 4708f63138 Update setup.rst
Added a line on how to use the ubuntu upstart example in Vagrant. It took me hours to figure out why it wouldn't start on boot but would when you would type "start paperless-server" manually. The start on vagrant-mounted solved the problem, so I thought it would be good to share this with the paperless community.
2016-09-06 17:53:41 +01:00
Daniel Quinn ccb0bcb7d7 Merge pull request #150 from jbogatay/develop
Override media_root option
2016-09-06 17:53:41 +01:00
Jeff Bogatay 6e49995c0c Merge branch 'variable-media' into develop 2016-09-06 17:53:41 +01:00
Jeff Bogatay a85096775e Allow overriding default media directory 2016-09-06 17:53:41 +01:00
Daniel Quinn 509f7d908e Updated changelog. I really should tag soon 2016-09-06 17:53:34 +01:00
Daniel Quinn b7209a19b2 Merge pull request #148 from jbogatay/master
Allow database location to be variable
2016-09-06 17:53:26 +01:00
Jeff Bogatay 69466e712b Prettify code, change ENV variable name 2016-09-06 17:53:26 +01:00
Daniel Quinn 630a3119b5 Merge pull request #147 from jbogatay/master
Secure document fetching
2016-09-06 17:53:26 +01:00
Jeff Bogatay 74c5537979 Document new ENV variable 2016-09-06 17:53:26 +01:00
Jeff Bogatay 05f3cad271 Secure document fetching 2016-09-06 17:53:26 +01:00
Jeff Bogatay 5e6e1ce959 Remove debug stuff 2016-09-06 17:53:26 +01:00
Jeff Bogatay 1c78fb633e Merge remote-tracking branch 'upstream/master' 2016-09-06 17:53:26 +01:00
Jeff Bogatay 7b8914132d Make database location variable 2016-09-06 17:53:26 +01:00
Daniel Quinn 5662035efd Fixed an ugly bug that broke all deletions 2016-09-06 17:53:22 +01:00
Daniel Quinn 5650e49558 Security update from Django 2016-09-03 15:19:22 +01:00
Daniel Quinn 9e845ba813 Remove complaints about the consumer chain 2016-08-21 13:41:50 +01:00
Daniel Quinn fc5f5d9d00 Merge pull request #145 from danielquinn/issue/144
Issue/144
2016-08-21 10:50:54 +01:00
Daniel Quinn 66ae60dc23 Added py.test 'cause it's prettier 2016-08-21 10:48:41 +01:00
Daniel Quinn 0948796e77 Added issues #121 and #131 to the changelog 2016-08-21 10:48:08 +01:00
Daniel Quinn fdc171383c Fixed some syntax errors 2016-08-21 10:45:01 +01:00
Daniel Quinn c5aafdb43d Added some configs for Apache & Nginx/gunicorn 2016-08-21 10:44:52 +01:00
Daniel Quinn 53909cf9b0 Merge pull request #143 from danielquinn/issue/121
Actually write the date found in the file name.  Closes #121.
2016-08-20 18:16:55 +01:00
Daniel Quinn 47e42ed78b Merge branch 'master' into issue/121 2016-08-20 18:16:07 +01:00
Daniel Quinn 01919f75d9 pep8 2016-08-20 18:14:33 +01:00
Daniel Quinn 1ce76a5486 Actually write the date found in the file name 2016-08-20 18:11:51 +01:00
Daniel Quinn c7dda9de96 A quick & easy way to see the logs 2016-08-20 18:08:28 +01:00
Daniel Quinn f81e44f67e Merge pull request #142 from danielquinn/issue/131
Account for thumbnail deletion as well
2016-08-20 14:09:31 +01:00
Daniel Quinn 3bbcd562fc Account for thumbnail deletion as well 2016-08-20 14:03:42 +01:00
Daniel Quinn f01ee79165 Merge pull request #140 from danielquinn/issue/131
Fix for #131: delete files on document.delete
2016-08-16 20:01:41 +01:00
Daniel Quinn 22ec6f1808 Updated Django to 1.10 along with DRF (required) 2016-08-16 19:58:42 +01:00
Daniel Quinn 3b9893b8d4 Version bump for 1.9.x security release 2016-08-16 19:34:54 +01:00
Daniel Quinn 7adda9ac50 Reversion until I can get 1.10 working right 2016-08-16 19:29:32 +01:00
Daniel Quinn f5daded930 Fix for #131: delete files on document.delete 2016-08-16 19:13:37 +01:00
Daniel Quinn 58a299b671 Added VersionEye as per #138 2016-08-16 17:16:51 +01:00
Daniel Quinn fec9c9678d Merge pull request #139 from JamieMagee/python-3_5_2
Use latest Python 3.5
2016-08-16 16:32:41 +01:00
Jamie Magee ffd198de28 Use latest Python 3.5
`python:3.5` matches to the latest 3.5.x version. See https://hub.docker.com/_/python/ for more info
2016-08-16 17:24:47 +02:00
Daniel Quinn 88545c4d6b Merge pull request #137 from JamieMagee/django-1_10
Upgrade Django to 1.10
2016-08-16 16:19:41 +01:00
Jamie Magee 593570e6b3 Upgrade Django to 1.10
This includes a security patch for CVE-2016-6186
2016-08-16 16:52:59 +02:00
Daniel Quinn de92423006 Make the logs easier to read 2016-07-19 14:13:59 +01:00
Daniel Quinn 48bca7ea57 Added docs for pre-consume hook 2016-07-01 14:47:17 -07:00
Daniel Quinn 8d992335f3 Merge pull request #129 from phryneas/patch-1
wait until file is completely transmitted
2016-06-26 08:33:30 -07:00
Lenz Weber 018efc576b wait until file is completely transmitted
negation was missing for feature to be active, see #128
2016-06-26 10:18:58 +02:00
Daniel Quinn c1ed4e8238 Allow for upgrades of most of the dependencies 2016-06-25 09:02:32 -07:00
Daniel Quinn 5ed359f3ea Merge pull request #127 from phryneas/master
add pre-consume hook
2016-06-24 08:41:11 -07:00
Lenz Weber e7566d2b1c style changes, variable renames
* PEP8 conformity
* rename run_post_consume_external_script to run_post_consume_script
* rename run_pre_consume_external_script to run_pre_consume_script
* change order of declaration and use from post...pre to pre...post
2016-06-24 16:53:55 +02:00
Lenz Weber c728b1dd21 add pre-consume hook
a script hook can be defined in /etc/paperless.conf as
PAPERLESS_PRE_CONSUME_SCRIPT
2016-06-23 21:57:17 +02:00
Daniel Quinn 7b88cea07b Merge pull request #124 from bmartin5692/master
Added a density setting
2016-05-16 10:27:20 +01:00