Commit Graph

9 Commits (4cb82ea9bd736f41d0f3a4eee530d8d1b2cdd70d)

Author SHA1 Message Date
OzzieIsaacs b9c0f2a3d3 Merge remote-tracking branch 'origin/master' into master 4 years ago
Ozzie Isaacs 4d44746a88 Change settings database gdrive watch to JSON 4 years ago
OzzieIsaacs 1535bdbcd8 Merge remote-tracking branch 'memorydatabase/issue/1564' 4 years ago
Ozzie Isaacs 66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 4 years ago
OzzieIsaacs 0cf1cc5587 Fixes from tests 5 years ago
Ozzieisaacs b75497231e Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result) 5 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 5 years ago
Ozzieisaacs 86fe970651 More fixes for googledrive 5 years ago
Ozzieisaacs 4708347c16 Merge branch 'Develop'
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
6 years ago