mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-17 07:14:53 +00:00
Code Issues Releases Wiki Activity
2,397 Commits 3 Branches 24 Tags 101 MiB
e99dd3310c
Commit Graph

2056 Commits

Author SHA1 Message Date
blitzmann
bec280c6b1 Add some error handling 2020-08-23 21:51:44 -04:00
blitzmann
6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks 
# Conflicts:
#	cps/helper.py
 2020-08-23 21:38:56 -04:00
blitzmann
ac22483f98 Add error handling to the email task within the convert task 2020-08-23 21:35:05 -04:00
blitzmann
59d56d5c83 py27 support (I think) and some clean up 2020-08-23 21:21:55 -04:00
OzzieIsaacs
cdaad2fb4a Merge branch 'master' into Develop 2020-08-23 21:23:00 +02:00
OzzieIsaacs
843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 2020-08-23 21:22:44 +02:00
blitzmann
a000de0270 Some clean up 2020-08-23 13:33:57 -04:00
blitzmann
bf41b04cfa Remove convert task from db.py - with the fixed from #1565, this no longer seems to be needed 2020-08-23 13:07:24 -04:00
blitzmann
9ce2e8ea53 Fix progress indication for emails that have been completed. 2020-08-23 12:58:24 -04:00
OzzieIsaacs
f066926fc9 Merge branch 'master' into Develop 2020-08-23 10:56:10 +02:00
OzzieIsaacs
4c38b0ab10 Prepare for save name sort order 2020-08-23 10:56:00 +02:00
OzzieIsaacs
cf35c9dcef Merge remote-tracking branch 'name/patch-2' into master 2020-08-23 10:53:18 +02:00
OzzieIsaacs
45ff9394f2 Fix comma separated author names during for upload 2020-08-23 09:44:42 +02:00
blitzmann
414043ded1 Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment) 2020-08-22 23:35:48 -04:00
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
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