Ozzieisaacs
f5e12328dc
Fix for #1382 (Restrictions with "&" in it can't be deleted)
2020-05-11 18:41:34 +02:00
Ozzieisaacs
486c0f2937
Fix for #1382 (Restrictions with "&" in it can't be deleted)
2020-05-11 18:41:16 +02:00
Ozzieisaacs
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
2020-05-10 19:24:55 +02:00
OzzieIsaacs
fe88010a72
Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'
2020-05-10 14:57:19 +02:00
OzzieIsaacs
99ae4be2c2
Merge remote-tracking branch 'sec_fixes/bump_jquery'
2020-05-10 10:43:20 +02:00
jvoisin
30c9aa3df9
Minor fixes to caliBlur.js
...
- Add alt attributes to images
- Fix a broken tag
2020-05-09 17:07:22 +02:00
jvoisin
688184e255
Bump jquery
2020-05-09 17:00:03 +02:00
jvoisin
264b4b669e
Bump underscorejs version from 1.9.1 to 1.12.2
2020-05-09 16:54:21 +02:00
Ozzieisaacs
e1439b529b
Config Options for limiting email size, change username to e-mail adress, use kepubify
...
Added work on Unrar5 decompression (breaks comic reader totally)
2020-05-04 18:19:30 +02:00
Ozzieisaacs
fcefd8031a
Fix #985 (png and webp are extracted as cover files from comic files)
2020-05-02 11:24:30 +02:00
Ozzieisaacs
0a92d79ec0
Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
...
# Conflicts:
# cps/static/css/style.css
# cps/ub.py
# cps/web.py
2020-05-01 17:25:13 +02:00
Ozzieisaacs
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
2020-04-30 18:08:28 +02:00
jvoisin
806a5f209f
Fix two minor xss
2020-04-29 11:33:33 +02:00
Ozzieisaacs
ce6b689147
Code cosmetics
2020-04-27 20:22:55 +02:00
Ozzieisaacs
2d92818613
Code cosmetics
2020-04-27 20:01:13 +02:00
Ozzieisaacs
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
2020-04-25 20:06:25 +02:00
Ozzieisaacs
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
2020-04-24 21:05:56 +02:00
jvoisin
d8bf540db2
Remove an undeclared and useless local variable
2020-04-24 18:04:27 +02:00
pthiben
b90048d72e
fix badge color on grid view to match list view
2020-04-18 23:41:01 -04:00
pthiben
38bb10d36b
apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
...
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
2020-04-18 23:23:56 -04:00
pthiben
58943bb156
update filtering so that it also uses isotope everywhere.
...
Fix asc/desc that did not match list view
2020-04-18 23:23:56 -04:00
pthiben
5222e157cb
fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it
2020-04-18 23:23:55 -04:00
pthiben
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-18 23:22:51 -04:00
Ozzieisaacs
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
2020-04-16 20:12:27 +02:00
Ozzieisaacs
a194216568
Merge remote-tracking branch 'origin/master'
2020-04-05 19:10:27 +02:00
Ozzieisaacs
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
2020-04-05 17:31:41 +02:00
Ozzieisaacs
587174b771
Fix #1272
2020-04-04 08:53:22 +02:00
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
hexeth
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
Ozzieisaacs
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
Ozzieisaacs
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
Ozzieisaacs
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
Ozzieisaacs
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
Wanoo
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
2020-02-28 16:04:07 +01:00
Ozzieisaacs
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
2020-02-23 13:15:30 +01:00
Ozzieisaacs
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
2020-02-23 13:14:12 +01:00
Ozzieisaacs
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
OzzieIsaacs
371097eb4d
Update Updater
2020-02-23 07:54:58 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210
2020-02-21 18:25:02 -03:00
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
Ozzieisaacs
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
2020-02-16 19:19:10 +01:00
Kyos
509071949a
Moved style to css file
2020-02-13 21:05:24 +01:00
Ozzieisaacs
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
2020-02-09 17:02:47 +01:00
Ozzieisaacs
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
2020-02-09 17:02:28 +01:00
Ozzieisaacs
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
2020-02-09 07:00:04 +01:00
Ozzieisaacs
b33a2ac90d
Fix #1170 Auth-digest Header no longer crashs calibre-web
...
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
2020-02-02 07:47:27 +01:00
Michael Shavit
c0239a659c
Add UI support for archived books.
...
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
2020-01-26 00:27:54 -05:00
Ozzieisaacs
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
2020-01-15 17:57:00 +01:00
Ozzieisaacs
973f555544
Merge branch 'master' into Develop
...
(updated tinymce and bootstrap datepicker)
2020-01-13 18:39:25 +01:00
Ozzieisaacs
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
2020-01-13 18:37:29 +01:00
Simon Latapie
56964a890b
caliBlur theme: fix custom column display that contain colons
2020-01-12 14:26:07 +01:00
Ozzieisaacs
68ca0b86da
Updated tiniymce + locale
...
updated datepicker + locale
Included cs, fi language, updated ru language
2020-01-12 14:11:53 +01:00
Ozzieisaacs
79a9ef4859
Make Kobo optional
...
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
2020-01-12 13:42:39 +01:00
Ozzieisaacs
661ed17d23
Handle stream output in logviewer
...
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
2020-01-07 20:26:59 +01:00
Ozzieisaacs
c659f28334
Fix #1128
2020-01-06 11:52:59 +01:00
Ozzieisaacs
d9adb4fc94
Improvements for limit tags
2020-01-01 17:30:08 +01:00
Ozzieisaacs
513ac6cfb4
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
...
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86
Merge branch 'master' into Develop
2019-12-31 10:52:45 +01:00
Ozzieisaacs
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
2019-12-29 13:54:52 +01:00
Ozzieisaacs
bbe91f439a
Merge from master
2019-12-22 15:28:43 +01:00
Ozzieisaacs
b586a32843
Fix #1115 (comic reader not working under iOS, maybe invalid issue)
...
Improvement for #925 (Next/Prev buttons are bigger)
2019-12-22 15:24:22 +01:00
zhiyue
222797e631
support douban book search using apikey
2019-12-04 11:59:06 +08:00
Kyos
c93dd32179
Fixed typo and column size for LG screens
2019-10-19 12:02:14 +02:00
Kyos
ada727a570
Adds Authors, Series and Book Cover to the shelf order view
2019-10-19 10:52:03 +02:00
Ozzieisaacs
0c40e40dc3
Fix logfile loading behind reverse proxy ( #1047 )
2019-09-27 08:15:10 +02:00
Dmitriy Istomin
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
2019-08-16 11:18:39 -04:00
Ozzieisaacs
b9c3a3fcea
Fix #652
2019-07-21 18:19:07 +02:00
Ozzieisaacs
c6542fdec6
New Oauth code
2019-07-20 20:01:05 +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
f79d549910
Fix duplicate user and email (now case insensitive #948 )
...
Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 )
2019-07-06 14:35:12 +02:00
Ozzieisaacs
cd546eb6d4
Update comic reader js
2019-06-17 19:48:17 +02:00
Ozzieisaacs
3f5c6c1fa5
Fix #937
2019-06-13 20:01:37 +02:00
Ozzieisaacs
c81d4edb7d
Fix for #923
2019-06-10 16:38:29 +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
subdiox
867aa2f0bd
Beautify bitjs
2019-05-14 04:28:06 +09:00
subdiox
7982ed877c
Downgrade bitjs to es5 branch
2019-05-13 14:53:25 +09:00
subdiox
c0d136ccd8
Fix slow loading
2019-05-10 08:16:03 +09:00
subdiox
c2bfb29726
Add reading direction settings to readcbr page
2019-04-21 18:20:15 +09:00
subdiox
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
2019-04-21 18:02:02 +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
436c2671d1
Fix delete domain entries
...
Fix error handling smtp.authentication error
2019-04-14 14:08:49 +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
Ozzieisaacs
4b301a7961
Additional fix for #845 (in case of error)
2019-03-26 18:19:39 +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
Andrew Sullivan
3dfc2f2580
fixing issue #833
2019-03-08 20:44:45 -05:00
Ozzieisaacs
6f0b3bbda0
Fix for #812
2019-03-05 21:28:55 +01:00
Ozzieisaacs
466af21548
Code Cosmetics
2019-03-05 16:31:09 +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
bd7b0175a1
Fix remaining shown by codacy
2019-02-26 17:24:13 +01:00
Virgil Grigoras
f5cf62f209
Fix issues shown by codacy
2019-02-26 11:17:06 +01:00
Virgil Grigoras
d3ed0317bb
styling and javascript for hiding authors
2019-02-25 19:25:08 +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
leram84
ae279c5123
fixed description read-more button
2019-02-20 12:57:38 -05:00
hexeth
9a0e8fefb7
re-add loader code
2019-02-19 13:56:49 -08:00
Matt
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
2019-02-19 13:47:53 -08:00
hexeth
5a863541de
Fix object object
2019-02-19 13:44:40 -08:00
Ozzie Isaacs
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
2019-02-19 19:32:00 +01: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
Ozzieisaacs
9128615f48
Fix #424
...
Fix #425
2019-01-26 09:43:17 +01:00
Ozzieisaacs
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
2019-01-25 21:58:19 +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
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
hexeth
83a905bfe1
Don't remove the dropdown toggle
2019-01-18 11:35:13 -08: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
hexeth
c0792b7225
Add .sendtokindle-drop to click-off
2019-01-18 11:10:54 -08:00
Matt
8825352af6
Revert "Add sendtokindle-drop to click-off array"
...
This reverts commit d83ba315f0
2019-01-18 11:09:26 -08:00
hexeth
d83ba315f0
Add sendtokindle-drop to click-off array
2019-01-18 11:07:50 -08:00
hexeth
16e23cb1fe
Fix upload tooltip not appearing
2019-01-18 11:04:28 -08:00
leram84
df2b1ba09d
fix for send button dropdown
2019-01-18 14:01:51 -05:00
hexeth
9a12e60b1c
Toggle for dropdown
2019-01-18 11:00:55 -08:00
hexeth
c620453ebf
UL positioning
2019-01-18 10:57:42 -08:00
hexeth
4988e3b631
add tooltip and move UL higher in DOM
2019-01-18 10:50:29 -08:00
Ozzie Isaacs
9e5fa45df7
Removed unnecessary wait message
2019-01-16 17:50:51 +01: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
Ozzie Isaacs
cc618ecee7
Fix Limiting domains (related to #773 )
2019-01-15 20:08:47 +01: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
4ace3a5e27
test
2019-01-11 14:13:09 -08: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
2ab10bb070
Update caliBlur.js
2019-01-11 13:23:12 -08:00
hexeth
9c75eb7016
Update caliBlur.js
2019-01-11 13:07:18 -08:00
hexeth
6c37aafae9
Update caliBlur.js
2019-01-11 13:05:22 -08:00
hexeth
550262e651
Further fix
2019-01-11 12:44:29 -08:00
hexeth
edb4cedc65
Update about page to target new body class
2019-01-11 12:43:00 -08:00
hexeth
40e45c7272
Add files via upload
2019-01-11 11:23:49 -08:00
hexeth
7032f311d5
Update caliBlur.js
2019-01-11 10:54:21 -08:00
Ozzieisaacs
66fcd71685
Merge remote-tracking branch 'origin/master'
2019-01-11 08:36:51 +01:00
hexeth
e1205b75cd
Fix targeting for language support ( #761 )
...
Some other languages use 'description :' instead of 'description:' .
2019-01-10 18:26:34 +01: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
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
29c9d55498
Remove leading space in span ( #749 )
...
Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span
2019-01-04 21:49:01 +01:00
hexeth
ece11de942
Fix publisher not formatting correct ( #747 )
2019-01-04 20:39:11 +01:00
Ozzieisaacs
f821580b50
#Fix 745
2019-01-03 22:01:52 +01:00
Ozzieisaacs
cb0f3cd074
Fix #696
2018-12-29 11:16:36 +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
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
2018-11-03 17:38:52 +01:00
Ozzieisaacs
c05687b896
Fix #668
2018-11-03 13:59:11 +01:00
Virgil Grigoras
60e9d01d27
Beautify http errors
2018-10-01 10:35:13 +02:00
Virgil Grigoras
016c7b4b1c
Add ability to store and edit publishers
2018-09-30 14:08:55 +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
Virgil Grigoras
f477d48c7c
More robust handling while checking for new updates
2018-09-09 11:46:00 +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
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
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
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
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
7dac87fa5d
Code cosmetics unrar
2018-08-18 18:38:28 +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
5ef70890d9
Search for custom columns implemented #494
...
Search for ratings related to #559
Search description #572
code cosmetics
2018-08-12 18:21:57 +02:00
Ozzie Isaacs
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
2018-08-12 09:29:57 +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
76d8cbdf57
Logging of details for gdrive integration only on debug level
...
fix generic cover path
browser reading for cbx and epub files no longer creates temp files on server
browser reading for cbx and epub files working (#502 , #520 )
2018-07-07 15:48:50 +02:00
OzzieIsaacs
204cd504a9
- Completly new setup of GDrive (every data is taken from client_secret.json file)
...
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
2018-06-02 10:59:34 +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
OzzieIsaacs
62f7674761
fixed #410 advanced search for publishing date
...
fixed misstyping in italian language
removed next to "me" after login
2018-04-01 19:31:41 +02:00
OzzieIsaacs
691a4a88e6
Added support for svg in comics (not working in IE11)
2018-03-31 17:05:15 +02:00
OzzieIsaacs
0329306031
Favicon replaced ( #424 ) with hiher resolution
2018-01-06 11:36:23 +01:00
OzzieIsaacs
03e2a1e73b
Restored click on progressbar
2017-12-10 14:02:49 +01: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
4e11272023
Working on IE11
2017-12-01 10:10:42 +01:00
OzzieIsaacs
cbb236ba7b
Added visiblilty of shelfs to opds catalog ( #267 )
2017-12-01 07:53:52 +01:00
OzzieIsaacs
f890fc1553
New progress bar
2017-11-29 15:54:17 +01:00
OzzieIsaacs
03ab03f06e
Code cosmetics
2017-11-22 22:08:29 +01:00
OzzieIsaacs
0943d50876
Code cosmetics
...
Bugfix click on progressbar
2017-11-21 12:46:03 +01:00
OzzieIsaacs
aae9e285a8
Code cosmetics
2017-11-20 21:54:55 +01:00
OzzieIsaacs
5756785073
Error handling rarfiles
2017-11-19 18:08:55 +01:00
OzzieIsaacs
9f8cbe8c1f
Merge enhanced UI from ytilis repro
2017-11-19 13:20:59 +01:00
OzzieIsaacs
8c573ff6d8
Unrar/tar and unzip on server side
2017-11-18 10:34:21 +01:00
OzzieIsaacs
b8d45b664a
Typeahead working again
...
Fix for replacing characters in filenames
2017-11-12 18:48:44 +01:00
OzzieIsaacs
1eb10be253
Code cosmetics comic reader
2017-10-08 10:41:43 +02:00
Jonathan Rehm
56c71dd4bf
Disable bookmarking when anonymous users are reading
2017-09-30 10:51:20 -07:00
OzzieIsaacs
031a175474
Fix Comic reader
2017-09-24 19:38:15 +02:00
OzzieIsaacs
2302db4e06
Merge remote-tracking branch 'adv/fix-douban-rating'
2017-09-22 20:57:24 +02:00
OzzieIsaacs
a6dfcedfdb
Code cosmetics
2017-09-20 21:13:32 +02:00
OzzieIsaacs
0405cec4ac
Code cosmetics
...
Bugfix "Error load settings"
2017-09-18 18:59:08 +02:00
OzzieIsaacs
378a0ca662
Merge remote-tracking branch 'adv/bookmarks'
2017-09-17 20:26:58 +02:00
OzzieIsaacs
2a78a02e0b
Code cosmetics
2017-09-17 19:16:29 +02:00
OzzieIsaacs
34e9ef35f5
Code cosmetics
2017-09-17 15:33:22 +02:00
OzzieIsaacs
a159bb0b97
Code Csmetics kthoom integration
2017-09-17 15:06:01 +02:00
OzzieIsaacs
5b9b36f997
Code cosmetics
2017-09-17 14:51:17 +02:00
OzzieIsaacs
85068d75bf
Update comic reader
2017-09-17 13:37:21 +02: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
OzzieIsaacs
b6b73d39c2
Fix #329
...
Code cosmetics
2017-09-17 07:15:08 +02:00
OzzieIsaacs
bde92113d4
Bugfix Datepicker
2017-09-16 19:30:49 +02:00
OzzieIsaacs
f87800d11c
Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'
2017-09-16 18:55:34 +02:00
OzzieIsaacs
2ef6dc30bd
Added italian translation
2017-09-16 16:58:42 +02:00
Jonathan Rehm
29f21b148b
Translate 10-based rating to 5-based
2017-09-11 09:58:39 -07:00
kyos
8937599ba7
Fixed codacy code control
2017-09-11 17:18:11 +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
e5b4bed01c
Fixed codacy requirements
2017-09-11 10:48:30 +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
a4f81dd812
Do not include empty strings in list of bookmarks
2017-09-10 15:38:24 -07:00
OzzieIsaacs
c9f36a4d1a
Merge remote-tracking branch 'adv/bookmarks'
2017-09-10 15:00:27 +02:00
Louis Jencka
b3217496d1
Add progress bar to upload form
2017-09-02 11:51:11 -06:00
OzzieIsaacs
f860694487
Merge remote-tracking branch 'adv/goodreads-more-by'
2017-09-01 20:29:45 +02:00
Jonathan Rehm
53c687251e
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-29 07:15:33 -07:00
Jonathan Rehm
282837c7c5
Use ES5 syntax
2017-08-29 07:14:32 -07:00
Jonathan Rehm
374b5f4c6e
Save ePub bookmarks to database
...
Save ePub bookmark to database. Also use library's built-in restore feature to restore all information from localStorage.
2017-08-23 08:55:40 -07: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
Jonathan Rehm
866f7944eb
Meta data improvements
...
* Add buttons to show/hide results from Douban & Google
* Trigger search with "Enter" key
* Use Underscore.js template instead of build HTML strings in JavaScript
* Keep click event handler in JavaScript instead of using HTML's `onclick`
* Normalize Douban & Google results
* Update cover image & add cover URL to the form input
2017-08-15 22:11:01 -07:00
OzzieIsaacs
a1538e12e8
Bugfix typeahead on advanced serach page
2017-08-14 20:30:23 +02:00
Jonathan Rehm
8171943b8e
Update to ES5 standards
...
Also fix ESLint issues
2017-08-12 22:46:27 -07:00
kyos
9a17a09cc7
Fixed codacy requirements
2017-08-10 12:34:54 +02:00
kyos
aa4a5dc3ef
Added option to upload a new format to a given book
2017-08-09 19:56:46 +02:00
kyos
e948844ea4
Added a 5px separation for all input labels in advanced search to improve readability
2017-08-01 17:51:38 +02:00
kyos
b6f097f673
Added a 5px separation for all input labels in advanced search to improve readability
2017-08-01 17:49:14 +02:00
kyos
6048bf3c79
Added a 5px separation for all input labels in advanced search to improve readability
2017-07-31 20:01:55 +02:00
OzzieIsaacs
626e2e393e
Merge remote-tracking branch 'adv/edit-publish-date'
2017-07-30 06:37:18 +02:00
Jonathan Rehm
0afc8f94da
Use TinyMCE's API to update the description's content
2017-07-25 13:16:12 -07:00
Jonathan Rehm
dd124ab356
Make change requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
59afc7eb9f
Make changes requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
3258f4fb79
Make changes requested by Codacy
2017-07-23 13:36:21 -07:00
Jonathan Rehm
61e0405f75
Move TinyMCE into edit_books.js
2017-07-23 13:36:21 -07:00
Jonathan Rehm
5715d27c97
Show localized date over top of date input
...
Also move datepicker logic into edit_books.js and edit_books.js below the datepicker file declaration(s)
2017-07-23 13:36:21 -07:00
Jonathan Rehm
36c2b35588
Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in
2017-07-23 13:35:35 -07:00
OzzieIsaacs
cb5f196f4b
Merge remote-tracking branch 'adv/modal-details'
...
# Conflicts:
# cps/static/js/main.js
# cps/templates/detail.html
2017-07-23 14:03:02 +02:00
OzzieIsaacs
1e2edcf753
Merge remote-tracking branch 'adv/author-info'
2017-07-23 13:36:50 +02:00
Jonathan Rehm
693c26c2b3
Attach events to button toolbar
...
Since this is closer to the elements, we can be more sure that we won't have events fire when we don't want them to. For example, if we're viewing the page in a modal, we don't want the event handler living longer than the content itself.
2017-07-22 11:24:47 -07:00
Jonathan Rehm
d85e0b96dc
Prevent jQuery from cache busting static assets
...
If the HTML that's returned from the `$.get` request contains a `<script src="..."/>` tag it loads the JavaScript file via ajax, and by default it attaches a timestamp to it to bust cache. That means the file loads every time the modal is opened, and the browser treats it as a new file each time. The result is that code fires multiple times and events listeners are added multiple times.
2017-07-22 11:11:14 -07:00
Jonathan Rehm
e1a88aa0ab
Make change requested by Codacy
2017-07-22 07:34:38 -07:00
Jonathan Rehm
5c3a5b6c39
Use ajax to add/remove books from shelves
...
Gracefully fall back to standard requests if JavaScript is disabled
2017-07-21 21:15:03 -07:00
Ozzie Isaacs
2e8a268dfa
Fix #241 No1
2017-07-18 20:39:35 +02:00
OzzieIsaacs
5985342b79
Bugfix for typeahead in search function and on edit books page
2017-07-11 18:08:12 +02:00
Jonathan Rehm
802eb628c8
Split event listener and selector string
...
Event and selectors appear to have been accidentally combined. The result is that typing in any input triggers a call to the `/get_matching_tags` route. We can probably limit the selector farther to only fire when `#tags` is typed into.
2017-07-10 13:03:58 -07:00
