Commit Graph

2278 Commits (b202ca56193cc84f89e85eac2a18b004a1458967)
 

Author SHA1 Message Date
OzzieIsaacs 61d628d596 oauth problem solved 4 years ago
Sean Leonard 078fc25845
Remove Google+ OAuth scope
The scope is no longer available per https://developers.google.com/+/api-shutdown

Fixes #1472 
Fixes #1573
4 years ago
Marvel Renju 67eb4b317a Fix typo
google oauth provider obtain link was pointing to github
4 years ago
blitzmann 6322919bc7 Merge branch 'Develop' into tasks
# Conflicts:
#	cps/db.py
4 years ago
blitzmann b81b8a1dea Fix registration email 4 years ago
blitzmann f3a3797850 Fail the convert task if the email subtask fails 4 years ago
blitzmann 5ec1283bb1 Remove threading for the calibre DB class 4 years ago
blitzmann 8634b0c6f0 Remove left over placeholder code 4 years ago
Ozzie Isaacs d89830af61 Fix anonymous user has no modified_flag error 4 years ago
Ozzie Isaacs ef1736b571 Fix error on guest user (view settings missing) 4 years ago
blitzmann 04081f62c4 Delete old worker thread class / logic 4 years ago
blitzmann 0f28dc5e55 Remove the queue stuff for CalibreDB (is no longer used) 4 years ago
blitzmann 508f49df18 Remove completed tasks and sort the tasks by date added when calling `.tasks` 4 years ago
blitzmann bec280c6b1 Add some error handling 4 years ago
blitzmann 6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks
# Conflicts:
#	cps/helper.py
4 years ago
blitzmann ac22483f98 Add error handling to the email task within the convert task 4 years ago
blitzmann 59d56d5c83 py27 support (I think) and some clean up 4 years ago
OzzieIsaacs cdaad2fb4a Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 4 years ago
blitzmann a000de0270 Some clean up 4 years ago
blitzmann bf41b04cfa Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed 4 years ago
blitzmann 9ce2e8ea53 Fix progress indication for emails that have been completed. 4 years ago
OzzieIsaacs f066926fc9 Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 4c38b0ab10 Prepare for save name sort order 4 years ago
OzzieIsaacs cf35c9dcef Merge remote-tracking branch 'name/patch-2' into master 4 years ago
OzzieIsaacs 45ff9394f2 Fix comma separated author names during for upload 4 years ago
blitzmann 414043ded1 Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment) 4 years ago
blitzmann 2533c9c14e Continue converting tasks - email and upload tasks 4 years ago
blitzmann f10f0dada6 First working PoC with a new task structure 4 years ago
OzzieIsaacs 282859bc1b Merge remote-tracking branch 'github/master' into master 4 years ago
OzzieIsaacs a3ae97a5a3 Fix #1574 (author name not shown in change book order in shelfs) 4 years ago
OzzieIsaacs ed8275a20b Fix #1574 (author name not shown in change book order in shelfs) 4 years ago
OzzieIsaacs f2add3f788 Migration of view settings working in User database
Book Merge gives now feedback on what is done
4 years ago
OzzieIsaacs ad144922fb Merge with master 4 years ago
OzzieIsaacs b9c0f2a3d3 Merge remote-tracking branch 'origin/master' into master 4 years ago
OzzieIsaacs 0cc07362b8 Fix for #1573 4 years ago
Brandon Ingli 4ee5dcaff3
Elevate Log Messages in web.py
Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.
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
OzzieIsaacs ecb160b28d Merge remote-tracking branch 'pypy/fix-pypy3-settings-database-error' 4 years ago
OzzieIsaacs 7e9941def0 Updated test results 4 years ago
OzzieIsaacs f9c6fb30bf Excluded series type again, as it causes problems upon reconnect 4 years ago
Ozzie Isaacs 94ad93ebd7 Added series like custom columns #1501 4 years ago
blitzmann 0e1ec5034e Fix for #1564 - using memory database in multiple threads.
See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
4 years ago
Marvel Renju 76b0505bd9 Change all "conn = engine.connect()" statements to "with engine.connect() as conn:" in ub.py
Changed all the statements in ub.py to use python context managers so that conn.close() is called automatically.  (https://docs.sqlalchemy.org/en/13/core/connections.html)
4 years ago
OzzieIsaacs b309c1fc91 Fix filenames (Escape "\") for searching calibre excecutable on windows 4 years ago
OzzieIsaacs b9a802a19c Merge remote-tracking branch 'cover_path/patch-1' 4 years ago
OzzieIsaacs a882ad3e65 Merge remote-tracking branch 'contrib/patch-1' 4 years ago
Ryan Holmes 969105b205
Trim whitespace from filename
This avoids an OSError when the book's metadata has whitespace at the end of it.
4 years ago
Ryan Holmes 28bfb06c67
Revert the deletion of another line
This was done by mistake, whoops!
4 years ago