Commit Graph

2300 Commits (7c8f6ce62f8200a34ea619d0887f556a2ec682fa)
 

Author SHA1 Message Date
OzzieIsaacs 98494c610a Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 649a553fa4 Merge remote-tracking branch 'metadata/master' into master 4 years ago
OzzieIsaacs e17a06d7bd Merge remote-tracking branch 'oauth/oauth-typo' into master 4 years ago
OzzieIsaacs 4b14cc6a74 Merge remote-tracking branch 'oauth/oauth-typo' into Develop 4 years ago
OzzieIsaacs 65560ab65e Merge remote-tracking branch 'google_oauth/patch-1' into master 4 years ago
OzzieIsaacs b65095fd0f Merge remote-tracking branch 'google_oauth/patch-1' into Develop 4 years ago
OzzieIsaacs 28733179d2 Merge remote-tracking branch 'caliblur/editMetaFix' into Develop 4 years ago
OzzieIsaacs 960d23ca50 Merge remote-tracking branch 'caliblur/blurPaginationFix' into Develop 4 years ago
blitzmann 3e378bd665 Some more clean up 4 years ago
blitzmann c120138f26 Fixes for pagination ugliness for caliBlur! style 4 years ago
blitzmann 31b20362ec caliBlur! style: Fixes issue with edit metadata button not getting styled correctly 4 years ago
blitzmann e7eb5b6ea6 Improvements to task processing
* Moves clean up to separate function for organization
* moves the `self.dequeued.append(item)` immediately after `self.queue.get()` so that we don't wait for it to show up

(cherry picked from commit bc9372e88f0c8855694431f811702d7fb899a97e)
4 years ago
OzzieIsaacs fe91ed815e Updated testresults with merged new worker 4 years ago
OzzieIsaacs 9e5cad0dc8 Merge new worker thread 4 years ago
OzzieIsaacs 36cbc42363 Better test output html file 4 years ago
blitzmann 4cb82ea9bd Revert testing condition that decreased number of tasks kept 4 years ago
blitzmann 572ac4a17b Fix for deleting old, completed tasks
(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)
4 years ago
Ozzie Isaacs 6c552f6b43 Update tests Windows 4 years ago
Ozzie Isaacs 9723129436 Updated dependency comicapi version 4 years ago
Ozzie Isaacs dc5191f8ba Added unrar binary is found on windows 4 years ago
OzzieIsaacs d79726899f Updated testresult linux 4 years ago
Ozzie Isaacs 8ab5710098 Updated testresuts Windows 4 years ago
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