Commit Graph

729 Commits

Author SHA1 Message Date
dependabot[bot]
16b7ecb0a3 Bump cryptography from 3.1 to 3.2
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.1 to 3.2.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/3.1...3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-27 23:06:22 +00:00
th3r00t
52544bb0be Update .gitattributes 2020-10-05 10:08:49 -04:00
=
7a17275049 Merge 'master' of github.com:th3r00t/pyShelf 2020-09-21 17:27:51 -04:00
=
1f75f40c5d editor changes,still use req.txt for docker. 2020-09-21 17:23:55 -04:00
th3r00t
492469bef5 Update README.md 2020-09-21 13:32:44 -04:00
th3r00t
41c7cd4e11 Working on attributes file 2020-09-19 02:37:27 -04:00
th3r00t
4ac9d34aeb Update README.md 2020-09-18 21:17:13 -04:00
th3r00t
777037d8e2 Merge pull request #59 from th3r00t/development
Release Development Branch Version 0.6.0 To Master.
2020-09-18 21:14:56 -04:00
th3r00t
503283455d Merge branch 'master' into development 2020-09-18 21:12:42 -04:00
th3r00t
a33950c4af Merge remote-tracking branch 'origin/development' into development 2020-09-18 13:59:17 -04:00
th3r00t
57fdec44d7 Updated images 2020-09-18 13:56:54 -04:00
th3r00t
31f2bd7214 Update README.md
Removed matrix link
2020-09-12 22:47:20 -04:00
th3r00t
c0bff98e2a Fixed websocket testing routine. 2020-09-12 22:45:01 -04:00
th3r00t
ed5e478f25 Merge pull request #58 from th3r00t/0.6.0--cleanup
0.6.0  cleanup
2020-09-12 13:39:15 -04:00
th3r00t
59c780afe4 Updated for 0.6.0 release 2020-09-12 13:32:50 -04:00
th3r00t
732a82aa17 Frontend modified to new django asgi standard 2020-09-12 13:05:47 -04:00
th3r00t
30ae3be67d Change the way config is called 2020-09-11 21:12:22 -04:00
th3r00t
d4a7fb0b7d Added whitenoise to serve static files 2020-09-11 21:08:16 -04:00
th3r00t
f275a5c22a Expose websocket port 2020-09-11 18:26:54 -04:00
th3r00t
6617d791ad Run configure on container init 2020-09-11 18:26:06 -04:00
th3r00t
308e3dbaed Expose websocket port 2020-09-11 18:25:36 -04:00
th3r00t
58c0f21784 Prompt for book directory when not set. 2020-09-11 17:35:46 -04:00
th3r00t
31aeb82c3d Default to production mode. 2020-09-11 17:07:10 -04:00
th3r00t
68d453edc8 Phased out nginx in favor of running django under daphne with asgi.
Adjusted the docker image in favor of this, & fixed urls.py which was
missing the static request responder.
2020-09-11 16:50:17 -04:00
Raelon Masters
0391bb94a4 Updated static files, and docker 2020-09-10 20:54:00 -04:00
th3r00t
88c0eff293 Adjusted logging to avoid max recursion errors 2020-09-10 14:11:55 -04:00
th3r00t
b23cbf17d5 Added createsuperuser function, & execute it from configure. This
enables docker users to access the django administration site without
requiring access to a cli
2020-09-03 22:17:07 -04:00
th3r00t
c0a4c3e8c1 Merge pull request #57 from th3r00t/0.6.0--scanning_in-situ
0.6.0  scanning in situ
2020-09-02 18:36:14 -04:00
th3r00t
8479b56255 Merge branch 'development' into 0.6.0--scanning_in-situ 2020-09-02 18:35:47 -04:00
th3r00t
85fa88dcb0 On demand import functionality, held together with ductape and bubblegum. 2020-09-02 17:42:08 -04:00
th3r00t
938ef39821 Began implementing on-demand websocket server 2020-08-28 22:22:16 -04:00
th3r00t
f2729e05db Implemented new logging functions, refactored to suit. 2020-08-25 13:59:06 -04:00
th3r00t
59719c19f2 Remvoed docs from repo, devs can generate with doxygen 2020-08-25 13:56:04 -04:00
Raelon Masters
5429b7ee00 Import Books now working in ui, Working on logging. 2020-08-15 01:09:28 -04:00
Raelon Masters
3f99c15038 A most inelegant hack. 2020-08-10 13:19:35 -04:00
Raelon Masters
6f06796cba Websocket connection, w bi-directional transport complete 2020-08-09 18:33:20 -04:00
th3r00t
c22f42358c Merge pull request #56 from MartenBE/docker-added-cron
Moved DEBUG variable to config
2020-08-09 18:26:38 -04:00
MartenBE
d0fb22dccd Added pudb to requirements 2020-08-10 00:00:44 +02:00
MartenBE
a2cd08efe7 Fixed small error in Config 2020-08-09 23:57:44 +02:00
MartenBE
205a65cde2 Removed secret from config.json 2020-08-09 23:56:14 +02:00
MartenBE
88d0295ae1 Moved DEBUG variable to config 2020-08-09 23:52:32 +02:00
th3r00t
cf9e5a240a Merge pull request #55 from MartenBE/docker-added-cron
Added cron to the Dockerfile as temporary fix until we have periodic file scanning in the backend
2020-08-09 11:27:13 -04:00
MartenBE
a6baddf611 Restored config.json 2020-08-09 17:17:14 +02:00
Raelon Masters
fcfb347fbf Ignore Pipfile.lock 2020-08-09 10:50:14 -04:00
th3r00t
edee4c9c46 Update .gitignore 2020-08-09 10:42:27 -04:00
MartenBE
7bbe8c900d Added cron to the Dockerfile as temporary fix until we have periodic file scanning in the backend 2020-08-09 15:51:24 +02:00
Raelon Masters
e0c79ff837 client not waiting connection prior to ping 2020-08-09 00:17:24 -04:00
Raelon Masters
f3d9d8160f Websocket connection established 2020-08-08 10:12:06 -04:00
Raelon Masters
5d97c066a9 Added import btn, Catalog overide, started server backend 2020-08-07 12:25:33 -04:00
Raelon Masters
30f60e4ec3 buttons for importBooks, and logout. 2020-08-04 13:18:44 -04:00