Commit Graph

1886 Commits (422c1893c09ffb9ebb7e906cae0ca81caf2ebfbd)

Author SHA1 Message Date
Ozzieisaacs 273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
5 years ago
Ozzieisaacs ac37483d47 Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration) 5 years ago
Ozzieisaacs 0cc2b49296 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/book_edit.html
5 years ago
Ozzieisaacs 44d5adc16f Fix #1390 5 years ago
Ozzieisaacs f749fc641b Temporary fix for #1390 5 years ago
Ozzieisaacs 87c76c09e2 temporary fix for #1390 5 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 5 years ago
Ozzieisaacs ec7d5b17ab Added table view for books 5 years ago
Ozzieisaacs 47641eee59 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 42abe28cc1 Fix for #1389 (import ldap users with whitespaces) 5 years ago
Ozzieisaacs b48afa38ac Fix #1386 (Add asin to recognized identifiers) 5 years ago
Ozzieisaacs f7269d8df2 Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu) 5 years ago
Ozzieisaacs ce0fab8d2f Fix duplicate shelf names in "search" 5 years ago
Ozzieisaacs 33472567de Improved Debug output on send email 5 years ago
Ozzieisaacs f5e12328dc Fix for #1382 (Restrictions with "&" in it can't be deleted) 5 years ago
Ozzieisaacs 486c0f2937 Fix for #1382 (Restrictions with "&" in it can't be deleted) 5 years ago
jvoisin e69c4cd1dc Refactor a bit cps/uploader.py 5 years ago
Marcel e0d3ccd8d1
Update messages.po 5 years ago
Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
5 years ago
OzzieIsaacs 92db00692a Merge all headers to download response
Updated test results
5 years ago
OzzieIsaacs fe88010a72 Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur' 5 years ago
OzzieIsaacs 99ae4be2c2 Merge remote-tracking branch 'sec_fixes/bump_jquery' 5 years ago
OzzieIsaacs a9085752c1 Fix error "email" not in to_save 5 years ago
OzzieIsaacs e1fbc9255c Merge remote-tracking branch 'sec_fixes/bump_underscore' 5 years ago
OzzieIsaacs f33e25ac40 Merge remote-tracking branch 'sec_fixes/cookies_improvement' 5 years ago
OzzieIsaacs 51365ab006 Merge remote-tracking branch 'sec_fixes/strong_session_protection' 5 years ago
OzzieIsaacs d61b7e48d7 Merge remote-tracking branch 'sec_fixes/random_password' 5 years ago
OzzieIsaacs f590b24f85 Merge remote-tracking branch 'sec_fixes/https' 5 years ago
Ozzieisaacs 308fd55483 #1141 (Setting for file size limit on email) 5 years ago
Ozzieisaacs fefb44e612 #1356 (fixes for readonly metadata.db)
Fix remove trailing metadata.db at entering calibre_db_path
5 years ago
jvoisin dd3b562f1a Change some links from http to https 5 years ago
jvoisin 30c9aa3df9 Minor fixes to caliBlur.js
- Add alt attributes to images
- Fix a broken tag
5 years ago
jvoisin 688184e255 Bump jquery 5 years ago
Ozzieisaacs 75fb7c2e95 Allowing upload extensions (#1119) 5 years ago
jvoisin 264b4b669e Bump underscorejs version from 1.9.1 to 1.12.2 5 years ago
Ozzieisaacs 51f12c51ad Fix #1361 (covers of archived books not shown) 5 years ago
Ozzieisaacs 03d134697c Fix #1361 (covers of archived books not shown) 5 years ago
Ozzieisaacs ff3f42db95 Fix #1364 (translated format identifier)
Updated french Translation
5 years ago
Ozzieisaacs e8aedeac36 Refactored admin.py 5 years ago
jvoisin bf166b757a Improve a bit the cookie's hardening
- Samesite for session cookies as well as the remember me ones
- Httponly
5 years ago
jvoisin b4165335a7 Use strong sessions protection
See https://flask-login.readthedocs.io/en/latest/#session-protection for
details
5 years ago
jvoisin 2a1bf2fa71 Generate strong random passwords 5 years ago
Ozzieisaacs 718d50a037 Starting again without traceback (moved gdriveutil import) 5 years ago
Ozzieisaacs 41960ada4a Autodetect binaries 5 years ago
Ozzieisaacs 0a02caad04 Improvements 5 years ago
Ozzieisaacs ff75bdba9e Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 189243a9b0 Merge remote-tracking branch 'publisher_sort/patch-1' 5 years ago
Ozzieisaacs 34e339c506 Merge remote-tracking branch 'it/patch-12' 5 years ago
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
5 years ago
Ozzieisaacs 4e940f7fa0 Added response header for improving security 5 years ago
Knepherbird 69fde7dead
Update web.py
Set db.Publishers query to order by name column, because publishers.sort column is empty.
5 years ago
Ozzieisaacs 4368c182a0 Make goodreads compatible for betterreads dependency 5 years ago
Ozzieisaacs 48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
5 years ago
Ozzieisaacs 6a6c1b6b21 Fix for #1358, #1355 5 years ago
Ozzieisaacs 51808d2ad4 Version Bump 5 years ago
Ozzieisaacs 0735fb1e92 Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
Preparation for release
5 years ago
Ozzieisaacs 850a85915b Fix #1354 (Error on uploading single book, because of missing rarfile) 5 years ago
ElQuimm 148f1109c6
updated messages.po
just a little update for coherence with Read/da leggere -> Archived/da archiviare.
Sorry :-)
5 years ago
Ozzieisaacs fcbeeca305 Merge remote-tracking branch 'it/patch-11' 5 years ago
Ozzieisaacs fb16429867 Randomize flask secret_key 5 years ago
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)
5 years ago
ElQuimm db38d7ee78
Updated version of italian.po
:-)
5 years ago
Ozzieisaacs 0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
5 years ago
OzzieIsaacs 36a984ce3c Revert proxyfix 5 years ago
Ozzieisaacs fcefd8031a Fix #985 (png and webp are extracted as cover files from comic files) 5 years ago
Ozzieisaacs 64bebaa1d1 Update Upload formats 5 years ago
Ozzieisaacs 0138ff9e16 Added additional config options 5 years ago
Ozzieisaacs 9bc085a23e Fixes for comic reader 5 years ago
Michael Shavit e0fbfa44a4 Fix issue with cover images introduced during the merge of #1277. 5 years ago
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
5 years ago
Ozzieisaacs b95f6563cc Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop 5 years ago
Ozzieisaacs 700cb3b553 Merge remote-tracking branch 'NL/master'
Updated all strings
5 years ago
Ozzieisaacs 8646f8f23a Merge branch 'Develop'
# Conflicts:
#	cps/__init__.py
5 years ago
OzzieIsaacs 2c5d76908a Added missing upload format 5 years ago
Ozzieisaacs 832b34fc54 Improved errorhandling for resending password
Improved errorhandling for editing user
5 years ago
Ozzieisaacs 000b85ff81 Fixes for deleting books(error handling and user feedback) 5 years ago
Ozzieisaacs bb317d54f2 Fix reject reset password without configured email server 5 years ago
Ozzieisaacs d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 5 years ago
Marcel 6dff5ed679
NL language update 5 years ago
OzzieIsaacs fb8b6310d5 Fix from tests 5 years ago
Ozzieisaacs 02aaf17ac5 Fix #1339 (Proxyfix import with old werkzeug versions causes traceback) 5 years ago
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
5 years ago
Ozzieisaacs e3246fd751 Merge remote-tracking branch 'key' 5 years ago
Ozzieisaacs fb18ab1ca5 Fix #866 (Recent book sidebar element can't be removed anymore) 5 years ago
Ozzieisaacs 01ff55c84e Removed non working filters for search 5 years ago
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
5 years ago
Ozzieisaacs 9a7d9da654 Merge remote-tracking branch 'js_caliblur/xss' 5 years ago
Ozzieisaacs e9446556a1 Merge remote-tracking branch 'ru/master' 5 years ago
jvoisin 806a5f209f Fix two minor xss 5 years ago
ZIzA c864b368b0
Russian language update 5 years ago
Ozzieisaacs 27eb09fb19 Add unrar Support 5 years ago
Ozzieisaacs bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 5 years ago
Ozzieisaacs 0297823bda Merge remote-tracking branch 'codecosmetic/move_var' 5 years ago
Ozzieisaacs d1bce5c2d9 Update nl translation from development branch 5 years ago
Ozzieisaacs 46c0ae3ccc Revert accidently deleted nl translation strings 5 years ago
Ozzieisaacs ce6b689147 Code cosmetics 5 years ago
Ozzieisaacs 2d92818613 Code cosmetics 5 years ago
jvoisin 487878819e Move a few variables around
This should prevent a couple of crashes
due to undeclared variables.
5 years ago
Ozzieisaacs 6682b1ced1 Fix download of book covers with enabled pillow from url 5 years ago
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)
5 years ago
Ozzieisaacs d9dde36c74 Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title 5 years ago
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
5 years ago
Ozzieisaacs 9f0c0b34af Merge remote-tracking branch 'order_category/master' 5 years ago
Ozzieisaacs 87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 5 years ago
Ozzieisaacs 898e6b4f80 Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods) 5 years ago
Ozzieisaacs dea2600913 Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy 5 years ago
Ozzieisaacs dc46ad16ae Bugfix view shelfs on book detail page 5 years ago
Ozzieisaacs 456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
5 years ago
Ozzieisaacs 7b789b3701 Fix opds with shelves
Fix errorhandler ldap without ldap
5 years ago
Ozzieisaacs 0480d493cf Fix opds login with ldap, if ldap server is down 5 years ago
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
5 years ago
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
5 years ago
Ozzieisaacs d657330584 Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326 5 years ago
Ozzieisaacs 36cb79de62 Merge remote-tracking branch 'turkish/master' 5 years ago
Ozzieisaacs 063ee5e855 Merge remote-tracking branch 'remove_usage_local_var_undeclared'
Code cosmetics
5 years ago
Ozzieisaacs 7393b69757 Fix for #1326 (typo) 5 years ago
Ozzieisaacs 8bd1903d98 Fix for #1326 (opds feed user login not working -> download was not possible) 5 years ago
jvoisin d8bf540db2 Remove an undeclared and useless local variable 5 years ago
Ozzieisaacs e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
5 years ago
iz 1770f3fd0d Update turkish translation headers 5 years ago
iz 4239f2ed71 Add turkish translation 5 years ago
iz 3939ec28ba Add turkish language names 5 years ago
Michael Shavit 742ec2b38d Fix issue with the delete_book changes introduced in
41a3623
5 years ago
Michael Shavit 9296d35517 Fix bug with shelf deletions for Kobo.
We were incorrectly setting the user_id field in the ShelfArchive table
5 years ago
Michael Shavit 06c15a792e Minor fixes to the Kobo shelves implementation (mostly typos) 5 years ago
Ozzieisaacs 95ca1e6a9d Fix for #1319 5 years ago
Ozzieisaacs 1df82110d1 Update Italian language translation 5 years ago
Ozzieisaacs 24c743d23d Code cosmetics 5 years ago
ElQuimm f1b1ebe29e
Updated italian version of messages.po 5 years ago
Jeff 6384cdc74d
Fix https github oauth
while using https domian and nginx as proxy, a `ProxyFix` is required.
5 years ago
celogeek d093fbb069
Keep previous search value and focus 5 years ago
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
5 years ago
celogeek ca2bcc647d
Handle read config
Allow advance search
Remove duplicate status on show
5 years ago
pthiben b90048d72e fix badge color on grid view to match list view 5 years ago
pthiben a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
5 years ago
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
5 years ago
pthiben ea7058e896 Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 5 years ago
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
5 years ago
pthiben 58943bb156 update filtering so that it also uses isotope everywhere.
Fix asc/desc that did not match list view
5 years ago
pthiben 2d66da3cb9 restrict button for grid<->list switch to series lists 5 years ago
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
5 years ago
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 5 years ago
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
pthiben 20cc5107da Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 5 years ago
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
5 years ago
pthiben 028c53287d update filtering so that it also uses isotope everywhere.
Fix asc/desc that did not match list view
5 years ago
pthiben 24a9bea137 restrict button for grid<->list switch to series lists 5 years ago
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
5 years ago
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 5 years ago
Ozzieisaacs 902685a197 Fix text in user config section (random books in Detail View) 5 years ago
Ozzieisaacs c04b146486 Fix #1309 (fix duplicate shelf names in book detail view) 5 years ago
Ozzieisaacs 7bb5afa585 Merge remote-tracking branch 'kobo/shelves' into Develop 5 years ago
Ozzieisaacs 06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 5 years ago
Ozzieisaacs 195845ab0c Fix 5 years ago
Ozzieisaacs 81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 5 years ago
Ozzieisaacs 53be752787 Merge remote-tracking branch 'it/patch-10' 5 years ago
Ozzieisaacs 42ac06c114 Merge remote-tracking branch 'nl/Develop' into Develop 5 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
5 years ago
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
5 years ago
aribes f926e58891 Changing ordering logic when showing books from a category 5 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 5 years ago
ElQuimm 05d78f5cb5
Update italian version of message.po
Have a nice day!
5 years ago
pthiben 4ef7615d88 Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
# Conflicts:
#	cps/ub.py
5 years ago
pthiben 77c2783a3e fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
Ozzieisaacs ce4f1258b5 Fix #1293 (error 500 on search without query) 5 years ago
Ozzieisaacs 3fbaba6693 Fix #1307 5 years ago
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
5 years ago
pthiben 5b1dfc123f fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
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.
5 years ago
Marcel 296ac203d4
Update messages.po 5 years ago
xcffl 0c9436ca82 Regenerate translation files 5 years ago
xcffl 70c9dd1b95 Fix opds format errors & extend info 5 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 5 years ago
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
5 years ago
Ozzieisaacs 587174b771 Fix #1272 5 years ago
Ozzieisaacs 3e1c34efe6 Merge remote-tracking branch 'fix/fix_covers' into Develop 5 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 5 years ago
Ozzieisaacs ec6b346ca1 Update Translation 5 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 5 years ago
Ozzieisaacs b89309ab82 Merge remote-tracking branch 'po/master' 5 years ago
Ozzieisaacs 4550333f1e Added redirect after create shelf 5 years ago
Ozzieisaacs 3ba610eb64 Revert accidentally committed changes in opds feed 5 years ago
Ozzieisaacs 2436c6a118 Merge remote-tracking branch 'caliblur/master' 5 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 5 years ago
Ozzieisaacs 0c27ff11b9 Update Updater 5 years ago
BeckyDTP 734e2ffbb2 Updated Polish translations 5 years ago
hexeth da42c51af2 Updated to exclude new modules 5 years ago
Michael Shavit 7cb6801241 Fix issue with cover images. 5 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 4eacb21259 Update updater
Update change logfile
code cosmetics js files
5 years ago
Ozzie Isaacs 6d1a3ccdcc Improve logger for windows 5 years ago
Josh O'Brien c870f6e87d English Language V2 5 years ago
Ozzieisaacs 6643f0d1e0 Merge remote-tracking branch 'nl/master'
# Conflicts:
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
5 years ago
Ozzieisaacs 092423adc7 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
Ozzieisaacs a50ca1a85f Fix #1259 5 years ago
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 5 years ago
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
5 years ago
Michael Shavit de0e27c512 Fix #1164 merge. 5 years ago
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
5 years ago
Ozzieisaacs d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop
# Conflicts:
#	cps/kobo.py
5 years ago