Commit Graph
386 Commits
Author SHA1 Message Date
Ozzieisaacs 0be17ed157 Refactored sidebar (some parts are missing) 2019-03-04 19:34:29 +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 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 de58d0a4d8 Merge remote-tracking branch 'metadata/Develop' into Develop
Update logger for updater
2019-03-01 19:09:37 +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 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 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 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 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
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
2019-02-03 17:33:54 +01:00
Ozzieisaacs ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
2019-02-03 16:38:27 +01:00
Ozzieisaacs b75b91606c Fix config oauth-UI 2019-01-27 11:32:16 +01:00
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
2019-01-27 11:22:22 +01:00
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 2019-01-27 11:18:08 +01:00
Ozzieisaacs 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 2019-01-27 11:16:11 +01:00
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
2019-01-27 11:14:38 +01:00
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
2019-01-26 19:06:54 +01:00
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
Matt ae14236698 Revert "Add Dark-Reader"
This reverts commit 7e9d6a3cf9.
2019-01-18 14:11:24 -08:00
hexeth 7e9d6a3cf9 Add Dark-Reader 2019-01-18 13:50:21 -08:00
Matt aa27e0e476 Revert "Update ID of button from sendbtn2 to sendbtn"
This reverts commit a9277da85a.
2019-01-18 10:43:26 -08:00
Ozzieisaacs f4977c3767 Merge remote-tracking branch 'theme/master' 2019-01-15 18:22:09 +01:00
hexeth a9277da85a Update ID of button from sendbtn2 to sendbtn
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
2019-01-14 11:43:29 -08:00
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Krakinou aafb267787 Merge branch 'master' into master 2019-01-12 23:46:59 +01:00
Krakinou 8d284b151d Edit html config 2019-01-12 12:52:27 +01:00
Ozzieisaacs c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
2019-01-12 09:01:08 +01:00
hexeth 883633a045 Remove beta from caliBlur selection 2019-01-11 13:46:19 -08:00
Ozzieisaacs 36030b559c Choosing Theme is now a global setting 2019-01-11 08:36:28 +01:00
Ozzieisaacs b03f4bb5e5 Merge remote-tracking branch 'origin/master' 2019-01-09 13:03:55 +01:00
hexeth 23396af83c Add .random-books class to random books div (#757)
Assist caliBlur in targeting this element
2019-01-08 21:58:57 +01:00
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
2019-01-08 07:58:22 +01:00
hexeth eb1c87fbae Patch 4 (#752)
* Target new class 

Target new class for caliblur language support

* Move publishing date into div

Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.

* Target newly created div
2019-01-08 07:10:10 +01:00
hexeth c77825371d Add classes to shelves for easier css selection (#751)
proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.
2019-01-07 21:13:51 +01:00
Ozzieisaacs f821580b50 #Fix 745 2019-01-03 22:01:52 +01:00
Ozzieisaacs d0fd1a4601 Merged new caliblur theme
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
2018-12-27 10:53:19 +01:00