user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,345 Commits 4 Branches 26 Tags
406d1c76c943cc5366246f58e159fb5a823d2bea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ozzieisaacs 406d1c76c9 Sorting and filtering of lists working (except file formats) 
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
 2019-04-22 19:11:35 +02:00
Ozzieisaacs bfd0e87a17 Merge branch 'master' into Develop 
# Conflicts:
#	cps/helper.py
#	cps/reverseproxy.py
 2019-04-21 08:50:31 +02:00
Ozzieisaacs 6a7b8c7870 Update Version info 
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
 2019-04-21 08:48:51 +02:00
Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop 
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
 2019-04-20 18:32:46 +02:00
Ozzieisaacs f1a65a2aeb Clarified licences for isolanguages.py and reverseproxy.py 2019-04-20 17:57:06 +02:00
Ozzieisaacs cc5c2c0f65 Update Version info 2019-04-20 12:30:33 +02:00
Ozzieisaacs c748716ad2 Fix for opds feed of unread/read books 2019-04-19 12:07:46 +02:00
Ozzieisaacs 544405f5aa Update search for cyrillic letters #877 2019-04-19 06:54:12 +02:00
Ozzieisaacs 67736fe187 Catch errors on loading pickle file 
Fix for cover images without Pillow
 2019-04-18 21:17:59 +02:00
Ozzieisaacs 89516fc2d6 Make PIL optional #885 2019-04-17 20:45:08 +02:00
Ozzieisaacs e1e79a73e8 Fix #884 2019-04-17 20:14:24 +02:00
Ozzieisaacs 0b8624b542 Deleted load metadata from douban, as API seems to be shut down (#858) 2019-04-17 19:55:32 +02:00
Ozzieisaacs 91ebe33879 Merge remote-tracking branch 'image_formats/dev' 2019-04-15 20:57:25 +02:00
Ozzieisaacs 05da2ae3c7 Update search for cyrillic letters 2019-04-14 18:20:45 +02:00
Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop 
# Conflicts:
#	cps/web.py
#	cps/worker.py
 2019-04-14 18:18:39 +02:00
Ozzieisaacs 55bdd13fb1 Fix #877 2019-04-14 17:54:18 +02:00
Ozzieisaacs 4552208c02 Fix #848 2019-04-14 16:37:57 +02:00
Ozzieisaacs 436c2671d1 Fix delete domain entries 
Fix error handling smtp.authentication error
 2019-04-14 14:08:49 +02:00
Ozzieisaacs a669eacde9 Merge remote-tracking branch 'proxy/patch-1' 2019-04-14 11:19:36 +02:00
Ozzieisaacs 2253708da7 Merge remote-tracking branch 'proxy/patch-1' into Develop 2019-04-14 10:54:09 +02:00
Ozzieisaacs 51e591bd25 Added updated translation 2019-04-13 16:46:06 +02:00
Ozzieisaacs 5188c62bea Merge remote-tracking branch 'translation/loc-hu' 2019-04-13 16:45:05 +02:00
Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py
 2019-04-13 16:42:09 +02:00
Ozzieisaacs e754ce313c Merge remote-tracking branch 'pycountry/pycountry' 2019-04-13 16:34:04 +02:00
Ozzieisaacs dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs' 
Updated pdf.js
 2019-04-13 15:02:01 +02:00
Ozzieisaacs 1c9ff6421d Fix uploader 2019-03-26 18:23:30 +01:00
Ozzieisaacs 4b301a7961 Additional fix for #845 (in case of error) 2019-03-26 18:19:39 +01:00
Ozzieisaacs dc93222579 Update 2 column author list view 2019-03-26 17:54:12 +01:00
Ozzieisaacs 772f978b45 Improved code quality 2019-03-24 16:24:43 +01:00
Ozzieisaacs 0f1db18eae Simplified typeahead 2019-03-24 16:14:42 +01:00
Ozzieisaacs 6940bb9b88 Code improvement 2019-03-24 15:58:43 +01:00
Ozzieisaacs 07649d04a3 Fix updater 
Update translations
Code cleaning updater
 2019-03-24 15:27:23 +01:00
Ozzieisaacs 39a3f70084 Fix for slow updater 2019-03-24 15:22:41 +01:00
Ozzieisaacs 8923e71220 Remove debug logging 2019-03-24 15:18:01 +01:00
Ozzieisaacs 843a93fe28 Updater fix for slow servers 2019-03-24 15:15:36 +01:00
Ozzieisaacs e5593d9a7f Integrated author in sorting functions 2019-03-16 21:14:01 +01:00
Ozzieisaacs 3f2a9c8bae Code improvement 2019-03-16 17:33:15 +01:00
Ozzieisaacs 7c69589c5b Code cosmetics unrar.js 2019-03-16 17:30:24 +01:00
Ozzieisaacs 149e9b4bd4 Code cosmetis unrar 2019-03-16 17:28:21 +01:00
Ozzieisaacs a360b1759a Code cosmetics 
bugfix import HttpError from pydrive
 2019-03-16 17:20:14 +01:00
Ozzieisaacs 765b817384 Refactored shelf.py and editbooks.py 2019-03-16 16:53:22 +01:00
Ozzieisaacs baf83b2f5a Refactored generating download links 2019-03-16 16:23:40 +01:00
Ozzieisaacs 9c1b3f136f Improved sorting for rated,random, hot books, read/unread book 2019-03-16 15:48:09 +01:00
Ozzieisaacs a66873a9e2 Added file formats view 2019-03-11 18:42:30 +01:00
Ozzieisaacs a0a15b4598 Fix max authors shown 2019-03-10 19:26:39 +01:00
Ozzieisaacs 4a33278596 Update ratings 2019-03-10 19:22:35 +01:00
Ozzieisaacs 6d2270d931 Fixes for Oauth 2019-03-10 12:54:32 +01:00
Ozzieisaacs 1db1c2e7df Enabling LDAP working again 
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
 2019-03-10 11:12:44 +01:00
Ozzieisaacs da3fcb9a72 Merge branch 'master' into Develop 
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
 2019-03-10 08:31:10 +01:00
Ozzieisaacs 76d40411dd Translation updated 2019-03-10 08:04:31 +01:00
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
Ozzieisaacs 0b0e62fdf2 Merge remote-tracking branch 'dialog/master' 
Fix for #833
 2019-03-09 20:02:17 +01:00
Ozzieisaacs 6f80a63ca6 Fix for #827 2019-03-09 07:05:43 +01:00
Ozzieisaacs 5b0a0e2139 Fix #835 2019-03-08 16:32:56 +01:00
Ozzieisaacs 9144a7ceb9 Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
Ozzieisaacs 6f0b3bbda0 Fix for #812 2019-03-05 21:28:55 +01:00
Ozzieisaacs feb6a71f95 Fix uncompressed cbz files 
merge from master -> file extension limitation
 2019-03-05 20:59:30 +01:00
Ozzieisaacs 1561a4abdf Comic improvments 2019-03-05 20:19:02 +01:00
Ozzieisaacs f483ca3214 Code cosmetics 
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
 2019-03-05 17:34:51 +01:00
Ozzieisaacs 466af21548 Code Cosmetics 2019-03-05 16:31:09 +01:00
Ozzieisaacs 0224d45961 Code cosmetics 2019-03-04 20:03:09 +01:00
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 2019-03-04 19:34:29 +01:00
Ozzieisaacs 6269a83c3d Fix mismerge user logon with python3 in opds feed 2019-03-03 20:51:19 +01:00
Ozzieisaacs f0de822ce7 Start refactor sidebar and view settings sidebar 2019-03-03 19:42:17 +01:00
Ozzieisaacs fb23db57b4 Added filtering of authors, series, categories, publishers 2019-03-03 15:37:53 +01:00
Ozzieisaacs 11b770b3fb Fix for #830 
Fix user with umlauts
 2019-03-03 08:41:50 +01:00
Ozzieisaacs fda977b155 Fix for users with umlauts 2019-03-03 08:38:36 +01:00
Ozzieisaacs 68a36597ab Fix opds login on python3 2019-03-03 07:37:15 +01:00
Ozzieisaacs fa276fd0d3 Add scrollbar to metadata load screen 
Small UI improvements in metadata load screen
 2019-03-01 21:00:09 +01:00
Ozzieisaacs de58d0a4d8 Merge remote-tracking branch 'metadata/Develop' into Develop 
Update logger for updater
 2019-03-01 19:09:37 +01:00
Ozzieisaacs 361a1243d7 Improvements #828 2019-02-27 19:30:13 +01:00
Ozzieisaacs 246d7673a9 Corrected file header with copyright information 2019-02-27 18:20:50 +01:00
Ozzieisaacs eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop 
Oauth is optional again
 2019-02-24 19:34:57 +01:00
Ozzieisaacs fad62a0909 translation update 2019-02-24 19:23:51 +01:00
Ozzieisaacs f6fbe2e135 Fix #766 
Update pdf upload
Translation of uploadprogress dialog
 2019-02-24 19:23:51 +01:00
Ozzieisaacs 1de3929988 Unicode 2019-02-24 19:08:24 +01:00
Ozzieisaacs cc3088c52f Merge branch 'master' into Develop 
# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py

Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
 2019-02-24 10:39:37 +01:00
Ozzieisaacs 0facb8fffa Fix #766 2019-02-23 18:28:25 +01:00
Ozzieisaacs 1a7052b287 Update pdf upload 
Translation of uploadprogress dialog
 2019-02-23 14:26:02 +01:00
Ozzieisaacs 17b7333992 Merge remote-tracking branch 'caliblur/master' 2019-02-20 20:00:08 +01:00
Ozzieisaacs e92497b34e Merge branch 'master' into Develop 
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
 2019-02-20 18:09:42 +01:00
Ozzieisaacs ae7c4908f9 Fix #767 2019-02-20 18:04:55 +01:00
Ozzieisaacs ea1a882353 Merge remote-tracking branch 'origin/master' 2019-02-20 18:04:40 +01:00
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1' 
Fixes for Google Drive
 2019-02-18 20:52:58 +01:00
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 2019-02-17 19:10:16 +01:00
Ozzieisaacs a0be02e687 Ldap working 2019-02-17 09:09:20 +01:00
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value 2019-02-16 10:18:32 +01:00
Ozzieisaacs 37007dafee Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
 2019-02-16 10:17:46 +01:00
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master' 
Improvement for #814
 2019-02-16 08:03:42 +01:00
Ozzieisaacs 4230226716 Link fixes 
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
 2019-02-16 07:23:36 +01:00
Ozzieisaacs 1dc6f44828 Merge branch 'master' into Develop 2019-02-10 07:56:18 +01:00
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 2019-02-09 21:26:17 +01:00
Ozzieisaacs 1fc4bc5204 Fix routes 
Fix error page
 2019-02-09 19:01:57 +01:00
Ozzieisaacs f5235b1d4c Uploader progress bar 
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
 2019-02-09 18:46:41 +01:00
Ozzieisaacs d58d792f56 Catch Imagemagick policy error 2019-02-09 12:58:43 +01:00
Ozzieisaacs d6ee8f75e9 More refactoring 2019-02-08 20:12:16 +01:00
Ozzieisaacs a00d93a2d9 Working again (basically) 2019-02-06 21:52:32 +01:00
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop 2019-02-03 20:30:37 +01:00
Ozzieisaacs 6fc4b318e8 cover folders beautified 2019-02-03 20:29:16 +01:00