mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-19 16:24:55 +00:00
Code Issues Releases Wiki Activity
2,246 Commits 3 Branches 24 Tags 101 MiB
bdf6052388
Commit Graph

1929 Commits

Author SHA1 Message Date
norangebit
bdf6052388
Conversion to kepub when creating a sync token 2020-09-03 21:57:14 +02:00
norangebit
99d653eece
Add automatic conversion in kepub 
Automatic conversion from epub to kepub of new book on Kobo sync.
 2020-09-01 19:27:14 +02:00
OzzieIsaacs
4b14cc6a74 Merge remote-tracking branch 'oauth/oauth-typo' into Develop 2020-08-30 08:28:14 +02:00
OzzieIsaacs
b65095fd0f Merge remote-tracking branch 'google_oauth/patch-1' into Develop 2020-08-30 08:26:34 +02:00
OzzieIsaacs
28733179d2 Merge remote-tracking branch 'caliblur/editMetaFix' into Develop 2020-08-30 08:25:17 +02:00
OzzieIsaacs
960d23ca50 Merge remote-tracking branch 'caliblur/blurPaginationFix' into Develop 2020-08-30 08:23:06 +02:00
blitzmann
3e378bd665 Some more clean up 2020-08-29 21:04:49 -04:00
blitzmann
c120138f26 Fixes for pagination ugliness for caliBlur! style 2020-08-29 20:58:30 -04:00
blitzmann
31b20362ec caliBlur! style: Fixes issue with edit metadata button not getting styled correctly 2020-08-29 18:45:23 -04:00
OzzieIsaacs
9e5cad0dc8 Merge new worker thread 2020-08-29 11:14:52 +02:00
blitzmann
4cb82ea9bd Revert testing condition that decreased number of tasks kept 2020-08-27 21:49:55 -04:00
blitzmann
572ac4a17b Fix for deleting old, completed tasks 
(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3)
 2020-08-27 21:46:20 -04:00
Ozzie Isaacs
dc5191f8ba Added unrar binary is found on windows 2020-08-27 21:01:45 +02:00
Ozzie Isaacs
8ab5710098 Updated testresuts Windows 2020-08-26 21:43:58 +02:00
OzzieIsaacs
61d628d596 oauth problem solved 2020-08-26 18:22:56 +02:00
Sean Leonard
078fc25845
Remove Google+ OAuth scope 
The scope is no longer available per https://developers.google.com/+/api-shutdown

Fixes #1472 
Fixes #1573
 2020-08-26 08:56:56 -07:00
Marvel Renju
67eb4b317a Fix typo 
google oauth provider obtain link was pointing to github
 2020-08-26 03:15:39 +01:00
blitzmann
6322919bc7 Merge branch 'Develop' into tasks 
# Conflicts:
#	cps/db.py
 2020-08-25 00:15:41 -04:00
blitzmann
b81b8a1dea Fix registration email 2020-08-25 00:05:20 -04:00
blitzmann
f3a3797850 Fail the convert task if the email subtask fails 2020-08-24 21:28:55 -04:00
blitzmann
5ec1283bb1 Remove threading for the calibre DB class 2020-08-24 21:03:59 -04:00
blitzmann
8634b0c6f0 Remove left over placeholder code 2020-08-24 21:00:15 -04:00
Ozzie Isaacs
d89830af61 Fix anonymous user has no modified_flag error 2020-08-24 21:00:13 +02:00
Ozzie Isaacs
ef1736b571 Fix error on guest user (view settings missing) 2020-08-24 20:38:06 +02:00
blitzmann
04081f62c4 Delete old worker thread class / logic 2020-08-23 23:34:41 -04:00
blitzmann
0f28dc5e55 Remove the queue stuff for CalibreDB (is no longer used) 2020-08-23 23:17:07 -04:00
blitzmann
508f49df18 Remove completed tasks and sort the tasks by date added when calling .tasks 2020-08-23 23:00:23 -04:00
blitzmann
bec280c6b1 Add some error handling 2020-08-23 21:51:44 -04:00
blitzmann
6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks 
# Conflicts:
#	cps/helper.py
 2020-08-23 21:38:56 -04:00
blitzmann
ac22483f98 Add error handling to the email task within the convert task 2020-08-23 21:35:05 -04:00
blitzmann
59d56d5c83 py27 support (I think) and some clean up 2020-08-23 21:21:55 -04:00
OzzieIsaacs
cdaad2fb4a Merge branch 'master' into Develop 2020-08-23 21:23:00 +02:00
OzzieIsaacs
843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 2020-08-23 21:22:44 +02:00
blitzmann
a000de0270 Some clean up 2020-08-23 13:33:57 -04:00
blitzmann
bf41b04cfa Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed 2020-08-23 13:07:24 -04:00
blitzmann
9ce2e8ea53 Fix progress indication for emails that have been completed. 2020-08-23 12:58:24 -04:00
OzzieIsaacs
f066926fc9 Merge branch 'master' into Develop 2020-08-23 10:56:10 +02:00
OzzieIsaacs
4c38b0ab10 Prepare for save name sort order 2020-08-23 10:56:00 +02:00
OzzieIsaacs
cf35c9dcef Merge remote-tracking branch 'name/patch-2' into master 2020-08-23 10:53:18 +02:00
OzzieIsaacs
45ff9394f2 Fix comma separated author names during for upload 2020-08-23 09:44:42 +02:00
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) 2020-08-22 23:35:48 -04:00
blitzmann
2533c9c14e Continue converting tasks - email and upload tasks 2020-08-22 22:44:28 -04:00
blitzmann
f10f0dada6 First working PoC with a new task structure 2020-08-22 16:31:00 -04:00
OzzieIsaacs
282859bc1b Merge remote-tracking branch 'github/master' into master 2020-08-22 15:38:40 +02:00
OzzieIsaacs
a3ae97a5a3 Fix #1574 (author name not shown in change book order in shelfs) 2020-08-22 15:37:40 +02:00
OzzieIsaacs
ed8275a20b Fix #1574 (author name not shown in change book order in shelfs) 2020-08-22 15:35:21 +02:00
OzzieIsaacs
f2add3f788 Migration of view settings working in User database 
Book Merge gives now feedback on what is done
 2020-08-22 10:27:09 +02:00
OzzieIsaacs
ad144922fb Merge with master 2020-08-22 09:23:29 +02:00
OzzieIsaacs
b9c0f2a3d3 Merge remote-tracking branch 'origin/master' into master 2020-08-21 19:27:19 +02:00
OzzieIsaacs
0cc07362b8 Fix for #1573 2020-08-21 19:26:58 +02:00