Daniel Quinn
ee939ae3bc
Merge branch 'case_sensitive_matches' of https://github.com/CkuT/paperless into CkuT-case_sensitive_matches
2016-10-26 10:01:54 +00:00
Daniel Quinn
f650fb0976
Merge branch 'synchrone-consumer-notifications'
2016-10-26 09:52:23 +00:00
Daniel Quinn
ca21929cee
Moved logging logic into the consumer
2016-10-26 09:52:09 +00:00
Daniel Quinn
b11825832d
Fixed conflicts
2016-10-26 09:42:48 +00:00
Daniel Quinn
77fda752ae
Merge branch 'synchrone-no_stripping_newlines'
2016-10-26 09:33:07 +00:00
Daniel Quinn
8e58406881
pep8 corrections
2016-10-26 09:32:59 +00:00
Cku
2c8e266181
Allow to create case sensitive matches
2016-10-14 19:35:06 +02:00
Aleksandr Bogdanov
63de2ca1b0
Collapsing excess whitespace after OCR
2016-10-12 01:46:34 +02:00
Aleksandr Bogdanov
71902d3f5c
Updating Django admin event log on document_consumption_finished
2016-10-05 20:42:43 +02:00
Daniel Quinn
14811a4a49
Update Django
2016-10-03 12:32:06 +01:00
Daniel Quinn
b66ec6ba27
Merge pull request #156 from avichalp/gunicorn-conf
...
Add gunicorn configuration file
2016-09-21 09:56:24 +01:00
avichalp
92900f5c7e
add gunicorn configuration file
2016-09-21 00:04:41 +05:30
Daniel Quinn
8b4f6364f6
Merge branch 'master' of github.com:danielquinn/paperless
2016-09-06 19:22:26 +01:00
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
cbfd1c5dd1
Merge branch 'master' of github.com:danielquinn/paperless
2016-09-03 15:19:28 +01:00
Daniel Quinn
5650e49558
Security update from Django
2016-09-03 15:19:22 +01:00
Daniel Quinn
6d8db93921
Merge pull request #152 from RubenWaterman/patch-1
...
Update setup.rst
2016-08-28 01:05:50 +01:00
Ruben Waterman
b6b39049a9
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-08-27 00:56:14 +02:00
Daniel Quinn
31012b7129
Updated changelog to include #150
2016-08-24 16:39:36 +01:00
Daniel Quinn
b72453bdd3
Merge pull request #150 from jbogatay/develop
...
Override media_root option
2016-08-24 16:37:56 +01:00
Daniel Quinn
252781f491
Updated changelog. I really should tag soon
2016-08-24 12:27:21 +01:00
Jeff Bogatay
f1edd107bf
Merge branch 'variable-media' into develop
2016-08-23 17:00:45 -04:00
Jeff Bogatay
6436e02923
Allow overriding default media directory
2016-08-23 14:48:13 -04:00
Daniel Quinn
4bc253dea4
Merge pull request #148 from jbogatay/master
...
Allow database location to be variable
2016-08-23 19:40:17 +01:00
Jeff Bogatay
a1cd05f9e2
Prettify code, change ENV variable name
2016-08-23 13:28:08 -04:00
Jeff Bogatay
c196e2eb66
Document new ENV variable
2016-08-23 12:24:51 -04:00
Jeff Bogatay
fc00416e32
Remove debug stuff
2016-08-23 12:22:36 -04:00
Jeff Bogatay
d1c469f7f4
Merge remote-tracking branch 'upstream/master'
2016-08-23 12:19:05 -04:00
Jeff Bogatay
93fb1be253
Make database location variable
2016-08-23 12:18:28 -04:00
Daniel Quinn
e9867aa29a
Merge pull request #147 from jbogatay/master
...
Secure document fetching
2016-08-23 16:52:30 +01:00
Jeff Bogatay
2a1818d09a
Secure document fetching
2016-08-23 11:31:54 -04:00
Daniel Quinn
0a0ff8da90
Fixed an ugly bug that broke all deletions
2016-08-23 15:54:09 +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
