blitzmann
2533c9c14e
Continue converting tasks - email and upload tasks
2020-08-22 22:44:28 -04:00
blitzmann
f10f0dada6
First working PoC with a new task structure
2020-08-22 16:31:00 -04:00
OzzieIsaacs
282859bc1b
Merge remote-tracking branch 'github/master' into master
2020-08-22 15:38:40 +02:00
OzzieIsaacs
a3ae97a5a3
Fix #1574 (author name not shown in change book order in shelfs)
2020-08-22 15:37:40 +02:00
OzzieIsaacs
ed8275a20b
Fix #1574 (author name not shown in change book order in shelfs)
2020-08-22 15:35:21 +02:00
OzzieIsaacs
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
2020-08-22 10:27:09 +02:00
OzzieIsaacs
ad144922fb
Merge with master
2020-08-22 09:23:29 +02:00
OzzieIsaacs
b9c0f2a3d3
Merge remote-tracking branch 'origin/master' into master
2020-08-21 19:27:19 +02:00
OzzieIsaacs
0cc07362b8
Fix for #1573
2020-08-21 19:26:58 +02:00
Brandon Ingli
4ee5dcaff3
Elevate Log Messages in web.py
...
Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.
2020-08-17 11:29:10 -05:00
Ozzie Isaacs
4d44746a88
Change settings database gdrive watch to JSON
2020-08-15 15:07:03 +02:00
OzzieIsaacs
1535bdbcd8
Merge remote-tracking branch 'memorydatabase/issue/1564'
2020-08-15 12:08:59 +02:00
OzzieIsaacs
f9c6fb30bf
Excluded series type again, as it causes problems upon reconnect
2020-08-14 19:43:54 +02:00
Ozzie Isaacs
94ad93ebd7
Added series like custom columns #1501
2020-08-11 18:56:34 +02:00
blitzmann
0e1ec5034e
Fix for #1564 - using memory database in multiple threads.
...
See also: https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#using-a-memory-database-in-multiple-threads
2020-08-11 12:44:55 -04:00
OzzieIsaacs
b309c1fc91
Fix filenames (Escape "\") for searching calibre excecutable on windows
2020-08-09 15:11:54 +02:00
Ryan Holmes
969105b205
Trim whitespace from filename
...
This avoids an OSError when the book's metadata has whitespace at the end of it.
2020-08-09 01:08:00 -04:00
Ryan Holmes
28bfb06c67
Revert the deletion of another line
...
This was done by mistake, whoops!
2020-08-09 00:57:30 -04:00
Ryan Holmes
704dcb3e58
Move assignment of new_coverpath
...
With the assignment originally being within the try, if the try failed, the exception wouldn't have access to the value
2020-08-09 00:55:56 -04:00
Ren Wei
4c6f5096be
get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results.
2020-08-01 15:12:20 +08:00
Ozzie Isaacs
1a1d105fae
Fix #1538 (Floating point numbers showing 2 decimals on details page
2020-07-23 19:31:48 +02:00
Ozzie Isaacs
42a0639bb5
Fix #1533 (Invalid LDAP Cert Path no longer crashes app)
2020-07-23 19:23:57 +02:00
Ozzie Isaacs
e27b08203d
Fix #1531 (white background on transparent cover instead of black one)
2020-07-23 18:41:38 +02:00
Clément Poissonnier
1ca4583896
feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported
2020-07-23 12:12:00 +02:00
Ozzie Isaacs
25fc6f1937
Further fixes for #1530 (Handle improper migrated database with config_mature_content_tags, allowed_tags, denied_tags, denied_column_value, allowed_column_value NULL instead of "")
2020-07-22 18:44:11 +02:00
Ozzie Isaacs
0ccc3f7252
Fixes for windows (moving files not allowed -> Close pdf after metadata extracting, add os.path.normcase to path while renaming folders, as thi caused also trouble
...
Added hint for missing ghostcript on cover extraction
2020-07-21 20:14:08 +02:00
Ozzie Isaacs
66acd1821d
Update Gdrive integration (Error Handling on Callback and wording)
2020-07-21 18:01:38 +02:00
Ozzie Isaacs
93a0217d5f
Fix for #1530 (Handle improper migrated database with config_mature_content_tags NULL instead of "")
2020-07-20 20:28:10 +02:00
Jef LeCompte
711a697570
Merge remote-tracking branch 'upstream/master' into jef/download-kobo
2020-07-13 01:50:38 -04:00
Ozzieisaacs
f8139f3198
Store last selected view for sidebar (not for categories, series, publishers, ..)
...
Started making search paged
2020-07-11 12:09:34 +02:00
Ozzieisaacs
df01022f49
Added save user view settings
2020-07-08 21:18:38 +02:00
Ozzieisaacs
450411a732
#1344 (Support Multiple authors, but not showing up on Kobo reader)
...
Fix for #1439 (reading progress was not stored, as user login was wrong)
2020-07-05 20:54:36 +02:00
Ozzieisaacs
f80c67828b
Fix #1500 (Custom ratings of increment 0.5 are allowed)
2020-07-05 14:35:57 +02:00
Ozzieisaacs
d1889a5e06
Fix #1502 (program info only visible in about section if user is admin)
2020-07-05 14:00:40 +02:00
Ozzieisaacs
12263ff02f
Fix #1423 (OverflowError thrown during sync on some Linux Systems if one of the timestamps is outside range 1970 to 2038)
2020-07-05 13:55:59 +02:00
Ozzieisaacs
76f914cbc2
Fixed logging in SyncToken
2020-07-05 13:52:29 +02:00
Ozzieisaacs
c1f5252b3f
Fix #1509 (OSError thrown during sync on Windows if one of the timestamps is outside range 1970 to 2038)
2020-07-05 13:40:33 +02:00
Ozzieisaacs
20c6f79a44
Changed behavior delete books with subfolders (additional warning message, but book is deleted)
2020-07-05 10:44:49 +02:00
Ozzieisaacs
ee6f1405d4
Fix #1456 (Added route to robots.txt)
2020-07-04 21:22:19 +02:00
Ozzieisaacs
ee3541d74e
Fix kobo links for reverse proxies with subdomains (and docker?) #1470
2020-07-04 13:35:08 +02:00
Jef LeCompte
e048388213
feat(api): include external port option
...
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
2020-07-03 12:58:58 -04:00
Ozzieisaacs
3ff3431b17
Merge branch 'master' into Develop
2020-06-30 19:59:38 +02:00
Ozzieisaacs
8608ff11f7
Fix #1507 (Password generation on python2 working again)
2020-06-30 19:58:07 +02:00
Michael Knepher
7e0d9fbace
series_index filter to show x.0 as x
2020-06-29 23:34:26 -07:00
Ozzieisaacs
c6c9cfea22
Merging books basically working
2020-06-29 20:14:48 +02:00
Ozzieisaacs
a758976c69
Merge branch 'master' into Develop
2020-06-29 18:47:16 +02:00
OzzieIsaacs
601464083b
Fix for task wrap around
2020-06-28 13:44:21 +02:00
Ozzieisaacs
ccca5d4d1c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
2020-06-28 12:11:46 +02:00
Ozzieisaacs
ba10657829
Add fix for read only gdrive file
2020-06-28 12:06:27 +02:00
Ozzieisaacs
6315655f93
Re-add missing po files
2020-06-28 12:05:16 +02:00
Ozzieisaacs
533cb23b73
Merge remote-tracking branch 'next/bug/login-next-get-param'
2020-06-28 10:01:41 +02:00
Ozzieisaacs
852f252d13
Prevent invalid variable
...
Make text in kobo_auth_screen consistent
2020-06-28 09:48:05 +02:00
Ozzieisaacs
080042882f
Merge remote-tracking branch 'cz/master'
2020-06-28 09:33:18 +02:00
Ozzieisaacs
dde5b08c47
Re enabled gevent as dependency
...
Fix #1399 (Calibre-web starting with installed and not activated gdrive denpendencies without internet connection again)
2020-06-27 13:36:33 +02:00
Ozzieisaacs
88d2c60ee8
Catch some errors related to non writable settings db
2020-06-27 13:22:16 +02:00
Ghighi Eftimie
eeff5a5d43
fix for hidden input 'next' on login form
2020-06-27 12:00:08 +03:00
Michael Knepher
67dd4a72b0
Add series info to all book "meta" displays
2020-06-26 12:26:36 -07:00
Ozzieisaacs
a0b8cc21cc
Fix #1503 (js error on login screen)
2020-06-23 15:07:14 +02:00
Ozzieisaacs
329a7a03a5
Fix for errors editing/uploading books with duplicate tags/authors/language names
...
Additional parsing of epubs for cover files
Fix for change of database with linked read_column and read column isn't present any more
2020-06-22 19:11:58 +02:00
Ozzieisaacs
d0a3503d74
Fix #1493 (stay logged in with enabled remember token, use remember token)
2020-06-20 19:02:23 +02:00
Ozzieisaacs
59b78f9984
enable disabling of remember_me function
2020-06-20 15:41:26 +02:00
Ozzieisaacs
bf75f16169
Updated Chinese translation
2020-06-20 13:55:34 +02:00
Ozzieisaacs
2f833dc457
Fix login with remember me token
2020-06-20 13:46:12 +02:00
Ozzieisaacs
22344a3971
Improvements for delete book
2020-06-18 20:39:45 +02:00
Ozzieisaacs
8dde6ba60f
UI improvements table buttons
2020-06-12 21:40:09 +02:00
Ozzieisaacs
d44f283a05
View status in books table is stored
2020-06-12 16:15:54 +02:00
Ozzieisaacs
c18d5786dd
Improved validation check
2020-06-12 13:45:07 +02:00
Ozzieisaacs
f26ccfe16c
Table edit: validator routine to prevent empty fields working
2020-06-11 21:36:12 +02:00
Ozzieisaacs
1c681ee378
Improvements for books table editor
2020-06-11 21:19:09 +02:00
Ozzieisaacs
94b5ec91cc
Title in table translatable
...
Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout
2020-06-11 08:48:23 +02:00
Ozzieisaacs
6bfbf3ee41
Update layout
2020-06-11 08:35:23 +02:00
Ozzieisaacs
7b4306b1d6
UI improvements (same colors of buttons, etc.)
...
Changed Editable default value
2020-06-09 20:46:02 +02:00
Ozzieisaacs
4516cc0d65
Listen button only visible if user has read permissions
...
Audioformat fix
Table edit functions only available if user has edit rights
2020-06-08 21:57:52 +02:00
Ozzieisaacs
308784c601
Hide listen button if user has no read/listen permissions
2020-06-08 21:56:40 +02:00
Ozzieisaacs
9145c9a52c
Fix #1397 (Reenabled m4a, m4b audio playback)
2020-06-08 21:50:11 +02:00
Ozzieisaacs
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
2020-06-08 17:34:03 +02:00
Ozzieisaacs
628658972c
Merge branch 'master' into Develop
2020-06-07 19:39:17 +02:00
Ozzieisaacs
db0fe9a755
Fix for #1474 (old comicapi with installed unrar, but missing unrar-lib)
2020-06-07 15:41:53 +02:00
Ozzieisaacs
fdf10e3d2e
Fix #1473 (reconnect not working via web-route access)
2020-06-07 14:11:41 +02:00
Ozzieisaacs
ded3e06a9b
Updated french translation
2020-06-07 06:48:51 +02:00
Ozzieisaacs
0dd0605a1f
Book list for merging
2020-06-06 21:21:10 +02:00
Ozzieisaacs
827b0c6e50
Changed pubdate to timestamp
2020-06-06 09:52:35 +02:00
Ozzieisaacs
d1b533848d
Changed pubdate to timestamp
2020-06-05 20:13:39 +02:00
Ozzieisaacs
13ae28edab
Fix #1449 (Shelf download menu wasn't working for books with more than one format)
2020-06-04 20:34:31 +02:00
Ozzieisaacs
82253219e8
Fix #1449 (Shelf download menu wasn't working for books with more than one format)
2020-06-04 20:33:14 +02:00
Ozzieisaacs
94592b74a6
Merge branch 'master' into Develop
2020-06-03 20:15:55 +02:00
Ozzieisaacs
eef2112e1e
#1430 (changed color of rating stars)
2020-06-03 20:14:07 +02:00
Ozzieisaacs
b83d56eff2
Version bump
2020-06-03 19:10:36 +02:00
Ozzieisaacs
4c539b6db4
Fix #1448 (Public shelfs are accessible even if not logged in)
2020-06-03 19:10:07 +02:00
OzzieIsaacs
2ad329e64c
Preparation for release
2020-06-02 22:12:36 +02:00
Ozzieisaacs
4de89ec6ce
Merge remote-tracking branch 'it/patch-14'
2020-06-02 20:58:17 +02:00
Ozzieisaacs
fc885c8fa2
Merge remote-tracking branch 'cz/patch-1'
2020-06-02 20:51:31 +02:00
Ozzieisaacs
ef2c98ba39
Fix #1453 (error unrar binary not found)
2020-06-02 20:51:08 +02:00
ElQuimm
41d922867e
updated italian version of message.po
...
Thank you.
2020-06-02 09:02:44 +02:00
Ozzieisaacs
89223760e6
Merge branch 'master' into Develop
2020-06-01 10:58:49 +02:00
Ozzieisaacs
9a8a1f75ca
For for error unrar binary not found
2020-06-01 10:54:41 +02:00
flying-sausages
52e8e7e4b0
Some czech translations
2020-05-31 22:51:41 +01:00
Ozzieisaacs
7d08cde8b8
Update error handling cover upload
2020-05-29 06:59:40 +02:00
Ozzieisaacs
d3c2bf7dd4
Merge remote-tracking branch 'es/patch-1'
2020-05-28 18:50:16 +02:00
Michael Knepher
54cf3652b0
Add series name and index to book cover info
2020-05-27 21:57:59 -07:00
Ozzieisaacs
5607d2086d
Added error handling for cover upload
2020-05-27 20:41:16 +02:00
Ozzieisaacs
27ed918896
Enabled search for archived books
2020-05-27 19:19:17 +02:00
Ozzieisaacs
9b2df9cfd9
Fix #1441 (list copy function not available on python2, crashes edit metadata)
2020-05-27 18:38:50 +02:00
Wolviex
dde7cf18f7
removed extra reference to calibre_db (calibre_db.calibre_db..) typo?
2020-05-27 01:41:15 -07:00
Rafael Roa
48aadbf716
Update messages.po
2020-05-26 23:28:29 +02:00
Ozzieisaacs
5514af60e5
Merge remote-tracking branch 'it/patch-13'
2020-05-26 18:43:12 +02:00
ElQuimm
e8449eb02f
Updated version of italian message.po
...
Thank you.
2020-05-26 18:37:15 +02:00
Ozzieisaacs
9ea21a7ecb
Possible fix for #1436
2020-05-26 18:20:32 +02:00
Ozzieisaacs
fec86c2862
Update Grid/list view of series
2020-05-26 15:19:32 +02:00
Ozzieisaacs
11e5d4c5b7
Merge remote-tracking branch 'es/patch-2'
2020-05-25 21:57:26 +02:00
Ozzieisaacs
b852fb0e26
Merge branch 'Develop'
2020-05-25 21:30:21 +02:00
Ozzieisaacs
0fc18bf3b1
Fix for #1398 (prevent empty series_index field)
2020-05-25 19:34:31 +02:00
Rafael Roa
d4be584782
Update messages.po
...
Here is the whole file traslated
2020-05-25 17:35:46 +02:00
Ozzieisaacs
6f9c08f906
Fix typo RarExecutable
2020-05-24 20:54:23 +02:00
Ozzieisaacs
70c666c380
Upload book without reload complete library
2020-05-24 20:40:58 +02:00
Ozzieisaacs
46197d82b5
Edit and Upload books refactored
2020-05-24 20:19:43 +02:00
Ozzie Isaacs
e4eab17595
Fix version detect of binaries on windows
2020-05-24 17:24:54 +02:00
Ozzieisaacs
cf10244f20
Fix for failed recovery of config_logfile
2020-05-24 09:59:45 +02:00
Ozzieisaacs
570684d308
Fix custom bool column not visible in adv search if linked to read status
2020-05-23 21:26:39 +02:00
Ozzieisaacs
244db8d894
Fix from tests advanced search for custom columns
2020-05-23 21:17:58 +02:00
Ozzieisaacs
96d6018ecc
Added ability to view comicapi version
...
Changed required comicapi version
Unified "cannot" and "Cannot" texts
Removed annoying "was already removed" string from log
2020-05-23 16:20:19 +02:00
OzzieIsaacs
73ad6dd0c4
Fix kobo sync (sync tags)
2020-05-23 14:40:50 +02:00
OzzieIsaacs
d0e15da352
Fix lcase function
2020-05-23 12:51:48 +02:00
Ozzieisaacs
b1b293a3ec
Fix order_authors
2020-05-23 11:09:50 +02:00
Ozzieisaacs
5f0660a4e5
Refactored helper.py and db.py
2020-05-23 10:16:29 +02:00
Ozzieisaacs
ec3a3a73ef
Merge branch 'master' into Develop
2020-05-23 08:50:24 +02:00
Ozzieisaacs
087c4c5929
Merge remote-tracking branch 'opds/master'
2020-05-23 08:48:08 +02:00
Ozzieisaacs
e0ee2e0801
Merge remote-tracking branch 'typo/master'
2020-05-23 08:47:08 +02:00
Michael Knepher
c79a9e9858
Fix typo "Shelfs" to "Shelves"
2020-05-22 11:43:52 -07:00
OzzieIsaacs
b7535b9526
Merging master branch
...
- fix title sort function
- fix focus on search
2020-05-21 22:31:29 +02:00
OzzieIsaacs
0cf1cc5587
Fixes from tests
2020-05-21 22:26:19 +02:00
Ozzieisaacs
098dab889a
Fixed title sorting routine
2020-05-21 19:37:54 +02:00
Ozzieisaacs
cc856c7cd1
Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress'
2020-05-21 19:18:02 +02:00
Ozzieisaacs
a20a155d39
Merge remote-tracking branch 'typo/patch-2' into Develop
2020-05-21 19:14:29 +02:00
Ozzieisaacs
1a458fe39f
Fix for #1407 converting books should now be possible again
2020-05-21 18:16:11 +02:00
celogeek
051ffdda35
activate search focus if search in progress
2020-05-21 16:42:02 +02:00
OzzieIsaacs
a48418364c
Fiexes from tests
2020-05-21 13:54:28 +02:00
Ozzieisaacs
b75497231e
Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result)
2020-05-21 09:28:35 +02:00
Knepherbird
5cceeb6ef2
Fix: correct property typo
...
Correcting 'box-sizeing' to 'box-sizing'
2020-05-19 13:10:25 -07:00
Ozzieisaacs
29b94c5615
Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column
2020-05-19 21:36:22 +02:00
Ozzieisaacs
81fc1eccd3
Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column
2020-05-19 21:35:56 +02:00
Braincoke
22fae51c9d
Fix XML parsing error when using OPDS feeds
...
Using the OPDS feeds with MoonReader yielded the following error:
"Error parsing XML: unbound prefix".
This was due to a missing namespace in the feed.xml template.
See https://github.com/janeczku/calibre-web/issues/1403 for more
information.
2020-05-18 20:07:02 +02:00
Ozzieisaacs
4332f7a640
Better detection of localhost for kobo sync (possibly related to #1400 )
2020-05-17 21:44:12 +02:00
Ozzieisaacs
d0e603e62d
Better detection of localhost for kobo sync
2020-05-17 21:42:25 +02:00
Ozzieisaacs
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
2020-05-17 16:22:58 +02:00
Ozzieisaacs
742799b4ac
Added missing float custom column to search form
2020-05-17 16:10:10 +02:00
Ozzieisaacs
5405dc5141
Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash)
2020-05-17 11:15:46 +02:00
Ozzieisaacs
013793f989
Fix for #1391 (Kobo sync not working if series is given, but no series_index)
2020-05-17 10:46:48 +02:00
Ozzieisaacs
2468cf63cc
Fix for #1397 (changed supported audio files)
...
Changed max gevent version
Fix for #1397 (changed supported audio files)
2020-05-17 10:07:36 +02:00
Ozzieisaacs
8e9b5d7e50
Merge remote-tracking branch 'caliblur/master'
2020-05-15 21:01:08 +02:00
Ozzieisaacs
a33515d907
Merge remote-tracking branch 'refactor/refactor_uploader'
2020-05-15 20:36:00 +02:00
Ozzieisaacs
a276a33081
Merge remote-tracking branch 'nl/master'
2020-05-15 20:34:30 +02:00
h1f0x
e325c3dbf6
fixed div selection in caliBlur.js
2020-05-14 12:29:52 +02:00
h1f0x
b3fef625a8
Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
2020-05-14 11:57:38 +02:00
Ozzieisaacs
13994a5f96
Merge branch 'master' into Develop
2020-05-13 20:16:29 +02:00
Ozzieisaacs
e8ac62cdd8
Moved password replace to prevent incomplete session
2020-05-13 20:15:35 +02:00
Ozzieisaacs
1bc7134ec2
Fix error 500 on reset password in debug mode
2020-05-13 20:04:43 +02:00
Ozzieisaacs
273572f44c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/ub.py
2020-05-13 20:03:54 +02:00
Ozzieisaacs
ac37483d47
Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration)
2020-05-13 19:43:14 +02:00
Ozzieisaacs
0cc2b49296
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/book_edit.html
2020-05-12 19:10:19 +02:00
Ozzieisaacs
44d5adc16f
Fix #1390
2020-05-12 19:08:51 +02:00
Ozzieisaacs
f749fc641b
Temporary fix for #1390
2020-05-12 17:42:24 +02:00
Ozzieisaacs
87c76c09e2
temporary fix for #1390
2020-05-12 17:41:49 +02:00
Ozzieisaacs
e787f9dd9f
Automatic username ( #1172 )
2020-05-12 17:23:58 +02:00
Ozzieisaacs
ec7d5b17ab
Added table view for books
2020-05-12 16:32:26 +02:00
Ozzieisaacs
47641eee59
Merge branch 'master' into Develop
2020-05-12 16:16:04 +02:00
Ozzieisaacs
42abe28cc1
Fix for #1389 (import ldap users with whitespaces)
2020-05-12 16:13:56 +02:00
Ozzieisaacs
b48afa38ac
Fix #1386 (Add asin to recognized identifiers)
2020-05-12 14:44:57 +02:00
Ozzieisaacs
f7269d8df2
Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)
2020-05-12 14:39:13 +02:00
Ozzieisaacs
ce0fab8d2f
Fix duplicate shelf names in "search"
2020-05-12 14:37:13 +02:00
Ozzieisaacs
33472567de
Improved Debug output on send email
2020-05-11 19:28:22 +02:00
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
jvoisin
e69c4cd1dc
Refactor a bit cps/uploader.py
2020-05-11 13:15:30 +02:00
Marcel
e0d3ccd8d1
Update messages.po
2020-05-10 21:05:39 +02:00
Ozzieisaacs
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
2020-05-10 19:24:55 +02:00
OzzieIsaacs
92db00692a
Merge all headers to download response
...
Updated test results
2020-05-10 14:58:18 +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
OzzieIsaacs
a9085752c1
Fix error "email" not in to_save
2020-05-10 10:26:22 +02:00
OzzieIsaacs
e1fbc9255c
Merge remote-tracking branch 'sec_fixes/bump_underscore'
2020-05-10 10:26:01 +02:00
OzzieIsaacs
f33e25ac40
Merge remote-tracking branch 'sec_fixes/cookies_improvement'
2020-05-10 10:22:21 +02:00
OzzieIsaacs
51365ab006
Merge remote-tracking branch 'sec_fixes/strong_session_protection'
2020-05-10 10:21:19 +02:00
OzzieIsaacs
d61b7e48d7
Merge remote-tracking branch 'sec_fixes/random_password'
2020-05-10 10:18:40 +02:00
OzzieIsaacs
f590b24f85
Merge remote-tracking branch 'sec_fixes/https'
2020-05-10 10:17:36 +02:00
Ozzieisaacs
308fd55483
#1141 (Setting for file size limit on email)
2020-05-09 20:29:17 +02:00
Ozzieisaacs
fefb44e612
#1356 (fixes for readonly metadata.db)
...
Fix remove trailing metadata.db at entering calibre_db_path
2020-05-09 19:54:28 +02:00
jvoisin
dd3b562f1a
Change some links from http to https
2020-05-09 17:11:56 +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
Ozzieisaacs
75fb7c2e95
Allowing upload extensions ( #1119 )
2020-05-09 16:54:22 +02:00
jvoisin
264b4b669e
Bump underscorejs version from 1.9.1 to 1.12.2
2020-05-09 16:54:21 +02:00
Ozzieisaacs
51f12c51ad
Fix #1361 (covers of archived books not shown)
2020-05-09 16:37:02 +02:00
Ozzieisaacs
03d134697c
Fix #1361 (covers of archived books not shown)
2020-05-09 16:36:08 +02:00
Ozzieisaacs
ff3f42db95
Fix #1364 (translated format identifier)
...
Updated french Translation
2020-05-09 16:12:55 +02:00
Ozzieisaacs
e8aedeac36
Refactored admin.py
2020-05-09 16:00:31 +02:00
jvoisin
bf166b757a
Improve a bit the cookie's hardening
...
- Samesite for session cookies as well as the remember me ones
- Httponly
2020-05-09 14:42:28 +02:00
jvoisin
b4165335a7
Use strong sessions protection
...
See https://flask-login.readthedocs.io/en/latest/#session-protection for
details
2020-05-09 14:34:14 +02:00
jvoisin
2a1bf2fa71
Generate strong random passwords
2020-05-09 14:24:20 +02:00
Ozzieisaacs
718d50a037
Starting again without traceback (moved gdriveutil import)
2020-05-09 12:17:28 +02:00
Ozzieisaacs
41960ada4a
Autodetect binaries
2020-05-09 11:04:35 +02:00
Ozzieisaacs
0a02caad04
Improvements
2020-05-09 11:01:00 +02:00
Ozzieisaacs
ff75bdba9e
Merge branch 'master' into Develop
2020-05-08 19:05:08 +02:00
Ozzieisaacs
189243a9b0
Merge remote-tracking branch 'publisher_sort/patch-1'
2020-05-08 15:04:45 +02:00
Ozzieisaacs
34e339c506
Merge remote-tracking branch 'it/patch-12'
2020-05-08 14:59:51 +02:00
Ozzieisaacs
a437c603c6
Merge remote-tracking branch 'kepubify/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/helper.py
# cps/templates/config_edit.html
# cps/web.py
2020-05-08 14:53:21 +02:00
Ozzieisaacs
4e940f7fa0
Added response header for improving security
2020-05-08 14:49:12 +02:00
Knepherbird
69fde7dead
Update web.py
...
Set db.Publishers query to order by name column, because publishers.sort column is empty.
2020-05-07 13:55:59 -07:00
Ozzieisaacs
4368c182a0
Make goodreads compatible for betterreads dependency
2020-05-06 20:57:54 +02:00
Ozzieisaacs
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
2020-05-06 18:47:33 +02:00
Ozzieisaacs
6a6c1b6b21
Fix for #1358 , #1355
2020-05-06 16:25:03 +02:00
Ozzieisaacs
51808d2ad4
Version Bump
2020-05-05 20:31:12 +02:00
Ozzieisaacs
0735fb1e92
Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
...
Preparation for release
2020-05-05 20:28:10 +02:00
Ozzieisaacs
850a85915b
Fix #1354 (Error on uploading single book, because of missing rarfile)
2020-05-05 18:48:40 +02:00
ElQuimm
148f1109c6
updated messages.po
...
just a little update for coherence with Read/da leggere -> Archived/da archiviare.
Sorry :-)
2020-05-04 20:56:58 +02:00
Ozzieisaacs
fcbeeca305
Merge remote-tracking branch 'it/patch-11'
2020-05-04 20:21:05 +02:00
Ozzieisaacs
fb16429867
Randomize flask secret_key
2020-05-04 19:02:03 +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
ElQuimm
db38d7ee78
Updated version of italian.po
...
:-)
2020-05-03 21:30:06 +02:00
Ozzieisaacs
0adcd1b3d9
UI Improvements
...
Added additional restrictions to Calibre DB interface
2020-05-03 10:55:33 +02:00
OzzieIsaacs
36a984ce3c
Revert proxyfix
2020-05-02 18:17:52 +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
64bebaa1d1
Update Upload formats
2020-05-02 10:46:00 +02:00
Ozzieisaacs
0138ff9e16
Added additional config options
2020-05-02 10:18:01 +02:00
Ozzieisaacs
9bc085a23e
Fixes for comic reader
2020-05-02 09:35:14 +02:00
Michael Shavit
e0fbfa44a4
Fix issue with cover images introduced during the merge of #1277 .
2020-05-02 01:55:14 -04: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
b95f6563cc
Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop
2020-05-01 17:19:13 +02:00
Ozzieisaacs
700cb3b553
Merge remote-tracking branch 'NL/master'
...
Updated all strings
2020-05-01 17:15:59 +02:00
Ozzieisaacs
8646f8f23a
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
2020-05-01 14:51:54 +02:00
OzzieIsaacs
2c5d76908a
Added missing upload format
2020-05-01 13:34:16 +02:00
Ozzieisaacs
832b34fc54
Improved errorhandling for resending password
...
Improved errorhandling for editing user
2020-05-01 12:00:45 +02:00
Ozzieisaacs
000b85ff81
Fixes for deleting books(error handling and user feedback)
2020-05-01 10:26:35 +02:00
Ozzieisaacs
bb317d54f2
Fix reject reset password without configured email server
2020-05-01 08:37:54 +02:00
Ozzieisaacs
d6f41d8dc0
Fix error 404 on reset password ( Fix #1342 )
2020-05-01 08:33:50 +02:00
Marcel
6dff5ed679
NL language update
2020-04-30 21:30:50 +02:00
OzzieIsaacs
fb8b6310d5
Fix from tests
2020-04-30 20:58:01 +02:00
Ozzieisaacs
02aaf17ac5
Fix #1339 (Proxyfix import with old werkzeug versions causes traceback)
2020-04-30 19:21:08 +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
Ozzieisaacs
e3246fd751
Merge remote-tracking branch 'key'
2020-04-30 17:29:41 +02:00
Ozzieisaacs
fb18ab1ca5
Fix #866 (Recent book sidebar element can't be removed anymore)
2020-04-29 18:57:39 +02:00
Ozzieisaacs
01ff55c84e
Removed non working filters for search
2020-04-29 17:57:53 +02:00
jvoisin
523aab2e9e
Don't use an hardcoded session key
...
This fixes a trivial authentication bypass,
according to https://flask.palletsprojects.com/en/1.1.x/quickstart/#sessions
2020-04-29 13:59:34 +02:00
Ozzieisaacs
9a7d9da654
Merge remote-tracking branch 'js_caliblur/xss'
2020-04-29 12:08:51 +02:00
Ozzieisaacs
e9446556a1
Merge remote-tracking branch 'ru/master'
2020-04-29 12:06:35 +02:00
jvoisin
806a5f209f
Fix two minor xss
2020-04-29 11:33:33 +02:00
ZIzA
c864b368b0
Russian language update
2020-04-29 01:30:14 +04:00
Ozzieisaacs
27eb09fb19
Add unrar Support
2020-04-28 20:23:39 +02:00
Ozzieisaacs
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
2020-04-28 16:50:08 +02:00
Ozzieisaacs
0297823bda
Merge remote-tracking branch 'codecosmetic/move_var'
2020-04-28 15:33:25 +02:00
Ozzieisaacs
d1bce5c2d9
Update nl translation from development branch
2020-04-27 21:15:19 +02:00
Ozzieisaacs
46c0ae3ccc
Revert accidently deleted nl translation strings
2020-04-27 21:11:43 +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
jvoisin
487878819e
Move a few variables around
...
This should prevent a couple of crashes
due to undeclared variables.
2020-04-27 12:03:54 +02:00
Ozzieisaacs
6682b1ced1
Fix download of book covers with enabled pillow from url
2020-04-26 21:00:29 +02:00
Ozzieisaacs
bc89b0658a
Fix deletion of books with multiple custom column links
...
Fix delete of author-folder in case last book of author was deleted (#1269 )
2020-04-26 20:44:37 +02:00
Ozzieisaacs
d9dde36c74
Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
2020-04-26 19:00:36 +02:00
Ozzieisaacs
44284ea5fb
Merge remote-tracking branch 'opds/master'
...
# Conflicts:
# 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-26 18:55:23 +02:00
Ozzieisaacs
9f0c0b34af
Merge remote-tracking branch 'order_category/master'
2020-04-26 18:50:28 +02:00
Ozzieisaacs
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
2020-04-26 18:38:09 +02:00
Ozzieisaacs
898e6b4f80
Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods)
2020-04-26 18:24:22 +02:00
Ozzieisaacs
dea2600913
Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy
2020-04-26 18:23:16 +02:00
Ozzieisaacs
dc46ad16ae
Bugfix view shelfs on book detail page
2020-04-26 11:35:47 +02:00
Ozzieisaacs
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
2020-04-26 11:34:10 +02:00
Ozzieisaacs
7b789b3701
Fix opds with shelves
...
Fix errorhandler ldap without ldap
2020-04-26 08:40:53 +02:00
Ozzieisaacs
0480d493cf
Fix opds login with ldap, if ldap server is down
2020-04-25 21:12:07 +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
8b8fe7a0ae
bugfix on create shelv via kobo sync protocol
...
bugfix for totally wrong json requests
prevent empty shelf names on kobo create shelf
Removed errorhandler 404
2020-04-25 20:02:55 +02:00
Ozzieisaacs
d657330584
Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326
2020-04-25 07:13:55 +02:00
Ozzieisaacs
36cb79de62
Merge remote-tracking branch 'turkish/master'
2020-04-24 22:14:57 +02:00
Ozzieisaacs
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
2020-04-24 21:05:56 +02:00
Ozzieisaacs
7393b69757
Fix for #1326 (typo)
2020-04-24 19:25:11 +02:00
Ozzieisaacs
8bd1903d98
Fix for #1326 (opds feed user login not working -> download was not possible)
2020-04-24 18:37:29 +02:00
jvoisin
d8bf540db2
Remove an undeclared and useless local variable
2020-04-24 18:04:27 +02:00
Ozzieisaacs
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
2020-04-24 16:56:08 +02:00
iz
1770f3fd0d
Update turkish translation headers
2020-04-23 22:47:24 +03:00
iz
4239f2ed71
Add turkish translation
2020-04-23 22:37:44 +03:00
iz
3939ec28ba
Add turkish language names
2020-04-23 22:37:35 +03:00
Michael Shavit
742ec2b38d
Fix issue with the delete_book changes introduced in
...
41a3623
2020-04-22 00:19:33 -04:00
Michael Shavit
9296d35517
Fix bug with shelf deletions for Kobo.
...
We were incorrectly setting the user_id field in the ShelfArchive table
2020-04-21 23:57:20 -04:00
Michael Shavit
06c15a792e
Minor fixes to the Kobo shelves implementation (mostly typos)
2020-04-21 23:36:47 -04:00
Ozzieisaacs
95ca1e6a9d
Fix for #1319
2020-04-20 18:56:39 +02:00
Ozzieisaacs
1df82110d1
Update Italian language translation
2020-04-19 19:13:10 +02:00
Ozzieisaacs
24c743d23d
Code cosmetics
2020-04-19 19:08:58 +02:00
ElQuimm
f1b1ebe29e
Updated italian version of messages.po
2020-04-19 16:38:30 +02:00
Jeff
6384cdc74d
Fix https github oauth
...
while using https domian and nginx as proxy, a `ProxyFix` is required.
2020-04-19 19:53:41 +08:00
celogeek
d093fbb069
Keep previous search value and focus
2020-04-19 13:12:02 +02:00
celogeek
f9b4505843
Sort search result by Books sort
...
It is far easier to search for a
series or anything and see
books in sort order
2020-04-19 13:03:46 +02:00
celogeek
ca2bcc647d
Handle read config
...
Allow advance search
Remove duplicate status on show
2020-04-19 12:50:58 +02:00
pthiben
b90048d72e
fix badge color on grid view to match list view
2020-04-18 23:41:01 -04:00
pthiben
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
2020-04-18 23:32:15 -04:00
pthiben
2874cf531c
Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
...
# Conflicts:
# cps/ub.py
# cps/web.py
2020-04-18 23:27:56 -04:00
pthiben
ea7058e896
Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa
2020-04-18 23:23:56 -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
2d66da3cb9
restrict button for grid<->list switch to series lists
2020-04-18 23:23:56 -04:00
pthiben
b7efbf9040
resynced grid view with list view
...
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
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
pthiben
20cc5107da
Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa
2020-04-18 22:57:25 -04:00
pthiben
a6a4d5f09b
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 22:56:24 -04:00
pthiben
028c53287d
update filtering so that it also uses isotope everywhere.
...
Fix asc/desc that did not match list view
2020-04-18 22:54:58 -04:00
pthiben
24a9bea137
restrict button for grid<->list switch to series lists
2020-04-18 22:16:49 -04:00
pthiben
ef1a2d1730
resynced grid view with list view
...
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
2020-04-18 22:10:21 -04:00
pthiben
6abff36e07
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 20:36:27 -04:00
Ozzieisaacs
902685a197
Fix text in user config section (random books in Detail View)
2020-04-18 21:30:28 +02:00
Ozzieisaacs
c04b146486
Fix #1309 (fix duplicate shelf names in book detail view)
2020-04-18 21:15:02 +02:00
Ozzieisaacs
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
2020-04-18 21:12:21 +02:00
Ozzieisaacs
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
2020-04-18 11:48:34 +02:00
Ozzieisaacs
195845ab0c
Fix
2020-04-17 18:17:35 +02:00
Ozzieisaacs
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
2020-04-17 18:16:28 +02:00
Ozzieisaacs
53be752787
Merge remote-tracking branch 'it/patch-10'
2020-04-16 20:17:02 +02:00
Ozzieisaacs
42ac06c114
Merge remote-tracking branch 'nl/Develop' into Develop
2020-04-16 20:14:56 +02: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
2c42972230
Fix for #1307 (Oauth login not working)
...
- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account
2020-04-16 17:58:42 +02:00
aribes
f926e58891
Changing ordering logic when showing books from a category
2020-04-16 11:37:04 +10:00
Ozzieisaacs
a784c6bd52
Fixes for oauth login after programming basic tests
2020-04-15 22:03:21 +02:00
ElQuimm
05d78f5cb5
Update italian version of message.po
...
Have a nice day!
2020-04-15 10:59:08 +02:00
pthiben
4ef7615d88
Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
...
# Conflicts:
# cps/ub.py
2020-04-14 14:53:23 -04:00
pthiben
77c2783a3e
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-14 14:48:06 -04:00
Ozzieisaacs
ce4f1258b5
Fix #1293 (error 500 on search without query)
2020-04-14 19:27:18 +02:00
Ozzieisaacs
3fbaba6693
Fix #1307
2020-04-14 18:28:16 +02:00
Ozzieisaacs
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
2020-04-14 10:58:32 +02:00
pthiben
5b1dfc123f
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-13 17:27:14 -04:00
Michael Shavit
41a3623fcc
[Kobo] Add Shelf/Collection support.
...
Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
2020-04-12 22:29:20 -04:00
Marcel
296ac203d4
Update messages.po
2020-04-11 12:32:37 +02:00
xcffl
0c9436ca82
Regenerate translation files
2020-04-11 00:06:56 +08:00
xcffl
70c9dd1b95
Fix opds format errors & extend info
2020-04-11 00:06:50 +08: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
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
2020-04-04 06:57:54 +02:00
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
Ozzieisaacs
ec6b346ca1
Update Translation
2020-04-03 19:50:29 +02:00
Ozzieisaacs
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
Ozzieisaacs
b89309ab82
Merge remote-tracking branch 'po/master'
2020-04-03 19:27:10 +02:00
Ozzieisaacs
4550333f1e
Added redirect after create shelf
2020-04-02 20:19:05 +02:00
Ozzieisaacs
3ba610eb64
Revert accidentally committed changes in opds feed
2020-04-02 19:07:41 +02:00
Ozzieisaacs
2436c6a118
Merge remote-tracking branch 'caliblur/master'
2020-04-02 18:27:21 +02:00
Ozzieisaacs
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
Ozzieisaacs
0c27ff11b9
Update Updater
2020-04-01 18:45:16 +02:00
BeckyDTP
734e2ffbb2
Updated Polish translations
2020-03-31 21:53:13 +02:00
hexeth
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
Michael Shavit
7cb6801241
Fix issue with cover images.
2020-03-30 02:17:08 -04: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
Ozzie Isaacs
6d1a3ccdcc
Improve logger for windows
2020-03-28 07:13:51 +01:00
Josh O'Brien
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
Ozzieisaacs
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
2020-03-14 10:45:58 +01:00
Ozzieisaacs
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
Ozzieisaacs
a50ca1a85f
Fix #1259
2020-03-14 10:35:58 +01:00
Ozzieisaacs
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
Unknown
a26ce8d8b5
Updated & corrected Dutch translations
...
Un-wonky-fied some literal translations, corrected contexts an respected punctuations, whitespaces, etc.....
See https://github.com/janeczku/calibre-web/issues/606#issuecomment-595913808
2020-03-13 14:01:42 +01:00
Michael Shavit
de0e27c512
Fix #1164 merge.
2020-03-12 20:09:26 -04: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
Ozzieisaacs
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
2020-03-12 20:35:24 +01:00
Ozzieisaacs
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
2020-03-12 20:32:08 +01:00
Ozzieisaacs
46b87dc7eb
Fix for testability of kobo
2020-03-09 20:25:59 +01:00
ElQuimm
fe7c56d269
italian updated version of messages.po
...
09.03.2020
2020-03-09 09:11:41 +01:00
Michael Shavit
ad564e25ca
More fixes for Kobo Sync
...
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
2020-03-08 01:20:54 -05:00
Ozzieisaacs
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
2020-03-07 13:35:58 +01:00
Ozzieisaacs
89927fd7e9
Merge ComicVine API
2020-03-07 13:33:35 +01:00
Ozzieisaacs
18794831e0
Chang link to issue template
2020-03-07 11:27:50 +01:00
Ozzieisaacs
3fb851304f
Merge remote-tracking branch 'ru/master'
2020-03-07 11:21:10 +01:00
Ozzieisaacs
d267338837
Fixes for Kobo sync
...
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
2020-03-07 11:07:43 +01:00
Michael Shavit
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
Michael Shavit
57d37ffba8
Add schema support for more reading states to the ReadBook table.
2020-03-01 20:26:42 -05:00
ZIzA
82afa81220
up
2020-02-29 20:41:51 +04:00
ZIzA
d730eb8d31
fix
2020-02-29 20:26:52 +04:00
ZIzA
5a219b580f
ru update
2020-02-29 19:10:01 +04:00
Ozzieisaacs
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
2020-02-29 09:55:54 +01:00
Ozzie Isaacs
df7d3d18b6
pdf reader
2020-02-29 08:33:09 +01:00
Wanoo
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
2020-02-28 16:04:07 +01:00
Ozzieisaacs
202b6121ab
Fix for #1227 (Download books not possible with gevent IPV6 connection)
...
Fix issue where books aren't correctly ordered by Date Added
2020-02-26 20:05:44 +01:00
Ozzieisaacs
4e8b814ec2
Fix download URL for IPV6
2020-02-26 20:04:15 +01:00
Ozzieisaacs
c8b64d4162
Update chinese translation Merge remote-tracking branch 'cn/patch-1'
2020-02-26 18:03:26 +01:00
Jeff
0854303710
Update Chinese translation
2020-02-26 19:47:25 +08:00
Michael Shavit
cba3e62e71
Fix issue where books weren't correctly ordered by Date added on the
...
Kobo device.
2020-02-26 01:06:03 -05:00
Rewerson
6c614c06f6
restricted_tags -> denied_tags
...
Fix for the next error after update:
Traceback (most recent call last):
File "cps.py", line 34, in <module>
from cps import create_app
File "/home/rewerson/lib/web/cps/__init__.py", line 68, in <module>
config = config_sql.load_configuration(ub.session)
File "/home/rewerson/lib/web/cps/config_sql.py", line 348, in load_configuration
update({"restricted_tags": conf.config_mature_content_tags}, synchronize_session=False)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/query.py", line 3862, in update
update_op.exec_()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1693, in exec_
self._do_exec()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1874, in _do_exec
values = self._resolved_values
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1840, in _resolved_values
desc = _entity_descriptor(self.mapper, k)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/base.py", line 402, in _entity_descriptor
"Entity '%s' has no property '%s'" % (description, key)
sqlalchemy.exc.InvalidRequestError: Entity '<class 'cps.ub.User'>' has no property 'restricted_tags'
2020-02-25 16:30:51 +03:00
Ozzieisaacs
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
2020-02-24 19:38:12 +01:00
Ozzieisaacs
187ca5dc8f
Fix #1221
2020-02-24 19:08:54 +01:00
Ozzieisaacs
7d795771d3
Fix #1221
2020-02-24 19:02:38 +01:00
Ozzieisaacs
040bb4a5a8
Merge remote-tracking branch 'origin/master'
2020-02-23 20:07:51 +01:00
Ozzieisaacs
fc4436f091
Update Translation
2020-02-23 20:07:21 +01:00
Ozzie Isaacs
b9f3ac2eea
Windows compatability
2020-02-23 17:23:38 +01:00
Ozzieisaacs
9fc0c3b3de
Merge remote-tracking branch 'English_texts/master'
...
# Conflicts:
# cps/templates/config_edit.html
# cps/templates/config_view_edit.html
# cps/templates/layout.html
# cps/templates/search_form.html
# cps/templates/user_edit.html
2020-02-23 13:27:44 +01:00
Ozzieisaacs
4f81184da0
Update translation
2020-02-23 13:22:57 +01:00
Ozzieisaacs
32a6beae65
Merge remote-tracking branch 'fix/kobo'
...
# Conflicts:
# cps/kobo.py
2020-02-23 13:17:59 +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
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
2020-02-23 12:40:11 +01:00
Ozzieisaacs
24d755b123
Update translations
...
Merge remote-tracking branch 'it/patch-7'
2020-02-23 10:55:56 +01:00
Ozzieisaacs
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
Ozzieisaacs
134a10f56c
Merge remote-tracking branch 'origin/Develop' into Develop
...
# Conflicts:
# cps/updater.py
2020-02-23 08:58:47 +01:00
Ozzieisaacs
3a70c86f49
Update updater to handle venv folders
2020-02-23 08:58:13 +01:00
OzzieIsaacs
371097eb4d
Update Updater
2020-02-23 07:54:58 +01:00
Ozzieisaacs
372c284ad4
Merge branch 'master' into Develop
2020-02-22 16:24:06 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210
2020-02-21 18:25:02 -03:00
Ozzieisaacs
b7f3e00fbf
Update updater to handle venv folders
2020-02-21 18:04:26 +01:00
Ozzieisaacs
27a18d60a7
Merge remote-tracking branch 'fix/robust_proxy' into Develop
...
# Conflicts:
# cps/kobo.py
2020-02-19 18:20:03 +01:00
Ozzieisaacs
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
2020-02-18 20:36:32 +01:00
ElQuimm
94a38a3b47
udate message.po in italian
...
Hello,
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
2020-02-17 21:03:33 +01:00
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
Michael Shavit
df3eb40e3c
Make KoboStore proxying more robust.
...
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
2020-02-17 14:37:02 -05:00
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master
2020-02-18 00:21:59 +11:00
Ozzieisaacs
29f6463ed9
Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download)
2020-02-16 19:55:05 +01:00
Ozzieisaacs
ed0bdbf31d
Fix for #1199 (missing referrer)
2020-02-16 19:39:32 +01:00
Ozzieisaacs
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
2020-02-16 19:24:28 +01:00
Ozzieisaacs
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
2020-02-16 19:19:10 +01:00
Ozzieisaacs
3f578122a3
Merge remote-tracking branch 'it/patch-6'
2020-02-16 18:56:14 +01:00
Ozzieisaacs
51a27322be
Merge remote-tracking branch 'cn/master'
2020-02-16 18:53:27 +01:00
Ozzieisaacs
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
2020-02-16 14:25:15 +01:00
André Frimberger
33cdf20cd5
Remove trailing whitespaces
2020-02-16 10:25:01 +01:00
Ozzieisaacs
317e59df4b
Bugfixes from tests
2020-02-15 16:02:31 +01:00
Ozzieisaacs
a9a6f5b97e
Renamed restrict -> deny
2020-02-15 10:21:45 +01:00
Ozzieisaacs
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
2020-02-15 09:08:39 +01:00
Kyos
509071949a
Moved style to css file
2020-02-13 21:05:24 +01:00
ElQuimm
697d857549
message.po italian
2020-02-13 11:29:26 +01:00
Ozzieisaacs
2ea45b1fdc
Removed shebang on non executable scripts
2020-02-10 18:37:47 +01:00
Ozzieisaacs
726595e117
Update for testability
2020-02-10 18:34:10 +01:00
Kyos
1666e32aaf
Fixes cover layouts in user edit page
2020-02-09 22:31:08 +01:00
Kyos
6a69bbe4b5
Fixes cover layouts in user edit page
2020-02-09 22:20:52 +01:00
André Frimberger
7a608b4fb0
fix binascii.Error with reverse proxy bearer token
...
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500. The corresponding error in the logs is: binascii.Error: Incorrect padding.
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods are checked.
2020-02-09 17:21:22 +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
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
2020-02-09 14:31:42 +01:00
Ozzieisaacs
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
2020-02-09 07:00:04 +01:00
Ozzie Isaacs
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
2020-02-08 14:40:13 +01:00
Ozzie Isaacs
2535bbbcf1
Fix #1180 working on windows with tornado and python <3.8 again
2020-02-08 13:24:01 +01:00
Ozzieisaacs
6698773d81
Improved testability
2020-02-08 11:33:31 +01:00
xcffl
aefaf47f4c
Update Simplified Chinese translation
2020-02-03 17:26:17 +08:00
Josh O'Brien
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
2020-02-03 14:22:00 +11: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
Ozzieisaacs
f67953c447
Update translation
...
Merge remote-tracking branch 'cz/patch-11'
2020-02-01 15:03:03 +01:00
Ozzieisaacs
981632f599
Merge remote-tracking branch 'it/patch-5'
2020-02-01 15:02:10 +01:00
Ozzieisaacs
a6c453d826
Merge remote-tracking branch 'pl/pl_translate_update'
2020-02-01 15:01:58 +01:00
Ozzieisaacs
4087e685f4
Fix auto detection of locale
2020-02-01 13:40:29 +01:00
Ozzieisaacs
5255085de1
Fix auto detection of locale
2020-02-01 13:38:11 +01:00
ElQuimm
9247ded710
Update - italian version of message.po
2020-01-29 21:41:54 +01:00
Jerzy Piątek
0bb0cbaef0
Updated polish translations
2020-01-28 22:28:58 +01:00
Lukáš Heroudek
0f7d272e13
Update messages.po
2020-01-28 10:03:40 +00:00
Ozzieisaacs
00dafe3121
Fix restrict columns
2020-01-27 20:34:36 +01:00
Ozzieisaacs
e44494aad0
Kobo sync enable/disable working
2020-01-27 20:32:37 +01:00
Ozzieisaacs
4ab3dc2599
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
2020-01-27 18:20:50 +01:00
Ozzieisaacs
acfad7a982
Update Italian translation
2020-01-27 18:17:17 +01:00
Ozzieisaacs
b29b5b7ac1
Merge remote-tracking branch 'github/fix-admin-view-log-file'
2020-01-27 18:14:16 +01:00
ElQuimm
7803ffb995
Update italian message.po
...
Thank you.
2020-01-27 15:07:00 +01:00
Ghighi Eftimie
fc79cdfaa2
fix mismerge
2020-01-27 15:24:11 +02:00
Michael Shavit
f9dbc6bc78
Clean-up book from ArchivedBook on hard-delete.
...
This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
2020-01-26 16:20:10 -05:00
Michael Shavit
dc7aaae235
Now that CalibreWeb delete requests are respected, we can forward
...
them to the KoboStore for books that aren't in Calibre.
Note: There's still an edge case where a book is removed from Calibre
without first being archived, in which case the delete call will fail.
2020-01-26 16:01:27 -05:00
Michael Shavit
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-01-26 15:58:57 -05:00
Ghighi Eftimie
647e954e8a
fix admin view of error log
2020-01-26 20:53:03 +02:00
Ozzieisaacs
004d9118bc
Merge branch 'master' into Develop
2020-01-26 19:37:14 +01:00
Ozzieisaacs
594c8aad91
Update Version Info
2020-01-26 19:36:15 +01:00
Ozzieisaacs
542a0008c9
Merge remote-tracking branch 'ru/master'
2020-01-26 19:33:37 +01:00
Ozzieisaacs
24f7918aa4
Merge remote-tracking branch 'it/patch-4'
2020-01-26 19:31:52 +01:00
Ozzieisaacs
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
2020-01-26 19:29:36 +01:00
Ozzieisaacs
0411d4a8c9
Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
...
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
2020-01-26 16:52:40 +01:00
Ozzieisaacs
a986faea56
Merge remote-tracking branch 'fix/fix_creation_time' into Develop
2020-01-26 16:50:38 +01:00
Ozzieisaacs
ad71d0a03f
Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop
2020-01-26 14:43:44 +01:00
Ozzieisaacs
0955c6d6fb
Update Kobo
2020-01-26 14:42:53 +01:00
Michael Shavit
d30b44ee0f
Minor formatting changes per codacy review.
2020-01-26 01:12:52 -05:00
Michael Shavit
a6f4db0f25
Fix bug where last_created is incorectly set in the SyncToken.
2020-01-26 00:32:05 -05:00
Michael Shavit
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
2020-01-26 00:29:36 -05:00
Michael Shavit
5027aeb3a0
Fix bug where last_created is incorectly set in the SyncToken.
2020-01-26 00:29:36 -05: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
Michael Shavit
e404da4192
Add support for book 'deletion' (i.e archiving) from a Kobo device.
2020-01-26 00:16:55 -05:00
Simon Latapie
69fa7d0091
new user: disable kobo token on new user page
...
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
2020-01-25 22:41:55 +01:00
ZIzA
e1d6aec682
quick fix
...
sorry
2020-01-21 23:06:22 +04:00
ZIzA
155795a18e
Russian language update
2020-01-21 22:29:23 +04:00
Ozzie Isaacs
3c63e2b7e4
Update version number
2020-01-21 07:04:18 +01:00
Simon Latapie
9b119fa724
edit book: manage identifiers
2020-01-20 22:26:43 +01:00
ElQuimm
a17c1c063e
Update messages.po
...
:-)
Thank you
2020-01-20 22:05:11 +01:00
Ozzieisaacs
6728f5da2d
Update Czech translation
2020-01-20 20:32:41 +01:00
Lukáš Heroudek
16adeae5c3
Update messages.po
2020-01-20 15:23:54 +00:00
Lukáš Heroudek
485eba94cc
Update messages.po
2020-01-20 14:41:51 +00:00
Lukáš Heroudek
5a074348ac
Update messages.po
2020-01-20 14:02:23 +00:00
Ozzieisaacs
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
Сергей
4c8f3f7bae
Add files via upload
2020-01-20 01:46:41 +04:00
Ozzie Isaacs
165cbad67b
Delete tess.py
2020-01-19 15:04:49 +01:00
Ozzieisaacs
b30da58eb9
Update german translation
2020-01-18 12:55:18 +01:00
Ozzieisaacs
b0fb6b858d
Merge remote-tracking branch 'swedish/patch-4'
2020-01-18 12:29:22 +01:00
Jony
53ce22ef5e
Update Swedish translation
...
I translated the new strings.
2020-01-18 12:18:05 +01:00
Ozzieisaacs
8e7a52f44e
Merge remote-tracking branch 'swedish/master'
2020-01-18 12:04:49 +01:00
Jony
4406220f70
Update Swedish translation
...
Update file
2020-01-18 11:25:07 +01:00
Ozzieisaacs
8f4253adbd
Fix for limiting domains (now no restriction to domain only)
2020-01-18 10:32:09 +01:00
Ozzieisaacs
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
2020-01-15 17:58:23 +01:00
Ozzieisaacs
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
2020-01-15 17:57:00 +01:00
Ozzieisaacs
ce66c752c4
Updated czech translation
...
removed language selection for guest user
2020-01-14 18:21:31 +01:00
Lukáš Heroudek
4e42a179fa
Update messages.po
2020-01-14 16:45:45 +00: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
Ozzieisaacs
1b42dd1043
Update czech and german translation
2020-01-13 18:24:47 +01:00
Lukáš Heroudek
77e0022252
Update messages.po
...
Added missing and clenup
2020-01-13 10:29:14 +00: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
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
2020-01-11 18:35:04 +01:00
Ozzieisaacs
8143c16c14
Added texts for allowed denied tags in configuration
...
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
2020-01-11 13:28:09 +01:00
Ozzieisaacs
42435ab34a
Improved testablility
2020-01-08 19:52:05 +01:00
Lukáš Heroudek
434fb2e7cb
Add files via upload
2020-01-08 12:06:13 +00:00
Lukáš Heroudek
bce70bf17c
Update messages.po
2020-01-08 12:05:36 +00:00
Lukáš Heroudek
cde44178c4
Create messages.po
2020-01-08 12:03:52 +00: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
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
Ozzieisaacs
24ae7350f5
Fix # #1127 (user template show random books in detail view not saved)
2020-01-05 16:18:51 +01:00
Ozzieisaacs
c60277f4d3
Capitalize language selection in User settings
...
Remove sql statement from log.debug statement upon creation of new column in settings database
2020-01-05 14:07:26 +01:00
Ozzieisaacs
6a07cfba65
Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'
...
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
2020-01-05 13:38:51 +01:00
Ozzieisaacs
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
2020-01-05 08:47:03 +01:00
Ozzieisaacs
56ee8c56ba
Fix #1122
...
(Uploading books with applied language restriction leads no longer to error 500)
2020-01-05 08:40:57 +01:00
Ozzieisaacs
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
2020-01-04 07:57:54 +01:00
Ozzieisaacs
8ad84a7ceb
Fix for #1123 (mature content is visible in shelfs)
2020-01-02 17:11:30 +01:00
Ozzieisaacs
32e818af6a
Fix #1124
2020-01-02 16:09:06 +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
1c630eb604
fixes from tests
2019-12-30 15:16:09 +01:00
Ozzieisaacs
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
2019-12-30 15:15:07 +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
ground7
b782489a8c
ldap opds download bugged
2019-12-28 21:52:26 -07:00
Ozzieisaacs
01381488f4
Fixes from tests
2019-12-28 16:18:21 +01:00
ground7
6555d5869f
attempt regular login if ldap login fails as fallback
2019-12-27 23:45:42 -07:00
ground7
54c4f40188
added LDAP import
...
update defaults
2019-12-27 23:12:18 -07:00
Ozzieisaacs
62e8bee2a8
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
2019-12-24 13:02:53 +01:00
Michael Shavit
9ec3ddd492
Fix the HandleCoverImage endpoint so that it requires login, and doesn't
...
take unused parameters.
2019-12-22 16:59:00 -05:00
Michael Shavit
d81dbb13e4
Support Epub downloads
2019-12-22 16:59:00 -05:00
Michael Shavit
c238367b64
Reload database on every call to v1/library/sync. This fixes an issue where side-loaded books appear in the sync response with no download urls.
2019-12-22 16:59:00 -05:00
Michael Shavit
cdcb8a50d1
Fix /reconnect endpoint, which was broken by 006e596c72
2019-12-22 16:58:55 -05:00
Michael Shavit
520c695401
Fix /reconnect endpoint, which was broken by 006e596c72
2019-12-22 16:54:16 -05:00
Michael Shavit
b831b9d6b2
Integrate with the official Kobo store endpoint so that no
...
functionanility is lost by overriding the api_endpoint setting.
Requests are either:
* Redirected to the Kobo Store
* Proxied to the Kobo Store
* Proxied to the Kobo Store and merged with results from CalibreWeb.
2019-12-22 13:40:49 -05: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
Ozzieisaacs
288944db2c
Merge remote-tracking branch 'kobo_sync/kobo' into Develop
...
# Conflicts:
# cps.py
# cps/kobo.py
# cps/kobo_auth.py
# cps/ub.py
2019-12-20 19:24:31 +01:00
Ozzieisaacs
f2c07d8f81
Update Kobo sync
2019-12-20 19:17:08 +01:00
Michael Shavit
d6a9746824
Add a filter to the Sync request endpoint to ignore books that don't
...
have any formats supported by the device.
2019-12-20 01:28:53 -05:00
Michael Shavit
f84274f1c5
git add missing generate_kobo_auth_url.html
2019-12-20 01:08:15 -05:00
Michael Shavit
2118d920f5
Formatter.
2019-12-20 01:04:12 -05:00
Michael Shavit
207004beff
Remove config_server_url setting.
2019-12-20 01:02:49 -05:00
Michael Shavit
27d084ce39
Remove the KoboUserKey-based Authentication.
...
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token .
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).
Also use Flask.url_for to generate download urls.
2019-12-20 00:55:53 -05:00
Ozzieisaacs
f705889c23
Inital Kobo
2019-12-17 20:28:20 +01:00
Ozzieisaacs
7098d08888
Added option to convert AZW3 to mobi for sending to kindle
2019-12-15 18:44:02 +01:00
Ozzieisaacs
eabc6e23be
Test Email now send to user's email address ( #834 )
...
Added forgot/reset password routine (#1098 , #1063 )
2019-12-15 17:08:17 +01:00
Ozzieisaacs
b6d7207ec3
Added platform information for better debugging
2019-12-15 13:33:38 +01:00
Ozzieisaacs
c33623efee
Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045 )
...
Added file formats and languages to opds feed
2019-12-15 13:32:34 +01:00
Ozzieisaacs
2215bf3d7f
Implemented #1083 (Advanced search for extensions)
2019-12-15 11:35:07 +01:00
Ozzieisaacs
86fe970651
More fixes for googledrive
2019-12-14 22:22:27 +01:00
Andrew Roberts
3dc372c573
fixed typo
2019-12-12 21:38:45 -05:00
Andrew Roberts
efcee0a7b7
added reverse proxy configuration form and handler
2019-12-12 21:31:21 -05:00
Andrew Roberts
39b6b100f9
whitespace
2019-12-12 21:31:19 -05:00
Andrew Roberts
9351ff032f
whitespace
2019-12-12 21:31:17 -05:00
Andrew Roberts
f0760c07d8
added admin display of reverse proxy settings
2019-12-12 21:31:12 -05:00
Andrew Roberts
77b0954c70
use a macro for the display of boolean settings
2019-12-12 21:28:50 -05:00
Andrew Roberts
af7dbbf1e4
added logic for reverse proxy login
2019-12-12 21:27:40 -05:00
Andrew Roberts
b661c2fa92
added config fields to settings table
2019-12-12 21:27:38 -05:00
Ozzieisaacs
e308a74dc2
Fix ( #1103 ) Internal server error with Goodreads and no result for author name on Goodreads
2019-12-12 20:08:16 +01:00
Michael Shavit
040d7d9ae3
Remove unused import and fix python3 compatibility, as per Ozielsaacs comments.
2019-12-11 00:12:35 -05:00
Michael Shavit
f9b1e84704
Remove backblaze leftovers
2019-12-10 23:57:53 -05:00
Ozzieisaacs
eede894e72
Merge remote-tracking branch 'merge-metadata'
2019-12-09 20:53:16 +01:00
Michael Shavit
55c0bb6d34
Set the "Size" attribute for Kobo download_urls, and refactor the code
...
to eventually allow formats other than KEPUB.
2019-12-08 17:28:25 -05:00
Michael Shavit
2b55b9b250
Use the login_user Cookie to authorize download requests instead of
...
passing the UserKey over url params.
2019-12-08 15:33:57 -05:00
Ozzieisaacs
22add37b64
Merge remote-tracking branch 'fix typo in config_edit.html #1097 '
...
Updated translations
2019-12-08 10:10:32 +01:00
Ozzieisaacs
8a9695d48e
Fix getting metadata from douban ( #858 )
2019-12-08 09:52:57 +01:00
Ozzieisaacs
e0faad1e59
Handle no write permission to tmp folder ( #1060 )
2019-12-08 09:40:54 +01:00
Michael Shavit
fffa2d5a1b
Support passing the Auth token as a url param.
...
This is required to support ebook downloads which the Kobo device emits
without any auth headers.
* Also some other small bug fixes discovered during device testing.
2019-12-07 22:55:07 -05:00
Michael Shavit
0926ae530c
Remove custom_column usages from an earlier commit.
2019-12-07 21:08:53 -05:00
Michael Shavit
0b709f7dfb
Merge branch 'master' into kobo
2019-12-07 20:04:54 -05:00
Michael Shavit
b5da2c4199
Clean-up: Fix import order in kobo.py, and other minor formatting
...
changes.
2019-12-07 19:54:49 -05:00
Michael Shavit
9ede01f130
* Add a UserKeyToken to the User table for Kobo authorization.
...
* Add proper authorization checks on the new Kobo endpoints.
Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
2019-12-07 19:54:44 -05:00
Christian Keil
c61463447f
Merge metadata of uploaded book versions.
2019-12-06 15:00:01 +01:00
Michael Shavit
55b54de6a0
Add simple get_download_url implementation to replace the backblaze-backed implementation
2019-12-05 19:06:39 -05:00
Michael Shavit
5357867103
Add initial support for Kobo device Sync endpoint.
...
- Supports /v1/library/sync call to get list of books
- Supports /v1/library/metadata call to get metadata for a given book
+ Assumes books are stored on Backblaze for metadata call
- Changes to helper.py so that we can return no cover instead of a blank
image.
2019-12-05 01:56:59 -05:00
zhiyue
222797e631
support douban book search using apikey
2019-12-04 11:59:06 +08:00
dalin
92841b46d7
update Simplified Chinese translations.
2019-12-03 16:32:03 +08:00
dalin
4c2323fcc9
fix typo in config_edit.html
2019-12-03 16:06:25 +08:00
Ozzieisaacs
fda0ab1e86
FIx for ( #1092 listening to mp3 not working)
2019-12-01 12:36:55 +01:00
Ozzieisaacs
54079b36ae
Fix #1095 (epub viewer not working if only viewer rule wa sapplied)
2019-12-01 12:21:21 +01:00
Ozzieisaacs
f8a99c60d8
Fix for #1096 (exception on digest request)
2019-12-01 09:33:11 +01:00
Ozzieisaacs
8af178c19c
Fix for gdrive not working #1081
2019-11-26 10:46:06 +01:00
Ozzieisaacs
78f9ee86b1
Fix pdf cover
...
Fix massadding books
Add feature inform of duplicate books
2019-11-26 08:19:03 +01:00
Ozzieisaacs
ab5873984e
Merge remote-tracking branch 'translation/patch-3'
2019-11-17 06:59:22 +01:00
Ozzieisaacs
62ea8b8913
Logging to stdout, proposal form #1078
2019-11-16 10:09:34 +01:00
Ozzieisaacs
a4416c202d
Merge remote-tracking branch 'rename/develop'
2019-11-16 08:01:18 +01:00
Jony
1f5edffccf
Fix typo and update translation
2019-11-16 07:49:07 +01:00
Ozzieisaacs
651260022c
Merge remote-tracking branch 'search_title/hotfix-searchform-title'
2019-11-16 07:29:00 +01:00
Ozzieisaacs
2e4344f7ea
Merge remote-tracking branch 'swedish/master'
2019-11-16 07:27:08 +01:00
Jony
3cb7e77b60
Update messages.po
2019-11-14 18:52:06 +01:00
Ghighi Eftimie
f782dc1857
fix for search title
2019-11-14 12:08:19 +02:00
Ozzieisaacs
88f31ddad1
Fix for #1034
2019-11-07 21:04:03 +01:00
Ozzieisaacs
a7ab7fcf06
Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page
2019-11-03 09:49:54 +01:00
Ozzieisaacs
6f61e80c97
Fix #1074 , #1071
2019-10-31 15:46:38 +01:00
Ozzieisaacs
d1afdb4aac
Fix #1074 , #1071
2019-10-31 15:44:36 +01:00
Ozzieisaacs
5167ee520e
Solve cropped image pdf import ( #1068 )
2019-10-22 19:11:40 +02:00
Ozzieisaacs
f758a1cc64
Solve inverted image pdf import ( #1068 )
2019-10-21 19:33:09 +02:00
Ozzieisaacs
2145be6db2
Improvement for #1062
2019-10-20 16:47:15 +02:00
Ozzieisaacs
c740fe9124
Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order'
2019-10-20 15:50:52 +02:00
Ozzieisaacs
a371e40c66
Merge remote-tracking branch 'github_3/hotfix/epub-import'
...
Improved cover extraction from epub files
2019-10-20 15:48:06 +02:00
Ozzieisaacs
ccc6184342
Merge remote-tracking branch 'github_1/patch-1'
2019-10-20 15:03:37 +02:00
Ozzieisaacs
c8c2d6659c
Merge remote-tracking branch 'public_reconnect/master'
2019-10-20 15:03:02 +02:00
Jan Guzej
c7d7a7597c
remove language from array metadata
2019-10-19 21:49:18 +02:00
Jan Guzej
fbb7663a2f
epub metadata import fix
2019-10-19 14:04:15 -04:00
Kyos
c93dd32179
Fixed typo and column size for LG screens
2019-10-19 12:02:14 +02:00
Kyos
7165826011
Adds Authors, Series and Book Cover to the shelf order view
2019-10-19 10:57:48 +02:00
Kyos
ada727a570
Adds Authors, Series and Book Cover to the shelf order view
2019-10-19 10:52:03 +02:00
gwenhael
01b0f9534c
fix issue #1064
...
Allow for finer steps in serie-index
2019-10-18 15:12:27 +02:00
zelazna
3764c33a3a
Add the posibility to change the username
2019-10-01 15:36:00 +02:00
Ozzieisaacs
9fc02f67c2
Debug output for lcase
2019-09-27 15:30:39 +02:00
Ozzieisaacs
0c40e40dc3
Fix logfile loading behind reverse proxy ( #1047 )
2019-09-27 08:15:10 +02:00
Ozzieisaacs
e31df16309
Revert bug in updater.py preventing new files from being created
2019-09-24 19:00:47 +02:00
Ozzieisaacs
d7ea5bb9d7
Fix for #1037
...
Update German translation
2019-09-17 18:25:17 +02:00
Ozzieisaacs
6cda5fee0d
Fix language selection on python3
2019-09-06 20:56:17 +02:00
Ozzieisaacs
ca5e285c5a
Merge branch 'Develop'
2019-09-06 19:05:02 +02:00
Ozzieisaacs
fb0eebfc52
Merge remote-tracking branch 'spanish/master'
2019-09-06 19:03:03 +02:00
Ozzieisaacs
dd90fb003e
Merge remote-tracking branch 'french/master'
2019-09-06 19:01:45 +02:00
Ozzieisaacs
61cd044255
Merge remote-tracking branch 'polish/master'
2019-09-06 19:01:17 +02:00
Ozzieisaacs
879d02081a
Fix #1021
2019-09-06 18:57:41 +02:00
Ozzieisaacs
051bc53aa2
Fix for #1009
2019-09-02 19:27:34 +02:00
Angel Docampo
5515772903
updated spanish translations
2019-08-27 13:16:23 +02:00
Angel Docampo
ff900fd9c0
updated spanish translations
2019-08-27 13:15:18 +02:00
Yamakuni
eec4be7a29
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-25 01:01:05 +01:00
Yamakuni
1385ecb383
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:02:21 +01:00
Yamakuni
74418f3139
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:02:13 +01:00
Yamakuni
72def4b97b
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:02:04 +01:00
Yamakuni
564c3b4778
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:01:47 +01:00
Yamakuni
c9eff4a70c
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:01:38 +01:00
Yamakuni
879f63d1c1
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:01:01 +01:00
Yamakuni
3fb458dd19
Update cps/translations/fr/LC_MESSAGES/messages.po
...
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
2019-08-23 16:00:52 +01:00
Yamakuni
d9a73b4fa3
French translation
...
Add and modify some little things
2019-08-21 15:21:17 +01:00
Ozzieisaacs
23b3bfd967
Additional fix #1016
2019-08-20 19:12:40 +02:00
Ozzieisaacs
f543d7f486
Fix #1016
2019-08-20 18:32:04 +02:00
Radosław Kierznowski
6a058d2c52
Update polish translation
2019-08-18 22:08:08 +02:00
Vincent Kriek
38a255e069
Add automatic epub to kepub conversion using kepubify
2019-08-18 21:44:19 +02:00
Ozzieisaacs
ff41775dbb
Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop
2019-08-17 17:27:06 +02:00
Ozzieisaacs
d04a78afe6
Merge remote-tracking branch 'public_shelf/Develop' into Develop
2019-08-17 16:03:29 +02:00
Ozzieisaacs
f566237be0
Merge remote-tracking branch 'bootstrap/Develop' into Develop
2019-08-17 15:59:13 +02:00
Dmitriy Istomin
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
2019-08-16 11:18:39 -04:00
W1ndst0rm
4cbdccd39e
Fix for https://github.com/janeczku/calibre-web/issues/1002
2019-08-13 23:07:15 -06:00
Ozzieisaacs
9356148e2d
Added more information about dependencies
2019-08-06 19:53:33 +02:00
Ozzieisaacs
4be55285d8
Fix #1001
2019-08-06 18:38:17 +02:00
Ozzieisaacs
3eae2e9c2c
Changed text for not found imports
2019-08-03 18:24:56 +02:00
Ozzieisaacs
e9fb5d9f25
Bugfix for comicapi
2019-08-03 14:09:54 +02:00
Ozzieisaacs
6261981656
Fix for #991
...
Removed additional psace before Advanced search (Pull request #996 )
Set startup message for not relevant imports to debug, to reduce confusion
2019-08-03 12:56:32 +02:00
Ozzieisaacs
82ca3f31f9
Merge remote-tracking branch 'pwr/master'
2019-07-31 17:40:50 +02:00
Ozzieisaacs
97f3aa8325
Update dutch language
2019-07-31 17:38:28 +02:00
Daniel Pavel
7c503b4a31
provide a default logging configuration ( fixes #987 )
2019-07-31 09:42:10 +03:00
Daniel Pavel
9f8cab99e3
Moved language names from iso639.pickle to a python file
2019-07-30 15:16:24 +03:00
Ozzieisaacs
5f25b81004
Final fix for #983
2019-07-29 21:43:00 +02:00
Ozzieisaacs
73bbffccaa
Fix for login issue on MacOS
2019-07-28 21:29:54 +02:00
Ozzieisaacs
f59d9d5aa8
Merge remote-tracking branch 'polish/master'
2019-07-27 07:19:30 +02:00
Radosław Kierznowski
746b7b1262
Update polish translation
2019-07-26 23:04:04 +02:00
Ozzieisaacs
5f228fbb40
Update german translation
2019-07-26 17:20:48 +02:00
Ozzieisaacs
12576393cf
Merge remote-tracking branch 'spanish/patch-1'
...
Merge remote-tracking branch 'german/master'
2019-07-26 16:41:52 +02:00
Mainak
7f43a2e104
Update messages.po
...
update and revision of the Spanish translation file.
2019-07-26 11:45:45 +02:00
Ozzieisaacs
00f17bb697
Mature contents no longer displayed in/allowed to ( #975 ):
...
- typeahead tags
- advanced search tags buttons
- read
- download
2019-07-25 21:42:46 +02:00
Ozzieisaacs
cf00b4eebf
Cover upload gives Error 500 fix #972 (leftover from refactoring)
...
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
2019-07-24 18:43:23 +02:00
Ozzieisaacs
fc4dc36c65
Fix #969 (duplicate code "init" in epub reader)
...
Fix for #890
2019-07-23 19:26:01 +02:00
Ozzieisaacs
97a0dccdec
Fix for display of format, series, category, ratings,
...
Fix for display of language (sorting not working yet)
2019-07-22 21:38:52 +02:00
Ozzieisaacs
9f64a96502
Fix for #890
2019-07-22 18:28:45 +02:00
Ozzieisaacs
b9c3a3fcea
Fix #652
2019-07-21 18:19:07 +02:00
Ozzieisaacs
6d43e0422a
Fix for non found flask_login version ( #968 )
2019-07-21 17:45:21 +02:00
Ozzieisaacs
0d7e58ce79
Fix for #968 (database conversion fails for default strings under python2.7)
2019-07-21 16:23:31 +02:00
Ozzieisaacs
3e008ef29b
Fix update dates shown in local time format again
...
Fix "to update" history is shown again
2019-07-21 13:28:55 +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
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
2019-07-17 19:07:05 +02:00
Ozzieisaacs
d168e3bfdb
Add licence to oauth
...
fix comicapi dependency
2019-07-16 21:08:37 +02:00
Daniel Pavel
99c6247baf
use the standard socket library to validate the ip address argument
2019-07-14 22:06:40 +03:00
Daniel Pavel
a334ef28e7
about page: build the versions dictionary only once
2019-07-14 21:15:46 +03:00
Daniel Pavel
63634961d4
cleaner worker api
...
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
Ozzieisaacs
d82289e303
Deactivate ldap
...
Fix setup for pypi
2019-07-14 18:37:44 +02:00
Daniel Pavel
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
2019-07-14 14:44:48 +03:00
Ozzieisaacs
8bfcdffeb6
Fix feature support
2019-07-14 13:20:40 +02:00
Ozzieisaacs
e411c0fded
Fix logging in debug mode
2019-07-14 09:18:37 +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
792367e35e
Version update
2019-07-13 20:27:32 +02:00
Ozzieisaacs
be64961de5
Code cosmetics comic reader
2019-07-13 19:55:51 +02:00
Ozzieisaacs
405a3909b0
Fix for opds with LDAP authentication
2019-07-13 17:51:25 +02:00
Ozzieisaacs
b1cb7123a3
Fix for #959
2019-07-11 20:37:03 +02:00
Ozzieisaacs
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
2019-07-09 19:29:58 +02:00
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
Ozzieisaacs
499a66dfb0
Additional glyphicons for music on search and author page
...
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
2019-07-06 14:46:25 +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
ad44e58c7a
Sorting for comics
...
Audiobook support
2019-06-29 14:23:39 +02:00
Ozzieisaacs
572b5427c7
Fix Encoding issues for python2
2019-06-23 21:11:45 +02:00
Ozzieisaacs
32af660f86
Improvements for logfile viewer
...
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
2019-06-22 19:55:59 +02:00
Ozzieisaacs
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
2019-06-21 09:46:03 +02:00
Ozzieisaacs
5c7aeb2f2c
Change GDrive
2019-06-20 20:12:01 +02:00
Daniel Pavel
e254565901
support binding the http server to a unix socket file instead of TCP socket
2019-06-18 08:57:37 +03:00
Heimen Stoffels
d9f69ca264
Updated Dutch translation
2019-06-17 22:38:32 +02:00
Ozzieisaacs
cd546eb6d4
Update comic reader js
2019-06-17 19:48:17 +02:00
Ozzieisaacs
f40fc5aa75
Update LDAP
2019-06-16 08:59:25 +02:00
Ozzieisaacs
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
2019-06-16 08:20:01 +02:00
Ozzieisaacs
d45b1b8ea5
Fix #937
...
logviewerintegrated
Code cosmetics
2019-06-15 21:18:13 +02:00
Ozzieisaacs
e67d707867
Fix for #588
...
Merge remote-tracking branch 'linuxserver/master'
2019-06-15 11:58:55 +02:00
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
...
Solve typo
2019-06-14 22:56:21 +02:00
Krakinou
304db0d20e
Solve typo
2019-06-14 22:55:17 +02:00
Ozzieisaacs
3f5c6c1fa5
Fix #937
2019-06-13 20:01:37 +02:00
Ozzieisaacs
26949970d8
Revert logging functions
...
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
f5e3ed26b9
Fix for #935
2019-06-10 19:31:13 +02:00
Ozzieisaacs
8e4539cf8e
Prevent delete of last admin user
2019-06-10 19:26:01 +02:00
Ozzieisaacs
c81d4edb7d
Fix for #923
2019-06-10 16:38:29 +02:00
Ozzieisaacs
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
2019-06-10 14:15:21 +02:00
Ozzieisaacs
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
2019-06-08 13:45:27 +02:00
Ozzieisaacs
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
2019-06-08 06:52:41 +02:00
Krakinou
9a5ab97d78
Merge branch 'master' into master
2019-06-08 01:41:43 +02:00
Krakinou
79286c9384
encode password
2019-06-08 00:54:45 +02:00
yjouanique
c4e3f3670f
Added public /reconnect endpoint
2019-06-07 12:15:31 +07:00
Daniel Pavel
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
Krakinou
97d12b94f6
Correct settings update
2019-06-04 00:47:49 +02:00
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
2019-06-02 22:07:22 +02:00
Ozzieisaacs
f736a15c12
Fix for restart of newer versions of tornado during update
...
Fix for updater with Beta Versions
2019-06-02 18:47:25 +02:00
Ozzieisaacs
a02f949d23
Fix for updater with beta releases
2019-06-02 18:09:44 +02:00
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
2019-05-31 16:24:13 +02:00
Ozzieisaacs
6662a58cb0
Update translationfiles
2019-05-31 15:48:19 +02:00
Ozzieisaacs
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
2019-05-31 11:17:47 +02:00
Ozzieisaacs
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
2019-05-31 08:43:51 +02:00
Ozzieisaacs
df5d15d1a2
Merge remote-tracking branch 'comicapi/master'
2019-05-30 10:43:28 +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
f70c839014
Added additional permission viewer
2019-05-19 18:39:34 +02:00
Ozzieisaacs
e6ff2f1d90
Fix file not found loading-icon.gif
2019-05-16 19:42:59 +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
Ozzieisaacs
0c80f5c63a
Update Teststatus
2019-05-12 19:44:52 +02:00
Ozzieisaacs
1030e195a5
Fix #916
2019-05-11 13:03:38 +02:00
subdiox
c0d136ccd8
Fix slow loading
2019-05-10 08:16:03 +09:00
Ozzieisaacs
479b4b7d82
Update translations, integrated update of Italian translation
2019-05-08 20:24:10 +02:00
Ozzieisaacs
a42ebdc096
Fix for #897
2019-05-07 19:54:13 +02:00
Ozzieisaacs
49ba221e85
Merge remote-tracking branch 'direction'
2019-05-07 18:54:27 +02:00
Ozzieisaacs
3b03aa30a6
Fix for advanced search
2019-05-06 20:51:44 +02:00
Ozzieisaacs
cb0403a924
Merge remote-tracking branch 'adv_search/master'
2019-05-06 20:48:46 +02:00
Marvin Marx
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
2019-05-05 17:58:45 +02:00
Ozzieisaacs
55bb8d4590
Fix #900
2019-05-01 17:47:54 +02:00
Ozzieisaacs
b80bfa5260
Improvement for #897
2019-04-29 19:01:30 +02:00
Ozzieisaacs
f941908f73
Workaround for #889
2019-04-23 21:32:48 +02:00
Ozzieisaacs
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
2019-04-22 19:17:23 +02:00
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
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
subdiox
8b6d165d64
Fix Japanese translation
2019-04-21 17:53:40 +09: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
Barnabás Nagy
afc79416b2
HU Translation updates
...
Translation of the new untranslated strings
2019-04-06 23:38:59 +02:00
Josh Max
cdfb6bf3e3
Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
...
Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.
2019-04-03 01:25:29 -07:00
Iris Wildthyme
cbdc9876b2
comicapi dependency now pippable
2019-04-02 20:58:23 -04:00
Iris Wildthyme
05d0f12608
redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation
2019-04-02 18:52:45 -04:00
Daniel Pavel
858c80bb20
'except' style fix
2019-03-29 17:06:26 +02:00
Daniel Pavel
f7e640fd98
support pycountry if iso-639 is not available
2019-03-29 07:00:10 +02:00
Daniel Pavel
439ce19b5d
Updated epub.js to v0.3.66
2019-03-28 07:23:45 +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
Yijun Zhao
6c493df2f5
support issue: #843
2019-03-26 14:34:51 +08: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
fa36072699
Fix uk translation-file
2019-03-24 08:18:41 +01:00
OzzieIsaacs
8ab9365688
Prevent error 500 for cover of not exisiting book
2019-03-23 20:29:53 +01:00
Chad Bergeron
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
2019-03-21 19:18:44 +01:00
Elifcan Cakmak
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
2019-03-20 13:06:11 +01:00
tomjmul
8e8486497f
Restirct a user to a set of tags
2019-03-19 13:53:41 +00: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
Andrew Sullivan
3dfc2f2580
fixing issue #833
2019-03-08 20:44:45 -05: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
jianyun.zhao
54a006a420
[fix] Add a scroll bar to a long list of meta information
2019-03-01 10:57:27 +08: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
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
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
Virgil Grigoras
d3ed0317bb
styling and javascript for hiding authors
2019-02-25 19:25:08 +01:00
Virgil Grigoras
e5bc1ae020
Add new database field for storing max_authors
2019-02-25 19:21:49 +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
AngelByDay
38307ececb
Force namespace resolution of imports
...
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
2019-02-22 12:24:51 -05: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
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
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
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
2019-02-18 20:52:58 +01:00
Fabian Wüthrich
7fb9bf8889
Truncate single quote in upload file name
2019-02-18 13:35:30 +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
lorek123
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
2019-02-10 18:17:33 +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
Ozzieisaacs
36229076f7
Refactor subprocess calls
2019-02-03 18:32:27 +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
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
97064db2a4
Restart python3 fix, stop and restart python2 working again
2019-01-23 18:14:45 +01:00
Ozzieisaacs
341dd77b9d
Bugfix Restart and Stop server on python3
2019-01-21 21:01:16 +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
Ozzieisaacs
62574939b2
Fix #770
2019-01-19 16:48:04 +01:00
Matt
b1d2b68bb1
Revert "Merge pull request #1 from hexeth/reader-theme"
...
This reverts commit fb7bd0c49bae55dd6c27
2019-01-18 14:31:41 -08:00
hexeth
3ba9e4d96e
reader theme
2019-01-18 14:28:11 -08: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
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
2019-01-18 14:11:24 -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
hexeth
7e9d6a3cf9
Add Dark-Reader
2019-01-18 13:50:21 -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
Matt
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
2019-01-18 10:43:26 -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
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
d48cdcc789
Correct authentication in case LDAP not activated
2019-01-13 11:21:11 +01:00
Krakinou
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
2019-01-13 11:04:32 +01:00
Krakinou
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
2019-01-13 11:02:03 +01:00
Krakinou
aafb267787
Merge branch 'master' into master
2019-01-12 23:46:59 +01:00
Krakinou
2e37c14d94
Clean some comment
2019-01-12 18:40:32 +01:00
Krakinou
91f0908059
insert into db
...
connect via LDAP config
2019-01-12 18:07:03 +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
4ace3a5e27
test
2019-01-11 14:13:09 -08:00
leram84
db83fb3bd7
minified
2019-01-11 16:49:45 -05:00
hexeth
883633a045
Remove beta from caliBlur selection
2019-01-11 13:46:19 -08:00
Matt
84fdf9143b
Revert "Update web.py"
...
This reverts commit a388f03b99
2019-01-11 13:44:17 -08:00
Matt
7a069ad72e
Revert "Update web.py"
...
This reverts commit 1bcc0698d5
2019-01-11 13:43:48 -08:00
leram84
f897491070
Update caliBlur.min.css
2019-01-11 16:30:01 -05:00
Ozzieisaacs
f053508013
Fix #764
2019-01-11 22:24:48 +01:00
hexeth
2ab10bb070
Update caliBlur.js
2019-01-11 13:23:12 -08:00
hexeth
1bcc0698d5
Update web.py
2019-01-11 13:21:51 -08:00
hexeth
a388f03b99
Update web.py
2019-01-11 13:20:16 -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
Ozzieisaacs
36030b559c
Choosing Theme is now a global setting
2019-01-11 08:36:28 +01:00
Krakinou
30954cc27f
Initial LDAP support
2019-01-10 23:51:01 +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
23396af83c
Add .random-books class to random books div ( #757 )
...
Assist caliBlur in targeting this element
2019-01-08 21:58:57 +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
fa3426aa08
Merge remote-tracking branch 'origin/master'
2019-01-08 07:10:36 +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
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
2019-01-06 15:00:34 +01:00
Ozzieisaacs
8db2b62b39
Merge remote-tracking branch 'origin/master'
2019-01-06 14:17:09 +01:00
Ozzieisaacs
98134616b6
Fix #661 (authors are shown according to the authors sort order)
2019-01-06 14:16:52 +01:00
Ozzieisaacs
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
2019-01-05 21:44:29 +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
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
2019-01-03 20:52:46 +01:00
Ozzieisaacs
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
2019-01-03 20:47:46 +01:00
Adrian Petrescu
5341910ea5
Deal gracefully with invalid Accept-Languages header
...
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).
This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.
Fixes #743 among others.
2019-01-03 11:45:15 -05:00
Ozzieisaacs
9cfe1dce20
Fix #739
2018-12-30 14:25:03 +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
grunjol
462cf20a34
Process all custom columns on editing
2018-12-24 13:05:47 -03:00
grunjol
00ba231fbf
fix adding an existing language to a book
2018-12-24 12:32:22 -03:00
Ozzieisaacs
677264950d
Merge remote-tracking branch 'ru-translation/master'
2018-12-16 16:59:22 +01:00
Anton Konyshev
e6b1c8cf36
Updated Russian translation
2018-12-14 16:27:19 +03:00
Ozzieisaacs
9057a3a0d7
Merge remote-tracking branch 'dutchtranslation/master'
2018-12-10 19:37:03 +01:00
Ed Driesen
45d97d277a
Update Dutch translation
...
Some lines where still untranslated, fixed it.
2018-12-09 15:11:31 +01:00
Ozzieisaacs
81e3afbcc4
Fix #714 (advanced search for ratings)
2018-12-02 12:48:12 +01:00
Ozzieisaacs
7526b0dcb4
Fix #623 , #715
2018-11-28 18:28:55 +01:00
Ozzieisaacs
64b1b830d6
Fix #712
2018-11-25 13:29:58 +01:00
Ozzieisaacs
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
Ozzieisaacs
b78130e3b1
Merge remote-tracking branch '681/681-fix'
2018-11-25 07:19:00 +01:00
Ozzieisaacs
47424e5c1a
Merge remote-tracking branch 'swedish/master'
...
Improved server stop command
2018-11-24 20:47:11 +01:00
Jony
bc0d19f33d
Fix typo
2018-11-23 03:03:02 +01:00
Jony
cbc9169973
Update messages.po
2018-11-23 03:01:34 +01:00
haseo
e1b6fa25e9
A better solution to #681
2018-11-19 15:54:28 +08: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
a2b612c9ab
Merge remote-tracking branch 'ssl/verify-ssl-paths'
2018-11-17 16:58:05 +01:00
Ozzieisaacs
2422f782de
Fix #701
2018-11-17 16:51:30 +01:00
Ozzieisaacs
c574b779fb
Added swedish translation
2018-11-17 16:41:47 +01:00
Ozzieisaacs
07d7be176c
Merge remote-tracking branch 'lang/master'
2018-11-17 16:32:55 +01:00
André Santos
c6a5ac7f25
Fix wrong variable usage
2018-11-17 00:28:34 +00:00
André Santos
af216e3697
Verify if certfile and keyfile are paths to actual files
...
This allow to try to not use ssl if the key file path or the certificate file are broken. The files might be missing because the user intentionally removed them but didn't update the settings first. In that situation, this change won't make the app crash, the warning is logged and that way the user has the chance to update the settings.
2018-11-16 23:32:21 +00:00
dalin
947622800c
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
2018-11-14 18:14:11 +08:00
Ozzieisaacs
399dffba5a
log file name in case of filename not found ( #691 )
2018-11-03 18:37:38 +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
38c180a9ea
Update translation files
2018-11-03 14:05:02 +01:00
Ozzieisaacs
c05687b896
Fix #668
2018-11-03 13:59:11 +01:00
Ozzieisaacs
c3bec48bc7
Fix #617
...
Additional texts translated
2018-11-03 13:43:38 +01:00
Ozzieisaacs
c582a70498
Merge remote-tracking branch 'bbb/617'
2018-11-03 10:40:00 +01:00
Ozzieisaacs
0df35dcfea
Update Updater
2018-11-01 13:47:05 +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
ee85492c7d
Fix #662
2018-10-30 21:47:33 +01:00
Ozzieisaacs
5fc742c9c4
Fix #690
2018-10-30 19:29:33 +01:00
Ozzieisaacs
3f83be00fd
Fix #687
2018-10-29 20:38:09 +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
Ozzieisaacs
e080c74032
Merge remote-tracking branch 'ru-translation/patch-2'
2018-10-28 14:10:06 +01:00
OzzieIsaacs
58df19972f
Merge remote-tracking branch 'hungarian/loc-hu'
...
Update spanish language
2018-10-15 20:33:54 +02:00
Jim Ma
4b76b8400d
Add OAuth link&unlink in user profile
2018-10-14 16:51:00 +08:00
Jim Ma
1abbcfa3c6
Add OAuth support: GitHub & Google
2018-10-14 16:51:00 +08:00
otapi
9b4ca22254
Update shelf.html
2018-10-11 18:39:31 +02:00
otapi
c6d3613e57
Add UI link button to shelves
2018-10-11 18:20:38 +02:00
otapi
1201d4086f
Few termchanges
2018-10-11 18:14:57 +02:00
otapi
e0229c917c
Download only shelf
...
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
2018-10-10 23:01:05 +02:00
Chintogtokh Batbold
13883db5a0
Add anchor tags to titles
2018-10-09 11:52:16 +00:00
otapi
922e21438c
Minor fix
2018-10-06 21:42:03 +02:00
otapi
32366ab1ba
HU translation fixes
2018-10-06 21:32:53 +02:00
otapi
62d172f1e0
Delete dummy
2018-10-06 21:05:32 +02:00
otapi
67ecc2c088
HU translation
2018-10-06 21:04:55 +02:00
otapi
81a3b85c07
Create dummy
2018-10-06 21:02:53 +02:00
Victorhck
c09b7f39a5
spanish translation finished
2018-10-05 11:28:06 +02:00
Victorhck
b32ee84d4f
update Spanish translation (WIP
2018-10-04 13:02:25 +02: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
bodybybuddha
54f8680058
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
2018-10-03 11:58:25 -04:00
OzzieIsaacs
40cc25de7a
Merge remote-tracking branch 'bbb/621'
...
Fixes after testing
2018-10-03 14:03:08 +02:00
bodybybuddha
d8107fb50f
Addressed Codacy trailing space items ... again
2018-10-02 10:22:01 -04:00
bodybybuddha
46b2c9919a
Fix for #295
...
Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first
2018-10-01 15:35:51 -04:00
bodybybuddha
1144d97bc1
Fixed updating new book format to be all caps in database
...
This keeps us inline with calibre's behavior.
2018-10-01 15:34:16 -04: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
a798dc94a9
Satisfy "Codacy/PR Quality Review"
2018-10-01 10:45:51 +02: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
bodybybuddha
1b363ac720
Merged master into 617 - fixed import copy conflict
2018-09-30 11:37:21 -04:00
Virgil Grigoras
016c7b4b1c
Add ability to store and edit publishers
2018-09-30 14:08:55 +02:00
OzzieIsaacs
5a2ed58d06
Improved message for non configured ebook converter
...
Gdrive cleared interface (drive variable)
refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function
rearanged imports
added Wand and pytz Version info to stats Page
2018-09-30 09:43:20 +02:00
OzzieIsaacs
ffe3dd3de3
Show version of Werkzeug and Jinja2 in stats page
2018-09-29 19:21:04 +02:00
bodybybuddha
a7386ecb8b
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
2018-09-29 13:13:58 -04:00
bodybybuddha
9b1954f2f0
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
2018-09-29 13:13:17 -04: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
bodybybuddha
29efcf8358
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
2018-09-23 19:53:47 -04:00
bodybybuddha
d2e74a27cd
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
2018-09-23 19:51:32 -04: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
cab98a9165
Update translation files
2018-09-23 19:03:14 +02:00
OzzieIsaacs
aa5127cd16
Merge remote-tracking branch 'lxml/master'
2018-09-23 18:58:08 +02:00
OzzieIsaacs
b841baf714
Comment for adding publishers
2018-09-23 18:56:19 +02:00
eddriesen
522e897fee
Updated Dutch translation to current codebase
...
As requested,
A Dutch update
2018-09-23 15:52:11 +02:00
Fatih Ka
76e3be58e6
Delete book fixed
...
There was an incorrect parameter.
2018-09-19 21:38:40 +03:00
bodybybuddha
b4122e9858
Partial fix to #617 . Local status messages now work.
2018-09-19 11:26:52 -04:00
trasba
3fa41d0e4a
added formats for upload and conversion
...
added formats for upload and conversion (html, rtf, odt)
2018-09-17 21:55:41 +02:00
bodybybuddha
be0ddf25e4
Fix for #621 - Login page always in english
2018-09-17 13:03:29 -04:00
OzzieIsaacs
80e1a6910d
Fix Updater
2018-09-14 21:18:20 +02:00
OzzieIsaacs
b5ef63d327
Removed fixed update Informations
2018-09-14 21:16:09 +02:00
OzzieIsaacs
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
2018-09-14 21:12:45 +02:00
OzzieIsaacs
36d26f2089
Merge remote-tracking branch '625/625'
...
Update russian translation
2018-09-14 20:36:45 +02:00
bodybybuddha
03dc179bc3
Fixed Codacy Issues
2018-09-14 10:35:01 -04:00
bodybybuddha
89c0904ac9
Fix to #625 - Check to see if target book format already exists before executing conversion.
2018-09-13 21:24:21 -04:00
Admiral Laser Beard
21582f097e
update translation
2018-09-14 00:06:53 +03:00
OzzieIsaacs
968cddf2b0
Fix for #620
2018-09-10 19:31:56 +02:00
Virgil Grigoras
e08eccba5a
Satisfy "Codacy/PR Quality Review"
2018-09-10 18:21:44 +02:00
Virgil Grigoras
50ded1afc1
typo fix
2018-09-10 11:28:32 +02:00
Virgil Grigoras
b2b092c190
Bugfix for not displaying information when there is no update available + simplification
2018-09-10 11:20:34 +02:00
Virgil Grigoras
f7872aded0
Own function for getting the current commit hash and datetime
2018-09-10 10:42:28 +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
6e2dbb7cd6
move current commit hash to its own file
2018-09-09 13:00:46 +02:00
Virgil Grigoras
f477d48c7c
More robust handling while checking for new updates
2018-09-09 11:46:00 +02:00
OzzieIsaacs
bb7d2c6273
Update Language translation table (now including the locale language)
...
Fix #602
Fix for #593
2018-09-09 10:13:08 +02:00
OzzieIsaacs
79ee07ea54
Fix for python3 and pickle
2018-09-09 09:41:46 +02:00
OzzieIsaacs
ce6cde545b
Update french language
2018-09-08 21:16:56 +02:00
OzzieIsaacs
919de60e8d
Final fix #615
2018-09-08 14:58:00 +02:00
OzzieIsaacs
a5d15a19de
Update Translation "->'
2018-09-08 14:50:52 +02:00
Ozzie Isaacs
2de41a5c86
improvement for #615
2018-09-08 13:27:28 +02:00
OzzieIsaacs
9d0f583d4f
Updated french and chinese language. Thanks to @idalin and Olivier
...
Fixed bug some translations are not shown
2018-09-08 12:28:48 +02:00
OzzieIsaacs
2f1fe60cd6
Merge remote-tracking branch 'chinese_translation/master'
2018-09-08 09:28:12 +02:00
OzzieIsaacs
0091006aad
Fix #611
...
Fix for #615
2018-09-07 20:04:35 +02:00
OzzieIsaacs
b48de7dc77
Fix for #609
2018-09-06 20:54:48 +02:00
idalin
b103ecdb5c
update simplified Chinese
2018-09-06 16:59:30 +08: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
66824ff4e4
Fix #576
2018-09-02 13:58:17 +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
a4190f39de
Fix #577
2018-09-02 08:54:46 +02:00
OzzieIsaacs
4dd6c55c38
Fix for #587 (Better handling of errors in sending email)
2018-09-02 08:41:09 +02:00
OzzieIsaacs
c3b0492834
Refactored make_mobi and convert_ebook functions
2018-08-31 15:19:48 +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
4b006fba99
Re-commit: #584 & #587 Convert any book format to another format
2018-08-28 23:32:30 -04:00
bodybybuddha
fc78d1ee07
Added exception catching for file format check
2018-08-28 19:22:17 -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
3a37183e25
Included khmer language
...
Further unified naming
2018-08-28 10:29:11 +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
72fff2a297
Update for running calibre-convert in docker
2018-08-22 21:24:28 +02:00
OzzieIsaacs
7917347508
Revert accidently commited change in admin.html ( #580 )
2018-08-20 06:59:23 +02:00
OzzieIsaacs
5889535355
Bugfix gdrive download Books
...
Bugfix pagination
Fix Error messages massadd of books to shelf
2018-08-19 13:36:04 +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
Ozzie Isaacs
34abf95fb2
Fix for empty filename during edit
2018-08-18 22:00:43 +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
273b1c3fa8
Fix calibre-converter/kindlegen handling on windows and python3
2018-08-18 08:48:42 +02:00
OzzieIsaacs
cdb1b52652
Bugfix Get gdrive instances ( #554 , #525 )
...
Metadata.db download works again
removed DEVELOPMENT constant
removed db logging in debug mode (too, noisy, to less information)
code refactoring url_for_other_page
feed languge set to en-EN
update status shos local time instead of UTC
Error handling (back to index page) in case of gdrive authenticate aborted
Mistyping page register fixed
Mistyping bokk fixed
Added uploaded books to tasklist (#442 )
Error handling for failed file update added
Code refactoring worker thread
Tasks now never show any decimal values
Converter function unified
removed shell from subprocess call
preparation for limiting domain for registering emails
Book series can now increased in 0.1 steps (#562 )
Accordion panels in config are now usable on touch devices like iPad (#545 )
Gdrive authenticate button only visible after logged in (#525 )
Fixed misstyping in german translation
2018-08-16 21:17:26 +02:00
OzzieIsaacs
f8132f4d02
Fix for #574
2018-08-14 17:38:38 +02:00
OzzieIsaacs
bb5d7d7bc0
Fix for #574
2018-08-13 20:43:18 +02:00
OzzieIsaacs
c38f331b6f
Fix for #575
...
Fix no pydrive dependency installed
Fix sending email on python3
2018-08-13 19:43:50 +02:00
OzzieIsaacs
fac0921acf
Fix in exception of emailing
2018-08-13 17:40:11 +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
OzzieIsaacs
791f4a8078
Fix #455
2018-08-12 13:31:18 +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
11b798a01c
Fix #571
2018-08-08 20:03:11 +02:00
OzzieIsaacs
1e5cb29fc9
#571 (temporary fix)
2018-08-08 06:54:38 +02:00
OzzieIsaacs
5ec9051f2e
Add charset to opds feed for read books
2018-08-07 18:19:08 +02:00
Unknown
fdabb804cf
Call print as a function
2018-08-07 17:19:25 +02:00
Ozzie Isaacs
3db682cd15
Merge remote-tracking branch 'del_books/delete-book-formats'
...
# Conflicts:
# cps/helper.py
Implemented delete on gdrive
2018-08-04 18:22:43 +02:00
Ozzie Isaacs
f81fbaf542
Fix #568 (encoding problem in fb2 upload)
2018-08-04 17:08:32 +02:00
Ozzie Isaacs
82fe282e9b
Converting books from gdrive implemented
2018-08-04 14:00:51 +02:00
Ozzie Isaacs
ff1b479188
Added name of book emailed to task list
...
Implemented emailing of books from gdrive (converting not implemented yet)
2018-08-04 10:56:42 +02:00
OzzieIsaacs
dbf55d6f41
Fix #565
2018-08-01 18:34:54 +02:00
Ozzie Isaacs
7a38c05f12
Stop e-mail-thread on quit or restart
2018-07-31 20:19:43 +02:00
OzzieIsaacs
b0cbd0a37a
Added feature to send emails in a background-task
2018-07-30 20:12:41 +02:00
Ozzie Isaacs
4d6299f0d5
Improved gdrive error messages ( #554 )
2018-07-29 17:51:23 +02:00
Ozzie Isaacs
6a76dce870
Fix change user (in case of reboot required)
...
Fix no existing database
Update required version for sqlalchemy
2018-07-28 17:19:08 +02:00
OzzieIsaacs
9d161129d9
Fix for #554
2018-07-25 21:56:25 +02:00
OzzieIsaacs
f8c9777668
Merge remote-tracking branch 'show_url/url-links'
2018-07-24 20:46:04 +02:00
OzzieIsaacs
ab63d08d71
Fix for linux subprocess calibre-convert
2018-07-24 20:43:40 +02:00
Ben Bennett
b271b5f686
Changed the args to subprocess.Popen to pass args to the command
...
Before the command was not working correctly to check the calibre version since it seemed to be treating the entire string as the command. So when ' --version' was added it was breaking. I changed the format to pass the command and args as a list and it seems to work correctly.
2018-07-23 11:53:44 -04:00
PJ Eby
83db0f9ad5
Render 'url:' ID type as a link
...
Calibre allows 'url:' as a kind of book identifier
and shows it in the UI as a link; this change
makes calibre-web do the same.
2018-07-18 15:36:51 -04:00
OzzieIsaacs
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
2018-07-18 20:21:44 +02:00
OzzieIsaacs
ae0c5d7ec2
Fix for #549
2018-07-18 18:48:41 +02:00
OzzieIsaacs
3a9a59b751
Fix #497
2018-07-17 18:24:12 +02:00
OzzieIsaacs
a53b7908f3
Fix #417
2018-07-16 20:37:46 +02:00
OzzieIsaacs
aaa706069c
Implemented #417
2018-07-16 19:04:18 +02:00
OzzieIsaacs
8896b3c5d2
Requests from #454
2018-07-15 18:50:35 +02:00
OzzieIsaacs
6f36eef51d
Fix #544 (missed some config options)
...
Added lxml to stats sceen
2018-07-15 16:27:16 +02:00
OzzieIsaacs
f0459d577b
Bugfix #409
2018-07-15 15:14:26 +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
694620790c
#543
...
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
2018-07-14 23:03:54 +02:00
OzzieIsaacs
8d406117ce
Fix #432 added more checks for deleting books
2018-07-14 19:40:59 +02:00
OzzieIsaacs
eb65647774
Fix #539
...
Update Translations
2018-07-14 19:03:54 +02:00
OzzieIsaacs
31b703db62
Delete on gdrive working
...
Moving author on gdrive working
bugfix delete on normal folders
2018-07-14 13:48:51 +02:00
OzzieIsaacs
a8040ad3fa
#538 :
...
-Refactoring gdrive and file handling
-Improved error handling for gdrive
-bugfix "gdrive stopping after a while"
- Renaming book title working
- Still Bugs in upload file to gdrive and renaming author
2018-07-14 08:31:52 +02:00
OzzieIsaacs
413b10c58e
Bugfix gdrive
...
Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled
2018-07-09 20:30:38 +02:00
OzzieIsaacs
404b29b979
Refactored WSGIServer handling
...
Restart of gevent server now working
2018-07-09 18:47:36 +02:00
OzzieIsaacs
a298470479
Fix #526 . Books are now initially stored according to their id.
2018-07-08 10:41:00 +02:00
OzzieIsaacs
4f1754c1e4
Improved errorhandling during editing of books
2018-07-08 09:28:35 +02:00
OzzieIsaacs
fbe2f5384b
Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive
2018-07-07 16:27:21 +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
420f685fd9
Added logging information for errors
2018-07-07 12:27:07 +02:00
OzzieIsaacs
30d9991daf
Merge remote-tracking branch 'Goodread_fix/patch-test'
2018-07-07 12:21:32 +02:00
OzzieIsaacs
9ca454730c
Bugfix finding settings.yaml and dgrive_credentials file
2018-07-07 12:00:46 +02:00
OzzieIsaacs
7d3fadb685
Improved compability for gevent (version 1.3.x & Windows)
...
Bugfix gdrive naming of client_secrets.json
Bugfix handling of gdrive with working folder not cps root folder
2018-07-07 11:41:39 +02:00
OzzieIsaacs
c66bb54478
Fix #534
2018-07-03 19:34:29 +02:00
Ozzie Isaacs
a06748e348
Update settings.yaml file
2018-06-07 16:13:27 +03:00
SiphonSquirrel
30799996c9
Merge remote-tracking branch 'remotes/origin/goodreads-fix' into patch-test
2018-06-03 21:19:19 -04:00
SiphonSquirrel
274d2d9d21
Improve rename logic for directory name collisions.
2018-06-03 21:17:22 -04:00
Ozzie Isaacs
7d5302b47f
Fix accidentially deleted gevent ds
2018-06-02 17:12:54 +02:00
OzzieIsaacs
bf44774f22
Tags in detail view are sorted now
2018-06-02 17:02:18 +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
Charles
7142836622
Adding exception handling to GoodreadsClient if site is down
2018-05-31 18:28:16 -04:00
OzzieIsaacs
43a391d1bd
Redownloaded glyphicon font files #515
2018-05-31 09:33:43 +02:00
Eric Le Lay
513355e2e5
fix #513 OPDS updated date format invalid per Atom specification
...
replace space separating date from time with 'T'
2018-05-26 17:21:20 +02:00
Ozzie Isaacs
9867959916
Changed calibre to calibre-web
2018-05-06 16:48:49 +02:00
OzzieIsaacs
1f9527f0e1
Fix #496
2018-05-06 09:55:08 +02:00
Andriy Zasypkin
b2ba8bceb2
tags in detail view are sorted
2018-04-22 14:43:43 -04:00
OzzieIsaacs
66c1966b44
Update french translation
2018-04-13 21:16:37 +02:00
OzzieIsaacs
c27805b4e7
Bugfix Updater python3
...
Bugfix Updater in case of error
2018-04-10 18:50:04 +02:00
OzzieIsaacs
7a20c14dea
Integrated caliblur css
2018-04-03 17:59:06 +02:00
OzzieIsaacs
671bf5cf8d
Integrated #454 (css is loaded remote)
2018-04-02 10:09:19 +02:00
OzzieIsaacs
e24f837007
missing file from last commit
2018-04-01 19:32:19 +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
6a2449ffaf
Fix for SSL/NonSSL and gevent
2018-03-31 20:19:37 +02:00
OzzieIsaacs
691a4a88e6
Added support for svg in comics (not working in IE11)
2018-03-31 17:05:15 +02:00
OzzieIsaacs
8bfd3c7e4f
Fix #476
2018-03-31 13:30:22 +02:00
OzzieIsaacs
97adb36f1b
Bugfix Upload Message
...
Improved errorhandling at import imagemagick
2018-03-31 08:00:51 +02:00
OzzieIsaacs
af5a897d1d
Added SSL Options ( #416 )
2018-03-30 21:20:47 +02:00
OzzieIsaacs
d01d7b91a8
Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449
2018-03-27 20:42:19 +02:00
OzzieIsaacs
f6ece5fe72
Fix for #448
2018-03-27 20:18:11 +02:00
OzzieIsaacs
ea6a957c05
Changed mulitple books upload to single button
2018-03-26 20:50:04 +02:00
OzzieIsaacs
ee5677f376
Merge remote-tracking branch 'multiload/master'
2018-03-26 20:39:49 +02:00
Mingyue Gao
c6f568534f
fix(template): download book with capital ext by kindle's browser
2018-03-23 22:39:31 +01:00
OzzieIsaacs
f019d58b4d
Fix for unicode search ( #426 )
2018-03-10 20:42:18 +01:00
Faisal Alghamdi
0afa7cbafd
duplicate code removed
2018-03-07 10:40:48 +03:00
Faisal Alghamdi
78caf3379d
remove unused code
2018-03-07 09:59:47 +03:00
Faisal Alghamdi
43eb3b6f9c
button names fixed
2018-03-06 15:41:24 +03:00
Faisal Alghamdi
ff9ee82451
adding multiple files upload feature
2018-03-06 15:31:46 +03:00
OzzieIsaacs
ff2d53b998
Integrated japapanese translation.
...
Updated german translation
2018-02-13 16:44:57 +01:00
OzzieIsaacs
0b92a718ba
Merge remote-tracking branch 'Translation/master'
2018-02-13 16:31:55 +01:00
SpaceWhite
51fbb07124
Add japanese translation
2018-02-09 04:35:04 -05:00
OzzieIsaacs
21c2ee4d63
Fix for #443
2018-02-04 08:05:08 +01:00
OzzieIsaacs
7371803184
Fix for #444
2018-02-04 07:37:40 +01:00
OzzieIsaacs
4346e947e3
Fix for #447
2018-02-04 07:21:08 +01:00
OzzieIsaacs
199b1c4820
Changed gdrive base uri handling ( #431 )
2018-01-20 08:27:44 +01:00
Andriy Zasypkin
6b4d7674b5
use isinstance instead of type
2018-01-16 09:30:26 -05:00
OzzieIsaacs
e99e93db1f
#424 , #437 Added "apple-touch-icon" for apple devices
2018-01-14 14:15:07 +01:00
OzzieIsaacs
8716054dcf
Fix #436
2018-01-13 14:11:59 +01:00
Andriy Zasypkin
fb41aa8b57
removed debug statement from production
2018-01-11 08:49:49 -05:00
Andriy Zasypkin
28dac34119
auto select format if only one
2018-01-11 08:43:39 -05:00
OzzieIsaacs
2850a84bbc
Fix for deleting books if book path contains no path ( #432 )
2018-01-10 21:16:51 +01:00
OzzieIsaacs
07d6ba094b
Fix for deleting books in shelfs ( #419 )
2018-01-06 12:08:55 +01:00
OzzieIsaacs
0329306031
Favicon replaced ( #424 ) with hiher resolution
2018-01-06 11:36:23 +01:00
Andriy Zasypkin
e66068d699
should fix testing error
2017-12-20 12:10:47 -05:00
Andriy Zasypkin
6b6a457a9d
comic reader updated extentions
2017-12-15 12:14:20 -05:00
Andriy Zasypkin
9249390043
comic book read file order fixed
2017-12-14 10:39:25 -05: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
4c05b3db67
Present dates for updater in local date format
2017-12-02 18:42:21 +01:00
OzzieIsaacs
319077aea9
Import covers from comic files during upload
2017-12-02 17:33:55 +01:00
OzzieIsaacs
5809acfa9e
anonymous user now have always the right to read books (as any other user, too)
...
(Fix #287 )
2017-12-02 14:25:18 +01:00
OzzieIsaacs
b74a075aa6
Added posibility to change settings db via command line for multiple instances ( #247 )
2017-12-02 11:15:51 +01:00
OzzieIsaacs
152f7857c9
Fix #397
2017-12-01 15:33:55 +01: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
aee5ca0e06
#396 implemented
2017-11-30 20:12:13 +01:00
OzzieIsaacs
f1fac28203
Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)
2017-11-30 16:49:46 +01:00
OzzieIsaacs
f890fc1553
New progress bar
2017-11-29 15:54:17 +01:00
OzzieIsaacs
b4aede78bc
Fix for the piping problem ( #395 )
2017-11-28 08:54:21 +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
d76f812310
Fixed empty return on getcomic
...
Python 3 compability (the easy way)
2017-11-20 07:53:52 +01:00
OzzieIsaacs
e7b6963afd
Small improvements for comic reader calls
2017-11-19 20:37:43 +01:00
Andriy Zasypkin
6ab4ff9a3b
Merge branch 'comic_server' into comic_server
2017-11-19 14:09:17 -05:00
OzzieIsaacs
5756785073
Error handling rarfiles
2017-11-19 18:08:55 +01:00
Andriy Zasypkin
ec12181803
added python3 compatibility for comic reader
2017-11-19 08:49:40 -05: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
6e714f3f16
Fix #391
2017-11-17 18:29:29 +01:00
OzzieIsaacs
211c3b16dd
Fix fror #388
2017-11-15 07:40:17 +01:00
OzzieIsaacs
f045c16c4e
Fix #386
2017-11-13 21:33:36 +01:00
OzzieIsaacs
01d0083fe6
Fix for #376
2017-11-12 19:08:20 +01:00
OzzieIsaacs
b8d45b664a
Typeahead working again
...
Fix for replacing characters in filenames
2017-11-12 18:48:44 +01:00
OzzieIsaacs
ad16194798
Error on deleting non existing book fixed ( #382 )
2017-11-12 18:08:13 +01:00
OzzieIsaacs
09f86ee8d4
Fix #385
2017-11-12 14:56:49 +01:00
OzzieIsaacs
8388df202f
Merge remote-tracking branch 'dutch/dutchupdate'
2017-11-12 14:52:31 +01:00
OzzieIsaacs
798cbc7505
Merge remote-tracking branch 'opds/master'
2017-11-12 14:46:19 +01:00
OzzieIsaacs
78744b19d8
Fix #377
2017-11-12 14:10:08 +01:00
OzzieIsaacs
ba54b9a357
Fix #365
2017-11-12 14:06:33 +01:00
OzzieIsaacs
fd39cbaa6f
Fix #363
2017-11-12 13:40:56 +01:00
Thijs van Ulden
5b13171060
Updated Dutch translation
2017-11-05 10:24:35 +01:00
OzzieIsaacs
af8d908bba
Fix #371 , #372
2017-11-01 16:55:51 +01:00
OzzieIsaacs
ae1e7c57d5
Update french translation
2017-11-01 16:10:05 +01:00
Yamakuni
f5e1b38e63
French translation correction
2017-10-26 22:44:16 +02:00
unknown
b4bd7507b6
Merge branch 'master' of git://github.com/janeczku/calibre-web
2017-10-22 14:41:23 +02:00
unknown
674baad49e
lowercasing the input
2017-10-21 22:07:39 +02:00
unknown
4a04ec898e
case-insensitive search for non-ASCII - improved
2017-10-21 21:50:47 +02:00
unknown
d2ea3a6c19
case-insensitive search for non-ASCII
2017-10-20 23:23:16 +02:00
OzzieIsaacs
9182d89128
# Fix 361
2017-10-13 19:31:03 +02:00
Cory Sitko
5e4c8c6c65
fixed is_authenticated check
2017-10-10 20:48:50 -04:00
Cory Sitko
8fd67fb1fc
UserBase methods should be properties not classmethods
2017-10-10 18:14:19 -04:00
Cory Sitko
cc758517e7
updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin
2017-10-10 14:13:28 -04:00
Cory Sitko
7ade2ecd35
make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing
2017-10-10 10:18:28 -04:00
OzzieIsaacs
366bf9739b
Fix for #360 and guest accounts
2017-10-09 22:36:47 +02:00
OzzieIsaacs
1eb10be253
Code cosmetics comic reader
2017-10-08 10:41:43 +02:00
OzzieIsaacs
90729de87f
Fix #354
...
Fix #355
Fix #353
Fix #352
Fix #351
2017-10-06 08:51:34 +02:00
unknown
6855deceef
added corresponding content-type for a downloaded book, otherwise default text/html is used
2017-10-01 20:48:01 +02:00
unknown
0f0c6dde09
changed application/xml to application/atom+xml
2017-10-01 20:24:24 +02:00
unknown
1ada1704b0
excluded read/unread when exposing the catalog to an anonymous user
2017-10-01 18:42:35 +02:00
unknown
3c9f8b151d
added check for anonymous session in read_books, otherwise current_user.id is not defined
2017-10-01 18:41:19 +02:00
unknown
d336f9faa6
fixed OPDS templates
2017-10-01 17:16:57 +02:00
unknown
7ddfa1881b
added FB2 mime type
2017-10-01 17:15:44 +02:00
unknown
70d093b193
unicode gave an NameError with python3
2017-10-01 17:14:20 +02:00
Jonathan Rehm
56c71dd4bf
Disable bookmarking when anonymous users are reading
2017-09-30 10:51:20 -07:00
OzzieIsaacs
0512e5a940
Fix #342
2017-09-30 16:25:29 +02:00
OzzieIsaacs
c56a02bab6
Fix #339
2017-09-30 15:24:18 +02:00
OzzieIsaacs
031a175474
Fix Comic reader
2017-09-24 19:38:15 +02:00
Andriy Zasypkin
442fb23b18
python3 compatibility
2017-09-24 07:52:59 -04:00
OzzieIsaacs
2302db4e06
Merge remote-tracking branch 'adv/fix-douban-rating'
2017-09-22 20:57:24 +02:00
OzzieIsaacs
299cf82921
Merge remote-tracking branch 'translation/master'
...
# Conflicts:
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
2017-09-22 20:56:36 +02:00
Yamakuni
85ec9cba1f
New correction of translation
2017-09-21 12:34:06 +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
4582aebec1
Bugfix gdriveutils
2017-09-17 10:54:23 +02:00
OzzieIsaacs
b6b73d39c2
Fix #329
...
Code cosmetics
2017-09-17 07:15:08 +02:00
OzzieIsaacs
b6f06658a2
Merge remote-tracking branch 'ipv6/ipv4only'
2017-09-16 20:18:34 +02:00
OzzieIsaacs
dfd3b40865
Fix #325
2017-09-16 19:57:00 +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
7acf4d40a4
Merge remote-tracking branch 'adv/escape-filename'
2017-09-16 18:53:33 +02:00
OzzieIsaacs
2ef6dc30bd
Added italian translation
2017-09-16 16:58:42 +02:00
OzzieIsaacs
abadaa3f1d
Merge remote-tracking branch 'l/master'
2017-09-16 08:06:35 +02:00
OzzieIsaacs
b30a73c505
Merge remote-tracking branch 'adv/def-variables'
2017-09-16 07:55:44 +02:00
OzzieIsaacs
af0cefa4ac
Update translations
2017-09-16 07:52:53 +02:00
OzzieIsaacs
e26c8a1e46
Merge remote-tracking branch 'd/patch-1'
2017-09-16 07:40:29 +02:00
OzzieIsaacs
5e370fb4b3
Merge remote-tracking branch 'y/master'
2017-09-16 07:38:50 +02:00
Yamakuni
f147c072c6
French translation
...
Add and correct
2017-09-14 12:03:36 +02:00
Wouter Dijk
c048a96e07
Updated Dutch translations
...
I've added some missing translations and edit some faulty ones. Not finished yet, will continue later on! ;-)
2017-09-14 10:36:39 +02:00
Ainsley Pereira
993c56d021
Fix syntax error
2017-09-12 21:11:52 +01:00
Ainsley Pereira
1ce6893fa8
Exception isn't thrown until we call serve_forever, so that must be in the try block
2017-09-12 21:06:58 +01:00
Ainsley Pereira
b8b88183c3
Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work
2017-09-12 20:49:38 +01:00
Ainsley Pereira
a75c393922
Merge remote-tracking branch 'upstream/master'
2017-09-12 20:34:11 +01:00
Jonathan Rehm
29f21b148b
Translate 10-based rating to 5-based
2017-09-11 09:58:39 -07:00
Jonathan Rehm
e806494b54
Ensure variables exist before they're used
2017-09-11 09:24:20 -07:00
kyos
8937599ba7
Fixed codacy code control
2017-09-11 17:18:11 +02:00
kyos
cbf2bb450d
Fixed issue calculating filesize of the uploaded book
2017-09-11 11:47:39 +02:00
kyos
be15f3781f
Fixed issue reported by Jkrehm to prevent filesize to fail
2017-09-11 11:17:29 +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
Torben Mohrfeldt
94f8cc247c
Reflect title in the logo
2017-09-09 23:59:06 +02:00
OzzieIsaacs
b6b5313f2d
Fix for #315
2017-09-09 14:23:25 +02:00
teflontoni
4527693fe3
Move "Show mature content" Checkbox
...
In order to make the option safe and sane we move the corresponding checkbox to the settings that need administrator privileges.
2017-09-08 15:47:22 +02:00
Louis Jencka
b3217496d1
Add progress bar to upload form
2017-09-02 11:51:11 -06:00
OzzieIsaacs
81219663fe
Update translation
2017-09-01 20:39:56 +02:00
OzzieIsaacs
c959a1ccc6
Merge remote-tracking branch 'iss/typo'
2017-09-01 20:31:01 +02:00
OzzieIsaacs
f860694487
Merge remote-tracking branch 'adv/goodreads-more-by'
2017-09-01 20:29:45 +02:00
OzzieIsaacs
429f4a11a9
Merge remote-tracking branch 'adv/es5-syntax'
2017-09-01 20:12:22 +02:00
OzzieIsaacs
5ee1950828
Merge remote-tracking branch 'adv/sqlalchemy-bool'
2017-09-01 20:11:48 +02:00
Jonathan Rehm
58abc1d024
Fuzzy match book titles to eliminate duplicates
...
Titles with a Levenshtein ratio of 70% or greater are considered duplicates.
2017-08-29 07:15:33 -07: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
6b8de017ab
Use SQLAlchemy boolean
...
Seems to make a difference sometimes.
Ref #300
2017-08-29 07:14:57 -07:00
Jonathan Rehm
282837c7c5
Use ES5 syntax
2017-08-29 07:14:32 -07:00
Jonathan Rehm
8e1cfa1cbf
Re-apply db_filter
...
Accidentally removed when the language and content filters were moved to `common_filters`.
2017-08-29 07:13:31 -07:00
Ivan Smirnov
12c98157d5
fix typo:: diffrent -> different
2017-08-27 19:31:58 -07:00
OzzieIsaacs
a8b53ab38a
Merge remote-tracking branch 'adv/common-filters'
2017-08-27 09:36:02 +02:00
OzzieIsaacs
62f6bb4e64
Remove In author marker on authors page
2017-08-27 09:27:55 +02:00
OzzieIsaacs
d5e1dba0fe
Merge remote-tracking branch 'adv/goodreads-more-by'
2017-08-27 09:24:02 +02:00
Jonathan Rehm
3213bf50b3
Move common filters into function
...
Instead of duplicating functionality across lots of functions, combine it into one common function. It makes reading and modifying it much easier.
2017-08-26 08:12:16 -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
OzzieIsaacs
193605df4a
Fix for #286
2017-08-20 07:47:47 +02:00
OzzieIsaacs
cf5e2f7cd1
search button is displayed in moon reader ( #283 ), search result is not displayed
2017-08-20 07:10:53 +02:00
OzzieIsaacs
f6425a6569
Merge remote-tracking branch 'adv/cache-buster'
2017-08-19 23:10:12 +02:00
Jonathan Rehm
cda733f4a4
Escape special characters in file names
...
Follows Calibre's convention of using underscores as replacements
2017-08-19 11:56:29 -07:00
Jonathan Rehm
8cbd6a8431
Do not append query string if file_hash is not found
2017-08-19 09:09:12 -07:00
Jonathan Rehm
13c2a53c0f
Fix issues with Windows path separators
2017-08-19 08:32:00 -07:00
OzzieIsaacs
6b1f3aa531
Merge remote-tracking branch 'adv/cache-buster'
2017-08-19 08:36:12 +02:00
marblepebble
97f573c41a
Set ipv4 address explicitly for docker usage
2017-08-18 21:53:52 +01:00
OzzieIsaacs
bd02c92162
Merge remote-tracking branch 'adv/get-meta-data'
2017-08-17 15:32:14 +02:00
OzzieIsaacs
e3d416db4c
Merge remote-tracking branch 'adv/cover-upload'
2017-08-17 15:27:32 +02: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
OzzieIsaacs
de112b0b05
Merge remote-tracking branch 'adv/eslint'
2017-08-14 20:21:52 +02:00
Jonathan Rehm
a27848b351
Add static asset cache busting
...
Calculates MD5 hash of static assets on server start. These are appended to the file name's when url_for is used, telling browsers to download the latest version of the files, e.g. style.css?q=81cf0ee.
Inspired by https://github.com/ChrisTM/Flask-CacheBust but uses query strings instead of rewriting the path because fonts inside CSS files break when the path is rewritten.
2017-08-13 09:32:29 -07:00
Jonathan Rehm
08d0404e9c
Add mature_content property to Anonymous class
2017-08-13 07:05:45 -07:00
Jonathan Rehm
8171943b8e
Update to ES5 standards
...
Also fix ESLint issues
2017-08-12 22:46:27 -07:00
OzzieIsaacs
91cdb5f60f
Merge remote-tracking branch 'Upper_case/master'
2017-08-12 19:02:57 +02:00
OzzieIsaacs
2f7177742d
Update chinese translation
2017-08-12 18:59:57 +02:00
OzzieIsaacs
dd6c928e2c
Merge remote-tracking branch 'translation/master'
2017-08-12 18:55:08 +02:00
OzzieIsaacs
fb8ce693f3
Bugfix mature content
...
Update german translation
2017-08-12 18:52:56 +02:00
OzzieIsaacs
b596734c36
Merge remote-tracking branch 'adv/mature-content'
2017-08-12 18:16:45 +02:00
idalin
274d0f6577
update Chinese translations
2017-08-11 09:32:01 +08:00
idalin
2b27d6570f
Merge branch 'janeczku-master'
2017-08-11 09:26:36 +08:00
idalin
b5cca553b3
update Chinese translations
2017-08-11 09:25:39 +08:00
kyos
9a17a09cc7
Fixed codacy requirements
2017-08-10 12:34:54 +02:00
Ruben Herold
68e3867af3
fix books with uppercase extension
2017-08-10 12:29:08 +02:00
kyos
aa4a5dc3ef
Added option to upload a new format to a given book
2017-08-09 19:56:46 +02:00
Jonathan Rehm
6f797ba478
Check if JPEG via response content-type header instead of URL extension
...
That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.
2017-08-09 10:03:02 -07:00
Jonathan Rehm
aee8aad976
Add option to hide mature content from some users
...
Uses a configurable list of tags to denote what is mature and hides those books from the user
2017-08-08 10:38:28 -07:00
Carlos Clavero
8f5bc2a484
Merge pull request #9 from Kyosfonica/add_css_separation_for_tags_in_advance_search
...
Added a 5px separation for all input labels in advanced search
2017-08-01 17:53:07 +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
Carlos Clavero
1500e0f54f
Merge pull request #8 from Kyosfonica/add_css_separation_for_tags_in_advance_search
...
Added a 5px separation for all input labels in advanced search
2017-08-01 17:50:24 +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
Carlos Clavero
5f78ec4e83
Merge pull request #7 from Kyosfonica/add_css_separation_for_tags_in_advance_search
...
Added a 5px separation for all input labels in advanced search
2017-08-01 17:46:13 +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
Carlos Clavero
80c021939e
Merge pull request #6 from Kyosfonica/master
...
Update dev with latests changes from master
2017-07-31 18:17:59 +02:00
kyos
51bc0e82a4
Added series and series_index metadata handler
2017-07-31 09:00:09 +02:00
kyos
4bba3558b7
Added tags metadata handler for epubs
2017-07-31 08:46:29 +02:00
OzzieIsaacs
fe52de6b4b
Merge remote-tracking branch 'adv/lighthouse-audit'
2017-07-30 06:59:12 +02:00
OzzieIsaacs
cd2e27d7ad
Merge remote-tracking branch 'adv/previous-pagination'
2017-07-30 06:51:05 +02:00
OzzieIsaacs
82165a67a1
Merge remote-tracking branch 'mail/master'
2017-07-30 06:44:10 +02:00
OzzieIsaacs
626e2e393e
Merge remote-tracking branch 'adv/edit-publish-date'
2017-07-30 06:37:18 +02:00
Mikhail Akushsky
4313910ba0
Fix hmac creation in send_test_email function
2017-07-29 18:06:16 +03:00
Jonathan Rehm
ec118c2254
Move scripts to bottom of body to prevent execution from delaying DOM rendering
2017-07-28 20:07:10 -07:00
Jonathan Rehm
dde4f6afe2
Add missing label
2017-07-28 20:03:43 -07:00
Jonathan Rehm
0b47958fad
Add lang attribute to html tag
2017-07-28 20:03:23 -07:00
Jonathan Rehm
c86fa268c2
Fix/remove duplicate id's
2017-07-28 20:02:53 -07:00
Jonathan Rehm
5162e2eed7
Add img alt attributes
2017-07-28 20:01:31 -07:00
Jonathan Rehm
5465b8e8b7
Add "Previous" pagination button
...
I imagine these buttons are still in use when JavaScript is disabled or not loading.
2017-07-28 07:38:35 -07: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
Jonathan Rehm
cc916a4eb4
Add timestamp to default publishing date
2017-07-23 13:35:35 -07:00
Jonathan Rehm
a07798b0db
Standardize indentation
2017-07-23 13:35:35 -07:00
Jonathan Rehm
04b04e200f
Add ability to edit publish date
...
If a date is not set, default to “0101-01-01”
2017-07-23 13:35:35 -07:00
Jonathan Rehm
cf7196ae5e
Refactor to remove nested if-statements
2017-07-23 13:35:35 -07:00
Jonathan Rehm
a95e6aab6b
Do not attempt to create the YAML file when Google Drive is disabled ( #246 )
2017-07-23 22:26:43 +02: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
OzzieIsaacs
df1b503c2d
Update Translation
2017-07-23 13:25:54 +02:00
OzzieIsaacs
c403fdfa2e
Merge remote-tracking branch 'adv/sorting'
2017-07-23 13:18:24 +02:00
OzzieIsaacs
97d577ef2e
Merge remote-tracking branch 'adv/add-to-shelf-ajax'
2017-07-23 13:16:20 +02:00
OzzieIsaacs
4311091d7d
Merge remote-tracking branch 'adv/python3-fix'
2017-07-23 13:11:37 +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
6a9d8efc93
Fixes for #233 (detection of permission errors)
2017-07-16 22:04:40 +02:00
Jonathan Rehm
85ce06850c
Fix for Python 3
2017-07-13 21:28:00 -07:00
Jonathan Rehm
91ba0f0362
Resolve issues with unicode characters in author's name
...
I've been unable to reproduce the issue on macOS with Python 2.7/3.6 and Fedora with Python 2.7, but if it happens for others, then it's worth the change.
2017-07-13 21:22:34 -07:00
Jonathan Rehm
51bd2f89df
Use dot notation
2017-07-13 18:09:33 -07:00
Jonathan Rehm
c9c6529567
Use SECRET_KEY from environment variable ( #232 )
2017-07-11 18:35:55 +02:00
OzzieIsaacs
5985342b79
Bugfix for typeahead in search function and on edit books page
2017-07-11 18:08:12 +02:00
OzzieIsaacs
a8aa1e7623
Merge remote-tracking branch 'button_padding/limit-typeahead-requests'
2017-07-11 17:48:33 +02:00
OzzieIsaacs
cfa69ff4f2
Merge remote-tracking branch 'button_padding/smtp-from'
2017-07-11 17:38:52 +02:00
Jonathan Rehm
9683d50f36
Send mail from the FROM address instead of the login
...
When SMTP is configured to use a service that doesn't use an email address to log in – e.g. AWS SES or Postmark – the sendmail request fails saying the FROM address is invalid.
2017-07-11 07:16:19 -07:00
Ozzie Isaacs
f79fb420ba
Removed whitespaces
2017-07-11 16:13:33 +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
Jonathan Rehm
66231c8737
Associate label with correct input ( #228 )
2017-07-10 19:26:57 +02:00
Ozzie Isaacs
92f634b6a6
Bugfix link admin section
2017-07-10 12:04:15 +02:00
OzzieIsaacs
74e93e1cdf
Code cosmetics
2017-07-09 20:15:15 +02:00
OzzieIsaacs
1fdb7dc497
Epub Viewer Bugfix Retenia Ipad devices
2017-07-09 16:28:22 +02:00
OzzieIsaacs
16ce7799a2
Improvement of margins in epub reader ( fix #210 )
2017-07-09 15:49:47 +02:00
OzzieIsaacs
470aea6106
Fix #214
...
Update epub.js lib
2017-07-09 13:27:56 +02:00
OzzieIsaacs
979bcdffd4
Bugfix non working download links
...
Bugfix missing divider in detail page
2017-07-09 12:41:09 +02:00
Jonathan Rehm
fe68c8a7f8
Add support for displaying author information from Goodreads
...
Requires the "goodread" module (added to optional-requirements.txt) and an API key
Retrieves Goodreads author information and displays their photo and "about" text
2017-07-08 16:07:45 -07:00
OzzieIsaacs
31e0025099
Update Translation
2017-07-08 19:50:44 +02:00
OzzieIsaacs
5a6ad970d8
Merge remote-tracking branch 'button_padding/magic-link'
2017-07-08 19:26:08 +02:00
Jonathan Rehm
d799b859ea
Make changes suggested by codacy
2017-07-08 09:15:40 -07:00
Jonathan Rehm
649579eccd
Move jquery.form to layout.html
...
This prevents it from getting loaded each time the details are viewed in a modal dialog.
2017-07-08 09:15:40 -07:00
Jonathan Rehm
675e8dd5cd
Show book details in modal dialog
...
With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place.
2017-07-08 09:15:40 -07:00
OzzieIsaacs
93dfb96174
Added Translation of title for read/unread books
2017-07-08 16:47:07 +02:00
OzzieIsaacs
f446e29276
Updater now uses correct "gid" instead of "uid" for change ownership of files (Fix for #213 ) -> update should now working if user id differs from groupid
2017-07-08 14:57:39 +02:00
OzzieIsaacs
2929d95b26
Display all authors names in shelf, like on all other pages ( #202 )
2017-07-08 13:50:21 +02:00
OzzieIsaacs
aed626b91b
Merge remote-tracking branch 'button_padding/read-unread-counts'
2017-07-08 11:26:07 +02:00
OzzieIsaacs
254e1f5262
Merge remote-tracking branch 'button_padding/simplify-read-code'
...
# Conflicts:
# cps/static/css/style.css
2017-07-08 11:25:20 +02:00
OzzieIsaacs
15531324ea
Add translation of rich text editor
2017-07-08 11:19:36 +02:00
OzzieIsaacs
77c4da0f07
Merge remote-tracking branch 'button_padding/tinymce'
2017-07-08 11:03:21 +02:00
OzzieIsaacs
4f08608d75
Move download button to top of detail page ( #174 )
2017-07-08 11:01:40 +02:00
OzzieIsaacs
b876a03f26
- Changed link color on download button to white
...
- removed file icons on download button
- removed shadow style on download button
2017-07-08 10:57:40 +02:00
OzzieIsaacs
6b71e77436
Merge remote-tracking branch 'Download/feature/download-icon-20170410'
2017-07-08 09:35:09 +02:00
Jonathan Rehm
623f5c8ef0
Add "magic link" functionality
...
When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device.
Configuration was added and is disabled by default.
2017-07-07 18:29:16 -07:00
Jonathan Rehm
b138c9edd5
Show read/unread counts
2017-07-06 22:33:57 -07:00
