user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,346 Commits 4 Branches 26 Tags
093f90d4c1971038822ad9338c484fa28f3cfe29
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ozzieisaacs 093f90d4c1 Update translation files 2020-10-10 11:38:40 +02:00
Ozzieisaacs 20ffa325d3 Fix #1642 2020-10-10 10:53:08 +02:00
Ozzieisaacs 85d5afd6d9 Merge branch 'Develop' into master 2020-10-10 10:38:11 +02:00
OzzieIsaacs df295e92ee Merge remote-tracking branch 'origin/Develop' into Develop 2020-10-10 10:33:12 +02:00
Ozzieisaacs 2e67bd2407 Fix add to shelf from search 2020-10-10 10:32:53 +02:00
OzzieIsaacs 9aa01ee8cf Merge branch 'master' into Develop 2020-10-10 10:14:33 +02:00
OzzieIsaacs 6b993ad329 Update test results 2020-10-10 10:14:09 +02:00
OzzieIsaacs d70ded0993 Fix for search 2020-10-10 07:47:27 +02:00
OzzieIsaacs 3dacdcc8bb Merge remote-tracking branch 'worker/db' into Develop 2020-10-10 07:31:08 +02:00
OzzieIsaacs bb03026589 Fixes from merge problems 2020-10-10 07:30:03 +02:00
Ozzieisaacs 1f4564da76 Merge remote-tracking branch 'es/patch-1' into master 2020-10-06 21:48:42 +02:00
OzzieIsaacs 3b8e5ddfb3 Merge remote-tracking branch 'worker/db' into Develop 
# Conflicts:
#	cps/tasks/convert.py
 2020-10-06 21:40:47 +02:00
OzzieIsaacs 4b68a6ff23 Updates tests 2020-10-04 19:25:06 +02:00
Ozzieisaacs 28116c49dc Merge branch 'worker_task' into Develop 2020-10-04 19:23:32 +02:00
Ozzieisaacs 6e6f144b7a Paginated search and advanced search 
Wraparound on books list deactivated
 2020-10-04 19:23:06 +02:00
Ozzieisaacs e3f4f24c3e Fixes for failed email and conversions with gdrive 2020-10-04 13:59:33 +02:00
Ozzieisaacs eb37e3a52b Fix UI Deelete Buttons in Edit Books page 
Fix Conversion of multiple formats of one book in the queue with gdrive
 2020-10-04 12:09:52 +02:00
Ozzieisaacs 95d540630e Change ldap_certpath to file 2020-10-04 06:15:35 +02:00
Ozzieisaacs 23d66a0d68 Fix 2020-10-03 21:43:48 +02:00
Ozzieisaacs 0d64692c84 Fix for convert + email task with gdrive 2020-09-30 19:29:57 +02:00
Ozzieisaacs 1cb640e51e Update minimum required version of SQLAlchemy (Fix #1641) 2020-09-29 18:19:00 +02:00
Ozzieisaacs 2d98285545 Update minimum required version of SQLAlchemy 2020-09-29 18:16:56 +02:00
OzzieIsaacs 376001100a Bugfixes from last testrun 2020-09-28 21:24:47 +02:00
Ozzieisaacs e2954249f8 Update chinese translation 2020-09-27 19:22:41 +02:00
Ozzieisaacs cc0b0196f4 Store UI settings in flask session for guest user 2020-09-27 19:12:10 +02:00
Ozzieisaacs 6dfa171b4e Added id's for testing 
moved downloaded books section
 2020-09-27 16:00:17 +02:00
Ozzieisaacs b140073988 Merge branch 'master' into Develop 
Fix #1629 (Gevent Tracebacks with SSL encryption)
 2020-09-27 13:02:25 +02:00
Ozzieisaacs c22bc857b0 Fix #1629 (Gevent Tracebacks with SSL encryption) 2020-09-27 13:00:07 +02:00
Ozzieisaacs 497fbdcdfc Save view settings 2020-09-27 12:37:41 +02:00
Ozzieisaacs 861f1b2ca3 Merge branch 'master' into Develop 
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
 2020-09-27 08:54:32 +02:00
Ozzieisaacs 6108ef4c89 Version update to 0.6.10 Beta 2020-09-27 07:43:56 +02:00
OzzieIsaacs a9c0bcb4a2 Updated testresults 
Version bump for release
 2020-09-27 07:15:03 +02:00
Ozzieisaacs e61e94f0fa Merge remote-tracking branch 'it/patch-15' into master 
Updated Translations
 2020-09-26 16:19:34 +02:00
Ozzieisaacs 85aac02593 Merge remote-tracking branch 'css/master' into master 2020-09-26 16:13:53 +02:00
Ozzieisaacs 9a678c41fe Fix error from merge 2020-09-26 09:42:40 +02:00
Ozzieisaacs 7c8f6ce62f Merge branch 'master' into Develop 
# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py
 2020-09-26 07:54:38 +02:00
Ozzieisaacs 9a896ea81e Removed logging of headers as it caused trouble while showing logfile in UI 2020-09-26 07:51:29 +02:00
Ozzieisaacs 422c1893c0 Fix for the fix cover_url 2020-09-24 11:02:12 +02:00
Ozzieisaacs bed1b24340 Fixes from test of upload restrictions 2020-09-24 10:54:02 +02:00
Ozzieisaacs da909ff084 Fixes from test of upload restrictions 2020-09-23 20:50:34 +02:00
Ozzieisaacs 8f743b70a4 Revert the tolino stuff 2020-09-22 20:25:58 +02:00
Ozzieisaacs a761017116 Additional debug output for #1527 2020-09-21 19:09:02 +02:00
Ozzieisaacs f06cc25a99 Fix for immediate logout with next="/logout" 
Fix tolino per default with deactivated Strict-Transport-Security
 2020-09-21 18:34:39 +02:00
Ozzieisaacs eff8480d5c Show listen in browser formats in lowercase 2020-09-21 18:24:50 +02:00
Ozzieisaacs eec303de49 Fix #1621 (Link to contributing.md file wrong) 2020-09-21 14:18:23 +02:00
Ozzieisaacs 7ba014ba49 Fix "is not a valid language" on upload of comic books 
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
 2020-09-20 15:05:52 +02:00
Ozzieisaacs 165c649f31 Fix "is not a valid language" on upload 2020-09-20 11:44:03 +02:00
Ozzieisaacs 4cf71dd336 Fix "is not a valid language" on upload 2020-09-20 11:41:44 +02:00
Ozzieisaacs c0a401216b Add links to contribution guidelines 2020-09-20 10:10:58 +02:00
Ozzieisaacs 2d712a3841 Fix #1612 2020-09-20 10:03:05 +02:00
Ozzieisaacs a2b5b4dd17 Merge remote-tracking branch 'identifier/master' into master 2020-09-20 10:01:46 +02:00
OzzieIsaacs e29247774c Bugfixes for uploading books to GDrive with new worker 2020-09-12 13:55:36 +02:00
OzzieIsaacs d137735be1 Fix #805 (First request to gdrive fails) 2020-09-11 20:56:54 +02:00
OzzieIsaacs b202ca5619 Updated test result 2020-09-09 07:00:09 +02:00
OzzieIsaacs 7929711fea Improvements for file uploading format restriction 2020-09-08 20:57:39 +02:00
OzzieIsaacs 49a028a599 Bugfix not unlink generic cover on upload 2020-09-08 19:04:04 +02:00
OzzieIsaacs 670cbcd336 Merge branch 'master' into Develop 2020-09-07 21:33:11 +02:00
Ozzieisaacs 449d31e8a1 Refactored update_dir_structure_file 2020-09-07 21:26:59 +02:00
Ozzieisaacs fe82583813 Merge branch 'database_fix' into Develop 2020-09-07 21:23:35 +02:00
Ozzieisaacs 1450a21d00 Fix links to amazon (#1461) 2020-09-07 18:27:43 +02:00
Ozzieisaacs ae15544aed Merge branch 'master' into database_fix 
# Conflicts:
#	cps/editbooks.py
 2020-09-07 18:21:33 +02:00
Ozzieisaacs 4b7a37cf7d Bugfix empty email attachment size 2020-09-07 18:19:54 +02:00
Ozzieisaacs e012726cd4 Fix #1461 (parse Amazon_* identifiers) 2020-09-06 19:31:31 +02:00
Ozzieisaacs f49688fdb9 Fix #1461 (parse Amazon_* identifiers) 2020-09-06 19:31:03 +02:00
Ozzieisaacs e32b017431 Revert "Test revert global Session" 
This reverts commit 393869e538.
 2020-09-06 10:59:34 +02:00
Ozzieisaacs 393869e538 Test revert global Session 2020-09-06 10:27:10 +02:00
Ozzieisaacs d3bde0408f Improvederror handling for editing identifier 2020-09-05 18:47:28 +02:00
Ozzieisaacs 34d3225984 Errorhandling edit identifier 2020-09-05 18:46:11 +02:00
Ozzieisaacs eaed53e25b Fix for author edit error (2 same sort_authors lead maybe to choose wrong one) 2020-09-05 18:23:14 +02:00
OzzieIsaacs feacbe8ebd Possible Fix for database crash after adding new format and accessing calibre database afterwards 2020-09-05 10:24:32 +02:00
Ozzieisaacs ec0a0190e7 Merge remote-tracking branch 'polish/master' into master 2020-09-01 20:18:29 +02:00
OzzieIsaacs f825c5ae83 Merge branch 'master' into Develop 2020-09-01 19:26:13 +02:00
OzzieIsaacs 173484c30e Fix #1002, #1581 (Public shelfs not accessible as guest user) 2020-09-01 19:25:57 +02:00
OzzieIsaacs 884270093b Merge remote-tracking branch 'worker/tasks' into Develop 2020-08-31 13:00:13 +02:00
OzzieIsaacs 1a9a436cbe Fixed wrong translation string 
Removed unused variables from callback in server.py
Update Testresults
 2020-08-30 17:11:11 +02:00
OzzieIsaacs 62dd29d2f3 Renamed email to mail due to naming conflict in python2 2020-08-30 08:49:53 +02:00
OzzieIsaacs d406d91856 Merge remote-tracking branch 'worker/tasks' into Develop 2020-08-30 08:32:09 +02:00
OzzieIsaacs 98494c610a Merge branch 'master' into Develop 2020-08-30 08:31:35 +02:00
OzzieIsaacs 649a553fa4 Merge remote-tracking branch 'metadata/master' into master 2020-08-30 08:30:32 +02:00
OzzieIsaacs e17a06d7bd Merge remote-tracking branch 'oauth/oauth-typo' into master 2020-08-30 08:28:27 +02:00
OzzieIsaacs 4b14cc6a74 Merge remote-tracking branch 'oauth/oauth-typo' into Develop 2020-08-30 08:28:14 +02:00
OzzieIsaacs 65560ab65e Merge remote-tracking branch 'google_oauth/patch-1' into master 2020-08-30 08:26:48 +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
OzzieIsaacs fe91ed815e Updated testresults with merged new worker 2020-08-29 12:46:12 +02:00
OzzieIsaacs 9e5cad0dc8 Merge new worker thread 2020-08-29 11:14:52 +02:00
OzzieIsaacs 36cbc42363 Better test output html file 2020-08-28 16:51:53 +02:00
OzzieIsaacs d79726899f Updated testresult linux 2020-08-26 21:44:31 +02:00
OzzieIsaacs 61d628d596 oauth problem solved 2020-08-26 18:22:56 +02: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
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
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