1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-01 05:49:58 +00:00
Commit Graph

433 Commits

Author SHA1 Message Date
Ozzieisaacs
b9c3a3fcea Fix #652 2019-07-21 18:19:07 +02:00
Ozzieisaacs
5c6be5d6d0 Fix for python 3 and existing unrar entry in db
deleted unnecessary lines in config html template
2019-07-21 12:58:48 +02:00
Ozzieisaacs
38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
2019-07-21 09:45:36 +02:00
Ozzieisaacs
c6542fdec6 New Oauth code 2019-07-20 20:01:05 +02:00
Ozzieisaacs
8bfcdffeb6 Fix feature support 2019-07-14 13:20:40 +02:00
Ozzieisaacs
4708347c16 Merge branch 'Develop'
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
2019-07-13 20:54:21 +02:00
Ozzieisaacs
26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 2019-05-31 08:43:51 +02:00
Ozzieisaacs
ecedf92783 Update version
Make custom columns visible (#904)
2019-05-30 10:21:11 +02:00
Ozzieisaacs
d106ada9ed Changed version
Update translation
2019-05-30 09:07:52 +02:00
Ozzieisaacs
ed91048a63 Fix for magic link with python 3 2019-05-26 11:31:09 +02:00
Ozzieisaacs
e6ff2f1d90 Fix file not found loading-icon.gif 2019-05-16 19:42:59 +02:00
subdiox
c0d136ccd8 Fix slow loading 2019-05-10 08:16:03 +09:00
Ozzieisaacs
a42ebdc096 Fix for #897 2019-05-07 19:54:13 +02:00
subdiox
c2bfb29726 Add reading direction settings to readcbr page 2019-04-21 18:20:15 +09: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
4552208c02 Fix #848 2019-04-14 16:37:57 +02:00
Ozzieisaacs
dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
2019-04-13 15:02:01 +02:00
Daniel Pavel
439ce19b5d Updated epub.js to v0.3.66 2019-03-28 07:23:45 +02:00
tomjmul
8e8486497f Restirct a user to a set of tags 2019-03-19 13:53:41 +00:00
Ozzieisaacs
a0a15b4598 Fix max authors shown 2019-03-10 19:26:39 +01:00
Ozzieisaacs
8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
Ozzieisaacs
11b770b3fb Fix for #830
Fix user with umlauts
2019-03-03 08:41:50 +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
361a1243d7 Improvements #828 2019-02-27 19:30:13 +01:00
Virgil Grigoras
15aa49e163 shorten authors in author / discover / index / search and shelf 2019-02-25 19:27:59 +01:00
Virgil Grigoras
3272b4ca1e configuration field for max_authors 2019-02-25 19:26:43 +01:00
Ozzieisaacs
f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
2019-02-24 19:23:51 +01:00
Ozzieisaacs
17b7333992 Merge remote-tracking branch 'caliblur/master' 2019-02-20 20:00:08 +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
6fc4b318e8 cover folders beautified 2019-02-03 20:29:16 +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
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
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
Ozzieisaacs
863b77a5d7 Fix #711
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
Ozzieisaacs
dfa17956c9 Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
Changed function for 295, azw3 is preferred format for sending to kindle
2018-11-18 17:09:13 +01:00
Ozzieisaacs
8d6d28eb57 Merge remote-tracking branch 'titlelink/titles-links'
Fix for #694
2018-11-03 18:02:28 +01:00
Ozzieisaacs
89bddead35 Merge remote-tracking branch 'http_error/beautify-http-errors' 2018-11-03 17:38:52 +01:00
Ozzieisaacs
c582a70498 Merge remote-tracking branch 'bbb/617' 2018-11-03 10:40:00 +01:00
Ozzieisaacs
cc7dcfb35a Update Updater
Bugfix author in opds-feed
2018-11-01 13:44:00 +01:00
Ozzieisaacs
c1818e8f36 Fix for #672 2018-10-30 22:33:19 +01:00
Ozzieisaacs
6ec9bc9e5c Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
404 messages on non existing categorys, languages, series
Updated Testresult
2018-10-28 21:33:12 +01:00
Chintogtokh Batbold
13883db5a0 Add anchor tags to titles 2018-10-09 11:52:16 +00:00
bodybybuddha
ee686b5379 Fix for #617
Task table: Status column and task messages have been localized
	Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
2018-10-03 15:58:37 -04:00
Ozzie Isaacs
7253f583cf Fix #650
Improved testablility
Added feedback for book_edit -> stay on edit page
2018-10-03 21:18:08 +02:00
OzzieIsaacs
40cc25de7a Merge remote-tracking branch 'bbb/621'
Fixes after testing
2018-10-03 14:03:08 +02:00
bodybybuddha
5d34fd7fec Send to Kindle button precheck added
Based on existing book formats and which converter (if any) determine if button can be seen.
2018-10-01 14:19:29 -04:00
Virgil Grigoras
60e9d01d27 Beautify http errors 2018-10-01 10:35:13 +02:00
Virgil Grigoras
1ac9b3d837 Update OPDS-part to display publishers 2018-09-30 18:48:36 +02:00
Virgil Grigoras
6a007ec881 fix indentations 2018-09-30 18:42:48 +02:00
Virgil Grigoras
5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 2018-09-30 18:30:24 +02:00
Virgil Grigoras
016c7b4b1c Add ability to store and edit publishers 2018-09-30 14:08:55 +02:00
Ozzie Isaacs
c36b1ed58a Added additional ids and classes for easier testing 2018-09-29 15:44:42 +02:00
Ozzie Isaacs
cd0fc917d7 Bugfix template rights at creating user
Added errormessages for shelf actions
Additional ids for better testability
2018-09-27 22:04:57 +02:00
OzzieIsaacs
ba7c734657 Fixes from testing:
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
2018-09-23 19:15:50 +02:00
OzzieIsaacs
4eeeb02b1d Merge remote-tracking branch 'update_check/master' 2018-09-14 21:12:45 +02:00
Virgil Grigoras
cb5adb3a31 Display "what's new" information for newer versions than the current one 2018-09-09 21:54:51 +02:00
OzzieIsaacs
01fb8ee681 Fix #609
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
2018-09-09 18:17:15 +02:00
Virgil Grigoras
9616562a76 Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block) 2018-09-09 14:18:56 +02:00
Virgil Grigoras
cfae6e893a Move update relevant parts to own section 2018-09-09 14:12:12 +02:00
Virgil Grigoras
1047859424 Place general information (db location, amount of books...) on top 2018-09-09 14:01:28 +02:00
Virgil Grigoras
354eac1512 fix html errors and formating 2018-09-09 13:51:28 +02:00
Virgil Grigoras
f477d48c7c More robust handling while checking for new updates 2018-09-09 11:46:00 +02:00
OzzieIsaacs
0bcb20f674 Fix #604
Added missing translation for "select option"
2018-09-03 19:12:15 +02:00
Virgil Grigoras
db9561db89
Show add to shelf button only when there is a result 2018-09-02 22:21:37 +02:00
OzzieIsaacs
0e1711631c Fix for #600
publisher-info  is shown on edit page (#599)
2018-09-02 17:21:01 +02:00
OzzieIsaacs
3f2d0ea7bb Fix #601
Removed trailing comma on edit page
2018-09-02 14:05:09 +02:00
OzzieIsaacs
06ffa5e66d Fix displaying random books with no author entry
Code cosmentics for opds feed
Narrowed exceptions on language not found
Fix password changing
2018-09-02 11:48:58 +02:00
OzzieIsaacs
4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
2018-08-31 15:00:22 +02:00
OzzieIsaacs
3f35200a0b Merge remote-tracking branch 'Comic/comic_server'
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive.js
#	cps/static/js/io.js
#	cps/static/js/kthoom.js
#	cps/static/js/unrar.js
#	cps/static/js/untar.js
#	cps/static/js/unzip.js
#	cps/templates/config_edit.html
#	cps/templates/detail.html
#	cps/templates/readcbr.html
#	cps/templates/stats.html
#	cps/ub.py
#	cps/web.py
#	optional-requirements.txt
2018-08-31 10:47:58 +02:00
OzzieIsaacs
9c889d1681 Fix #597
Updated language files
2018-08-30 09:32:42 +02:00
bodybybuddha
22ecdfd2bc Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button 2018-08-29 00:49:50 -04:00
bodybybuddha
4f386c8a00 Updated GUI buttons for ebook-convert feature 2018-08-28 19:13:04 -04:00
bodybybuddha
3ec000ad85 Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any 2018-08-28 09:56:08 -04:00
OzzieIsaacs
a7a91ae54c Added posibility to upload cover from local drive (#439)
Updated language files
2018-08-28 14:07:48 +02:00
OzzieIsaacs
2453786174 Limit registering domains 2018-08-28 09:42:19 +02:00
bodybybuddha
e160efbdac Add GUI functions for ebookconvert any format feature 2018-08-27 21:27:16 -04:00
OzzieIsaacs
cedc183987 Fix #590, #589.
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
2018-08-27 22:08:55 +02:00
OzzieIsaacs
f6ab724020 Fix generating links on tasks pafge 2018-08-22 21:55:26 +02:00
OzzieIsaacs
7917347508 Revert accidently commited change in admin.html (#580) 2018-08-20 06:59:23 +02:00
OzzieIsaacs
d414bf3263 Massadd of books to shelfs (#203, #404) from advanced search
Code cosmetics
bugfix error message on failed emails
refactored language name generation
2018-08-19 10:14:20 +02:00
OzzieIsaacs
d2ea10e90e Improved OPDS compability (#579)
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
2018-08-18 17:35:23 +02:00