Commit Graph

102 Commits

Author SHA1 Message Date
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 3f5c6c1fa5 Fix #937 2019-06-13 20:01:37 +02:00
Ozzieisaacs ecedf92783 Update version
Make custom columns visible (#904)
2019-05-30 10:21:11 +02:00
subdiox c2bfb29726 Add reading direction settings to readcbr page 2019-04-21 18:20:15 +09:00
Ozzieisaacs dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
2019-04-13 15:02:01 +02: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
Andrew Sullivan 3dfc2f2580 fixing issue #833 2019-03-08 20:44:45 -05:00
Ozzieisaacs fa276fd0d3 Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
2019-03-01 21:00:09 +01:00
Virgil Grigoras d3ed0317bb styling and javascript for hiding authors 2019-02-25 19:25:08 +01:00
leram84 ae279c5123
fixed description read-more button 2019-02-20 12:57:38 -05:00
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 2019-02-10 18:17:33 +01:00
leram84 ae55dd6c27 Update caliBlur.min.css 2019-01-18 14:17:17 -08:00
Matt 7341819606 Revert "Update caliBlur.min.css"
This reverts commit df8806e182.
2019-01-18 14:11:39 -08:00
Matt 68f143dc30 Revert "Create dark-reader.css"
This reverts commit a69e43922a.
2019-01-18 14:11:31 -08:00
Matt 9ee4b7f77c Revert "Not ready for commit"
This reverts commit 6a2ebba85b.
2019-01-18 14:11:17 -08:00
hexeth 6a2ebba85b
Not ready for commit 2019-01-18 14:06:39 -08:00
leram84 a69e43922a
Create dark-reader.css 2019-01-18 16:43:36 -05:00
leram84 df8806e182
Update caliBlur.min.css 2019-01-18 14:43:04 -05:00
Matt e01872fc79 Revert "Update caliBlur.min.css"
This reverts commit 2b7b55846b.
2019-01-18 11:27:19 -08:00
leram84 2b7b55846b
Update caliBlur.min.css 2019-01-18 14:22:48 -05:00
leram84 df2b1ba09d
fix for send button dropdown 2019-01-18 14:01:51 -05:00
leram84 d5ff3b6a0b smtp setup page (#774)
fix for https://github.com/janeczku/calibre-web/issues/773
2019-01-15 21:20:03 +01:00
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
leram84 db83fb3bd7
minified 2019-01-11 16:49:45 -05:00
leram84 f897491070
Update caliBlur.min.css 2019-01-11 16:30:01 -05:00
hexeth 40e45c7272
Add files via upload 2019-01-11 11:23:49 -08:00
Ozzieisaacs d5a913e195 Merge remote-tracking branch 'origin/master' 2019-01-10 11:03:48 +01:00
leram84 dba5680121 1.0 for the merge (#758)
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
2019-01-10 09:25:18 +01:00
Ozzieisaacs b03f4bb5e5 Merge remote-tracking branch 'origin/master' 2019-01-09 13:03:55 +01:00
hexeth 418e98d1f8 update .published-date to .publishing-date (#756) 2019-01-08 18:06:29 +01:00
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
2019-01-08 07:58:22 +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
Virgil Grigoras 60e9d01d27 Beautify http errors 2018-10-01 10:35:13 +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 a7a91ae54c Added posibility to upload cover from local drive (#439)
Updated language files
2018-08-28 14:07:48 +02: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 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
OzzieIsaacs 9ace4d3372 Updated german translation
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
2018-08-18 12:15:32 +02:00
OzzieIsaacs 0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature #409 (linking read status from calibre)
2018-07-15 15:08:06 +02:00
OzzieIsaacs 43a391d1bd Redownloaded glyphicon font files #515 2018-05-31 09:33:43 +02:00
OzzieIsaacs 7a20c14dea Integrated caliblur css 2018-04-03 17:59:06 +02:00
Yury Tilis 2fe03961bb -Added a more subtle progress bar which only shows the page number on hover
-Added Current page indicator to the thumbnail list, as well as a hover state
-Thumbnail list now scrolls to the current page on open or page change
-Added @andy29485's request for controlling page with space/shift+space
-Added the book title to the top of the page -Fixed IE11 failing on imagecallback
2017-12-10 02:43:51 -05:00
OzzieIsaacs f890fc1553 New progress bar 2017-11-29 15:54:17 +01:00
OzzieIsaacs 9f8cbe8c1f Merge enhanced UI from ytilis repro 2017-11-19 13:20:59 +01:00
OzzieIsaacs fe4d11fea8 Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63, #126) 2017-09-17 12:36:32 +02:00
kyos 3366aae6c7 Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book
# Conflicts:
#	cps/static/css/style.css
2017-09-11 10:48:57 +02:00
kyos 9086f4e0e7 Added option to upload a new format to a given book 2017-09-11 10:48:30 +02:00
Jonathan Rehm a682c95ec1 Show "More by" on author page
Uses Goodread's list of author's books, filtering out the books that are already in the user's library.

Requires the Goodreads dependency and API information.
2017-08-21 08:56:08 -07:00