Commit Graph

899 Commits (7344ef353c51c9aaa7bc77352484ee233d55f0e3)

Author SHA1 Message Date
Ozzie Isaacs 3c63f5b204 Merge branch 'master' into development 3 years ago
Ozzie Isaacs 970dbb0c59 Merge branch 'master' into development
# Conflicts:
#	cps/opds.py
#	cps/templates/admin.html
3 years ago
Ozzie Isaacs d21d3c2ceb Merge remote-tracking branch 'div_a/use-btn-anchors' into master 3 years ago
Ozzie Isaacs f26beec1d3 Updated pdf reader 3 years ago
Ozzie Isaacs c4225e29ed Updated pdf reader 3 years ago
Gavin Mogan 657cba042a Use btn classes on anchors not div so the entire button is clickable 3 years ago
Ozzie Isaacs 670eab62bf Update opds feed with letters for all titles, authors, categories and series 3 years ago
Ozzie Isaacs 837fc4988d Letterize authors 3 years ago
Ozzie Isaacs 4664b47851 Fixed alphabetical order in list and grid view
Completed download section
3 years ago
Ozzie Isaacs 9864d932e0 Changed user.nickname to user.name
Added function to view downloads of all users for admins
3 years ago
Ozzie Isaacs 33bdc07f55 Fix for #1845 (ods not working in Moonreader an Librera)
Fix opds search with wrong parameter no longer causes error 500
3 years ago
Ozzie Isaacs 130a4ed2d3 Fix opds and error logging in mail 3 years ago
Ozzie Isaacs 10731696df Merge branch 'development' into cover_thumb
# Conflicts:
#	cps/admin.py
3 years ago
Ozzie Isaacs d3f8153b90 Merge branch 'master' into development 3 years ago
Ozzie Isaacs dd30ac4fbd Added thumbnails
Merge remote-tracking branch 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
3 years ago
Ozzie Isaacs b070ba142f Selects are working in user management with generic confirm dialog 3 years ago
Ozzie Isaacs bd7c6828bf Selects are working in user management 3 years ago
cbartondock d0671ec58c Merge branch 'master' of https://github.com/janeczku/calibre-web 3 years ago
Ozzie Isaacs da2c3e9ed7 Edit user mass change checkbox working 3 years ago
Ozzie Isaacs f62d6abb69 Merge branch 'master' into development
# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html
3 years ago
Ozzie Isaacs 994bc8b0e4 Removed dropdown button on single file listen/read (Fix #1840) 3 years ago
Ozzie Isaacs 2451605033 Merge remote-tracking branch 'djvu/read-djvu' into master 3 years ago
cbartondock 9711bd8fe1 added actions boxes to drop downs 3 years ago
cbartondock 870b2642a9 advanced shelf search is almost working 3 years ago
Ozzie Isaacs 81c30d5fd5 Add missing files from bootstrap editable
Added user-table single-select header for locale and default-language
3 years ago
Ozzie Isaacs e64a504bb1 Working Locale and default language selection in user table edit 3 years ago
Ozzie Isaacs a3a11bdf3f Changed checkbox states are saved on server 3 years ago
Ozzie Isaacs 0992bafe30 Bulk User management 3 years ago
Ozzie Isaacs 251a77c8b4 Merge branch 'master' into Development
Improved packaging support
3 years ago
alfred82santa 69b7d94774 Fixes and remove shelf kobo sync flag when kobo sync disabled 3 years ago
alfred82santa a3f17deb17 Added options in order to synchronize only selected shelf on Kobo device 3 years ago
Ozzie Isaacs e6fb460071 New restart routine for executable files
Fix log in updater
New source option updater available
3 years ago
Ozzie Isaacs 33a0a4c173 Changed function for getting path in js file 3 years ago
Ozzie Isaacs eeb7974e05 User table:
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
3 years ago
Ozzie Isaacs 62447d6b89 Basic User edit in tables 3 years ago
Ozzie Isaacs 88078d65e9 Fix #1482 (do not shorten title in book detail page) 3 years ago
Ozzie Isaacs 4a11dd1e16 Fix mistyping "option" 3 years ago
Ozzie Isaacs 0f83f9992c Added swipe support for epub reader (fixes #925)
Cleaned reader js include files
3 years ago
Ozzie Isaacs d2ad78eb40 Added swipe support for comic reader and txt reader (#925)
Bugfix for txt file not present on serving file
3 years ago
jvoisin 54a78d5565 Remove duplicate id from the search form 4 years ago
Ozzieisaacs b100d198e8 Merge branch 'master' into Develop
Remove relate to referrer for tag/custom column allow / deny dialog
4 years ago
Ozzieisaacs 7849f2fb4b Remove relate to referrer for tag/custom column allow / deny dialog 4 years ago
Ozzieisaacs b35ecddde3 Added Id on Filechooser dialog for testability 4 years ago
Ozzieisaacs bde7921016 Fix modal path id for calibre db filepicker
Fix SyncToken last-Book-id missing
4 years ago
Ozzieisaacs d33b0587cb Advanced search tags are now multiselects (#1240) 4 years ago
Ozzieisaacs 7e0ed537b7 irst steps Advanced search with mulitselects 4 years ago
Ozzieisaacs 1e351eb01d Search for read status 4 years ago
Ozzieisaacs 1a83bddf8c Merge bubble read status 4 years ago
Ozzieisaacs 2a63c35743 Activate serverside filepicker with parameter in unconfigured state 4 years ago
Ozzieisaacs 27dcbcd7e1 paged and orderable shelfs
Fix for non writable settings db with non configured calibre-web
4 years ago
OzzieIsaacs abf0f4d699 Updated Testresult
Fixed delete book call
4 years ago
Ozzieisaacs 2bea447de5 Fix show archived books 4 years ago
Ozzieisaacs f6538b6110 New delete user button
refactored confirm dialogs
4 years ago
Ozzieisaacs 2d3ae71a3d Fixed button for email config (Fix #1766) 4 years ago
Ozzieisaacs 62da469fd1 Shelfs are now paginated (sorting buttons are disabled)
Changed gevent dependencys
4 years ago
Ozzieisaacs d64009e23e preparation for filtered and ordered shelfs 4 years ago
Ozzieisaacs fd8b642d64 Code cosmetics css
Code cosmetics js
Fixes for links with remote_login
4 years ago
OzzieIsaacs d5ed5cd665 Fixes from tests 4 years ago
Ozzieisaacs 1905e0ee6f refactoring to prevent web.py being the middle of the universe 4 years ago
Ozzieisaacs 9130aceb5a Changed admin page 4 years ago
Ozzieisaacs b8336c03c3 Changed admin page 4 years ago
Ozzieisaacs d3986ca14a Server side file browser 4 years ago
Ozzieisaacs 2508c1abb2 Started implement server side filechooser 4 years ago
Ozzieisaacs 68513b775b Wording 4 years ago
Ozzieisaacs a79dcc93f6 Fixed description for LDAP filter 4 years ago
Ozzieisaacs 56505457eb Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master
# Conflicts:
#	cps/admin.py
4 years ago
Ozzieisaacs 8eb4b6288a Added id's for testablility 4 years ago
Ozzieisaacs 3372070a58 Fix change title regex
Merge branch 'Develop' into master
4 years ago
Ozzieisaacs f99e2ebd13 Changed wording for tooltips 4 years ago
Ozzieisaacs 4feb26eefb Added series order option (#1715)
Added authors order option (#1301)
Added tooltips for ordering options
Fixed ratings, formats, languages order option
4 years ago
Ozzieisaacs cb1ebc1cd0 Drag 'n drop for files 4 years ago
Ozzieisaacs f620d4a9ca Fix LDAP errors 4 years ago
Ozzieisaacs 560ade00b4 Fix browser caching problem on change cover 4 years ago
Ozzieisaacs 81ea24ad54 Merge branch 'master' into df 4 years ago
Ozzieisaacs eed2f0a430 Merge remote-tracking branch 'comic/master' into master 4 years ago
Ozzieisaacs 9bd51c650b Add config options for client certificate authentication 4 years ago
Ozzieisaacs 32b7b39223 Added function to download debug information 4 years ago
verglor 2343c79126 Use djvu_html5 to read djvu format in browser 4 years ago
verglor 50441bae62 Fix missing audio icon for other audio formats than mp3 4 years ago
Ozzieisaacs 87d60308f2 Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master 4 years ago
Ozzieisaacs 400f6e02a5 Fix #1668 (upload of books with language set to different than UI language and not showing all books)
Fix for only showing external port if kobo is really activated in admin menu
4 years ago
celogeek 4d81d3613c
display the check when books are read 4 years ago
celogeek 097ac879ea
render read 4 years ago
cbartondock 1be07a42df Flex display to fix columns issue 4 years ago
Ghighi Eftimie cedfa90d76 fix for #981 4 years ago
Ghighi Eftimie f1e6f6e505 fixes for #1560 4 years ago
Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master
# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
4 years ago
Ozzieisaacs e1d5c2c578 Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master 4 years ago
Ozzieisaacs 49f49632ad Renamed CalibLur.css 4 years ago
Ghighi Eftimie 6dadc6fb1e same fix but hopefully better 4 years ago
Ozzieisaacs 6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
4 years ago
Ozzieisaacs eb37e3a52b Fix UI Deelete Buttons in Edit Books page
Fix Conversion of multiple formats of one book in the queue with gdrive
4 years ago
OzzieIsaacs 376001100a Bugfixes from last testrun 4 years ago
Ozzieisaacs 6dfa171b4e Added id's for testing
moved downloaded books section
4 years ago
Ozzieisaacs 497fbdcdfc Save view settings 4 years ago
Ozzieisaacs 7c8f6ce62f Merge branch 'master' into Develop
# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py
4 years ago
Ozzieisaacs da909ff084 Fixes from test of upload restrictions 4 years ago
Ozzieisaacs eff8480d5c Show listen in browser formats in lowercase 4 years ago
Ozzieisaacs 7ba014ba49 Fix "is not a valid language" on upload of comic books
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
4 years ago
OzzieIsaacs 7929711fea Improvements for file uploading format restriction 4 years ago
Ozzieisaacs ae15544aed Merge branch 'master' into database_fix
# Conflicts:
#	cps/editbooks.py
4 years ago
Ozzieisaacs 4b7a37cf7d Bugfix empty email attachment size 4 years ago
Ozzieisaacs d3bde0408f Improvederror handling for editing identifier 4 years ago
Ozzieisaacs 34d3225984 Errorhandling edit identifier 4 years ago
blitzmann c120138f26 Fixes for pagination ugliness for caliBlur! style 4 years ago
OzzieIsaacs cdaad2fb4a Merge branch 'master' into Develop 4 years ago
OzzieIsaacs 843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 4 years ago
OzzieIsaacs a3ae97a5a3 Fix #1574 (author name not shown in change book order in shelfs) 4 years ago
OzzieIsaacs ed8275a20b Fix #1574 (author name not shown in change book order in shelfs) 4 years ago
OzzieIsaacs f2add3f788 Migration of view settings working in User database
Book Merge gives now feedback on what is done
4 years ago
OzzieIsaacs ad144922fb Merge with master 4 years ago
OzzieIsaacs 0cc07362b8 Fix for #1573 4 years ago
Ozzie Isaacs 94ad93ebd7 Added series like custom columns #1501 4 years ago
Ozzie Isaacs 1a1d105fae Fix #1538 (Floating point numbers showing 2 decimals on details page 4 years ago
Clément Poissonnier 1ca4583896 feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported 4 years ago
Ozzie Isaacs 66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 4 years ago
Jef LeCompte 711a697570
Merge remote-tracking branch 'upstream/master' into jef/download-kobo 4 years ago
Ozzieisaacs f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..)
Started making search paged
4 years ago
Ozzieisaacs f80c67828b Fix #1500 (Custom ratings of increment 0.5 are allowed) 4 years ago
Ozzieisaacs d1889a5e06 Fix #1502 (program info only visible in about section if user is admin) 4 years ago
Jef LeCompte e048388213
feat(api): include external port option
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
4 years ago
Michael Knepher 7e0d9fbace series_index filter to show x.0 as x 4 years ago
Ozzieisaacs ccca5d4d1c Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
4 years ago
Ozzieisaacs 852f252d13 Prevent invalid variable
Make text in kobo_auth_screen consistent
4 years ago
Michael Knepher 67dd4a72b0 Add series info to all book "meta" displays 4 years ago
Ozzieisaacs a0b8cc21cc Fix #1503 (js error on login screen) 4 years ago
Ozzieisaacs 2f833dc457 Fix login with remember me token 4 years ago
Ozzieisaacs 22344a3971 Improvements for delete book 4 years ago
Ozzieisaacs 8dde6ba60f UI improvements table buttons 4 years ago
Ozzieisaacs d44f283a05 View status in books table is stored 4 years ago
Ozzieisaacs c18d5786dd Improved validation check 4 years ago
Ozzieisaacs f26ccfe16c Table edit: validator routine to prevent empty fields working 4 years ago
Ozzieisaacs 1c681ee378 Improvements for books table editor 4 years ago
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
4 years ago
Ozzieisaacs 6bfbf3ee41 Update layout 4 years ago
Ozzieisaacs 7b4306b1d6 UI improvements (same colors of buttons, etc.)
Changed Editable default value
4 years ago
Ozzieisaacs 4516cc0d65 Listen button only visible if user has read permissions
Audioformat fix
Table edit functions only available if user has edit rights
4 years ago
Ozzieisaacs 308784c601 Hide listen button if user has no read/listen permissions 4 years ago
Ozzieisaacs 4038cb5b85 Internal paged Search prepared
Search for table list is working
4 years ago
Ozzieisaacs 0dd0605a1f Book list for merging 4 years ago
Ozzieisaacs 827b0c6e50 Changed pubdate to timestamp 4 years ago
Ozzieisaacs 13ae28edab Fix #1449 (Shelf download menu wasn't working for books with more than one format) 4 years ago
Ozzieisaacs 82253219e8 Fix #1449 (Shelf download menu wasn't working for books with more than one format) 4 years ago
Ozzieisaacs 94592b74a6 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs eef2112e1e #1430 (changed color of rating stars) 4 years ago
Ozzieisaacs 89223760e6 Merge branch 'master' into Develop 4 years ago
Michael Knepher 54cf3652b0 Add series name and index to book cover info 4 years ago
Ozzieisaacs fec86c2862 Update Grid/list view of series 4 years ago
Ozzieisaacs b852fb0e26 Merge branch 'Develop' 4 years ago
Ozzieisaacs 0fc18bf3b1 Fix for #1398 (prevent empty series_index field) 4 years ago
Ozzieisaacs ec3a3a73ef Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 087c4c5929 Merge remote-tracking branch 'opds/master' 4 years ago
Ozzieisaacs e0ee2e0801 Merge remote-tracking branch 'typo/master' 4 years ago
Michael Knepher c79a9e9858 Fix typo "Shelfs" to "Shelves" 4 years ago
OzzieIsaacs b7535b9526 Merging master branch
- fix title sort function
- fix focus on search
4 years ago
Ozzieisaacs cc856c7cd1 Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress' 4 years ago
celogeek 051ffdda35
activate search focus if search in progress 4 years ago
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.
4 years ago
Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
4 years ago
Ozzieisaacs 742799b4ac Added missing float custom column to search form 4 years ago
Ozzieisaacs 273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
4 years ago
Ozzieisaacs 0cc2b49296 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/book_edit.html
4 years ago
Ozzieisaacs 44d5adc16f Fix #1390 4 years ago
Ozzieisaacs f749fc641b Temporary fix for #1390 4 years ago
Ozzieisaacs 87c76c09e2 temporary fix for #1390 4 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 4 years ago
Ozzieisaacs ec7d5b17ab Added table view for books 4 years ago
Ozzieisaacs f7269d8df2 Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu) 4 years ago
Ozzieisaacs ce0fab8d2f Fix duplicate shelf names in "search" 4 years ago
Ozzieisaacs 308fd55483 #1141 (Setting for file size limit on email) 4 years ago
Ozzieisaacs 0a02caad04 Improvements 4 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
4 years ago
Ozzieisaacs 48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
4 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)
4 years ago
Ozzieisaacs 0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
4 years ago
Ozzieisaacs 0138ff9e16 Added additional config options 4 years ago
Ozzieisaacs 9bc085a23e Fixes for comic reader 4 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
4 years ago
Ozzieisaacs d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 4 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
4 years ago
Ozzieisaacs 01ff55c84e Removed non working filters for search 4 years ago
Ozzieisaacs bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 4 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
4 years ago
Ozzieisaacs 87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 4 years ago
Ozzieisaacs dc46ad16ae Bugfix view shelfs on book detail page 4 years ago
Ozzieisaacs 456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
4 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
4 years ago
Ozzieisaacs e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
4 years ago
Ozzieisaacs 24c743d23d Code cosmetics 4 years ago
celogeek d093fbb069
Keep previous search value and focus 4 years ago
pthiben a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
4 years ago
pthiben ea7058e896 Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 4 years ago
pthiben 2d66da3cb9 restrict button for grid<->list switch to series lists 4 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
4 years ago
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
Ozzieisaacs 902685a197 Fix text in user config section (random books in Detail View) 4 years ago
Ozzieisaacs c04b146486 Fix #1309 (fix duplicate shelf names in book detail view) 4 years ago
Ozzieisaacs 7bb5afa585 Merge remote-tracking branch 'kobo/shelves' into Develop 4 years ago
Ozzieisaacs 195845ab0c Fix 4 years ago
Ozzieisaacs 81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 4 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
4 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
4 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 4 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
4 years ago
xcffl 70c9dd1b95 Fix opds format errors & extend info 4 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 4 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
4 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 4 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 4 years ago
Ozzieisaacs 4550333f1e Added redirect after create shelf 4 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 4 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 4 years ago
Josh O'Brien c870f6e87d English Language V2 4 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
4 years ago
Ozzieisaacs 8cbc345f36 Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop 4 years ago
Ozzieisaacs 89927fd7e9 Merge ComicVine API 4 years ago
Ozzieisaacs 18794831e0 Chang link to issue template 4 years ago
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
4 years ago
Ozzieisaacs fb83bfb363 Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge) 4 years ago
Ozzie Isaacs df7d3d18b6 pdf reader 4 years ago
Wanoo a0535aa3db Add ComicVine Api
Fetching Metadata for comicBook with ComicVine API
4 years ago
Ozzieisaacs 917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
4 years ago
Ozzieisaacs fc4436f091 Update Translation 4 years ago
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
4 years ago
Ozzieisaacs 6893635251 Handle kobo auth request
Handle access from localhost for kobo
4 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 4 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 4 years ago
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 4 years ago
Ozzieisaacs e3ddc16657 Fix opds login not working anymore (due to kobo sync protocol) 4 years ago
Ozzieisaacs 317e59df4b Bugfixes from tests 4 years ago
Ozzieisaacs a9a6f5b97e Renamed restrict -> deny 4 years ago
Ozzieisaacs 8b1444ebc2 Improved testability
Less content exposed with restricted content
Tornado restart and stop working with systemd
4 years ago
Kyos 509071949a Moved style to css file 4 years ago
Ozzieisaacs 726595e117 Update for testability 4 years ago
Kyos 1666e32aaf Fixes cover layouts in user edit page 4 years ago
Kyos 6a69bbe4b5 Fixes cover layouts in user edit page 4 years ago
Ozzieisaacs 814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 4 years ago
Ozzieisaacs 3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 4 years ago
Ozzieisaacs ab24ed8088 Handle sorting of hidden books #1123
Prevent downloading of covers from hidden books
4 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop
# Conflicts:
#	cps/shelf.py
4 years ago
Ozzieisaacs 6698773d81 Improved testability 4 years ago
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
4 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 4 years ago
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.
4 years ago
Michael Shavit 9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
4 years ago
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
4 years ago
Ozzieisaacs ad71d0a03f Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop 4 years ago
Ozzieisaacs 0955c6d6fb Update Kobo 4 years ago