simoon
/
parallel-library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,826 Commits
2 Branches
9 Tags
62 MiB
Develop
master
0.6.0
0.6.2
0.6.3
0.6.4
0.6.5
0.6.6
0.6.7
0.6.8
0.6.9
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a784c6bd52'
${ noResults }
Commit Graph

1546 Commits (a784c6bd5292a261277ed69ca36f8d7a0105d8cb)

Author SHA1 Message Date
Simon Latapie 56964a890b caliBlur theme: fix custom column display that contain colons 5 years ago
Ozzieisaacs 68ca0b86da Updated tiniymce + locale 
updated datepicker + locale
Included cs, fi language, updated ru language
 5 years ago
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
 5 years ago
Ozzieisaacs 2798dd5916 Merge remote-tracking branch 'fix/kobo' into Develop 
# Conflicts:
#	cps/db.py
#	cps/web.py
 5 years ago
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
 5 years ago
Ozzieisaacs 42435ab34a Improved testablility 5 years ago
Lukáš Heroudek 434fb2e7cb
Add files via upload 5 years ago
Lukáš Heroudek bce70bf17c
Update messages.po 5 years ago
Lukáš Heroudek cde44178c4
Create messages.po 5 years ago
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
 5 years ago
Ozzieisaacs c659f28334 Fix #1128 5 years ago
Ozzieisaacs cabad83418 moved language selection back, default value for restriction columns 
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
 5 years ago
Ozzieisaacs 24ae7350f5 Fix # #1127 (user template show random books in detail view not saved) 5 years ago
Ozzieisaacs c60277f4d3 Capitalize language selection in User settings 
Remove sql statement from log.debug statement upon creation of new column in settings database
 5 years ago
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)
 5 years ago
Ozzieisaacs c78c63e1d5 Merge remote-tracking branch 'fix_reconnect' 
# Conflicts:
#	cps/web.py
 5 years ago
Ozzieisaacs 56ee8c56ba Fix #1122 
(Uploading books with applied language restriction leads no longer to error 500)
 5 years ago
Ozzieisaacs 48495f0d66 Merge branch 'master' into Develop 
# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py
 5 years ago
Ozzieisaacs 8ad84a7ceb Fix for #1123 (mature content is visible in shelfs) 5 years ago
Ozzieisaacs 32e818af6a Fix #1124 5 years ago
Ozzieisaacs d9adb4fc94 Improvements for limit tags 5 years ago
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
 5 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 1c630eb604 fixes from tests 5 years ago
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 5 years ago
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 5 years ago
ground7 b782489a8c ldap opds download bugged 5 years ago
Ozzieisaacs 01381488f4 Fixes from tests 5 years ago
ground7 6555d5869f attempt regular login if ldap login fails as fallback 5 years ago
ground7 54c4f40188 added LDAP import 
update defaults
 5 years ago
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
 5 years ago
Michael Shavit 9ec3ddd492 Fix the HandleCoverImage endpoint so that it requires login, and doesn't 
take unused parameters.
 5 years ago
Michael Shavit d81dbb13e4 Support Epub downloads 5 years ago
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. 5 years ago
Michael Shavit cdcb8a50d1 Fix /reconnect endpoint, which was broken by 006e596c72 5 years ago
Michael Shavit 520c695401 Fix /reconnect endpoint, which was broken by 006e596c72 5 years ago
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.
 5 years ago
Ozzieisaacs bbe91f439a Merge from master 5 years ago
Ozzieisaacs b586a32843 Fix #1115 (comic reader not working under iOS, maybe invalid issue) 
Improvement for #925 (Next/Prev buttons are bigger)
 5 years ago
Ozzieisaacs 288944db2c Merge remote-tracking branch 'kobo_sync/kobo' into Develop 
# Conflicts:
#	cps.py
#	cps/kobo.py
#	cps/kobo_auth.py
#	cps/ub.py
 5 years ago
Ozzieisaacs f2c07d8f81 Update Kobo sync 5 years ago
Michael Shavit d6a9746824 Add a filter to the Sync request endpoint to ignore books that don't 
have any formats supported by the device.
 5 years ago
Michael Shavit f84274f1c5 git add missing generate_kobo_auth_url.html 5 years ago
Michael Shavit 2118d920f5 Formatter. 5 years ago
Michael Shavit 207004beff Remove config_server_url setting. 5 years ago
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.
 5 years ago
Ozzieisaacs f705889c23 Inital Kobo 5 years ago
Ozzieisaacs 7098d08888 Added option to convert AZW3 to mobi for sending to kindle 5 years ago
Ozzieisaacs eabc6e23be Test Email now send to user's email address (#834) 
Added forgot/reset password routine (#1098, #1063)
 5 years ago
Ozzieisaacs b6d7207ec3 Added platform information for better debugging 5 years ago
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
 5 years ago
Ozzieisaacs 2215bf3d7f Implemented #1083 (Advanced search for extensions) 5 years ago
Ozzieisaacs 86fe970651 More fixes for googledrive 5 years ago
Andrew Roberts 3dc372c573 fixed typo 5 years ago
Andrew Roberts efcee0a7b7 added reverse proxy configuration form and handler 5 years ago
Andrew Roberts 39b6b100f9 whitespace 5 years ago
Andrew Roberts 9351ff032f whitespace 5 years ago
Andrew Roberts f0760c07d8 added admin display of reverse proxy settings 5 years ago
Andrew Roberts 77b0954c70 use a macro for the display of boolean settings 5 years ago
Andrew Roberts af7dbbf1e4 added logic for reverse proxy login 5 years ago
Andrew Roberts b661c2fa92 added config fields to settings table 5 years ago
Ozzieisaacs e308a74dc2 Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads 5 years ago
Michael Shavit 040d7d9ae3 Remove unused import and fix python3 compatibility, as per Ozielsaacs comments. 5 years ago
Michael Shavit f9b1e84704 Remove backblaze leftovers 5 years ago
Ozzieisaacs eede894e72 Merge remote-tracking branch 'merge-metadata' 5 years ago
Michael Shavit 55c0bb6d34 Set the "Size" attribute for Kobo download_urls, and refactor the code 
to eventually allow formats other than KEPUB.
 5 years ago
Michael Shavit 2b55b9b250 Use the login_user Cookie to authorize download requests instead of 
passing the UserKey over url params.
 5 years ago
Ozzieisaacs 22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097' 
Updated translations
 5 years ago
Ozzieisaacs 8a9695d48e Fix getting metadata from douban (#858) 5 years ago
Ozzieisaacs e0faad1e59 Handle no write permission to tmp folder (#1060) 5 years ago
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.
 5 years ago
Michael Shavit 0926ae530c Remove custom_column usages from an earlier commit. 5 years ago
Michael Shavit 0b709f7dfb Merge branch 'master' into kobo 5 years ago
Michael Shavit b5da2c4199 Clean-up: Fix import order in kobo.py, and other minor formatting 
changes.
 5 years ago
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).
 5 years ago
Christian Keil c61463447f Merge metadata of uploaded book versions. 5 years ago
Michael Shavit 55b54de6a0 Add simple get_download_url implementation to replace the backblaze-backed implementation 5 years ago
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.
 5 years ago
zhiyue 222797e631
support douban book search using apikey 5 years ago
dalin 92841b46d7 update Simplified Chinese translations. 5 years ago
dalin 4c2323fcc9 fix typo in config_edit.html 5 years ago
Ozzieisaacs fda0ab1e86 FIx for (#1092 listening to mp3 not working) 5 years ago
Ozzieisaacs 54079b36ae Fix #1095 (epub viewer not working if only viewer rule wa sapplied) 5 years ago
Ozzieisaacs f8a99c60d8 Fix for #1096 (exception on digest request) 5 years ago
Ozzieisaacs 8af178c19c Fix for gdrive not working #1081 5 years ago
Ozzieisaacs 78f9ee86b1 Fix pdf cover 
Fix massadding books
Add feature inform of duplicate books
 5 years ago
Ozzieisaacs ab5873984e Merge remote-tracking branch 'translation/patch-3' 5 years ago
Ozzieisaacs 62ea8b8913 Logging to stdout, proposal form #1078 5 years ago
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop' 5 years ago
Jony 1f5edffccf
Fix typo and update translation 5 years ago
Ozzieisaacs 651260022c Merge remote-tracking branch 'search_title/hotfix-searchform-title' 5 years ago
Ozzieisaacs 2e4344f7ea Merge remote-tracking branch 'swedish/master' 5 years ago
Jony 3cb7e77b60
Update messages.po 5 years ago
Ghighi Eftimie f782dc1857 fix for search title 5 years ago
Ozzieisaacs 88f31ddad1 Fix for #1034 5 years ago
Ozzieisaacs a7ab7fcf06 Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page 5 years ago
Ozzieisaacs 6f61e80c97 Fix #1074, #1071 5 years ago
Ozzieisaacs d1afdb4aac Fix #1074, #1071 5 years ago
Ozzieisaacs 5167ee520e Solve cropped image pdf import (#1068) 5 years ago
Ozzieisaacs f758a1cc64 Solve inverted image pdf import (#1068) 5 years ago
Ozzieisaacs 2145be6db2 Improvement for #1062 5 years ago
Ozzieisaacs c740fe9124 Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order' 5 years ago
Ozzieisaacs a371e40c66 Merge remote-tracking branch 'github_3/hotfix/epub-import' 
Improved cover extraction from epub files
 5 years ago
Ozzieisaacs ccc6184342 Merge remote-tracking branch 'github_1/patch-1' 5 years ago
Ozzieisaacs c8c2d6659c Merge remote-tracking branch 'public_reconnect/master' 5 years ago
Jan Guzej c7d7a7597c remove language from array metadata 5 years ago
Jan Guzej fbb7663a2f epub metadata import fix 5 years ago
Kyos c93dd32179 Fixed typo and column size for LG screens 5 years ago
Kyos 7165826011 Adds Authors, Series and Book Cover to the shelf order view 5 years ago
Kyos ada727a570 Adds Authors, Series and Book Cover to the shelf order view 5 years ago
gwenhael 01b0f9534c
fix issue #1064 
Allow for finer steps in serie-index
 5 years ago
zelazna 3764c33a3a Add the posibility to change the username 5 years ago
Ozzieisaacs 9fc02f67c2 Debug output for lcase 5 years ago
Ozzieisaacs 0c40e40dc3 Fix logfile loading behind reverse proxy (#1047) 5 years ago
Ozzieisaacs e31df16309 Revert bug in updater.py preventing new files from being created 5 years ago
Ozzieisaacs d7ea5bb9d7 Fix for #1037 
Update German translation
 5 years ago
Ozzieisaacs 6cda5fee0d Fix language selection on python3 5 years ago
Ozzieisaacs ca5e285c5a Merge branch 'Develop' 5 years ago
Ozzieisaacs fb0eebfc52 Merge remote-tracking branch 'spanish/master' 5 years ago
Ozzieisaacs dd90fb003e Merge remote-tracking branch 'french/master' 5 years ago
Ozzieisaacs 61cd044255 Merge remote-tracking branch 'polish/master' 5 years ago
Ozzieisaacs 879d02081a Fix #1021 5 years ago
Ozzieisaacs 051bc53aa2 Fix for #1009 5 years ago
Angel Docampo 5515772903 updated spanish translations 5 years ago
Angel Docampo ff900fd9c0 updated spanish translations 5 years ago
Yamakuni eec4be7a29
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni 1385ecb383
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni 74418f3139
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni 72def4b97b
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni 564c3b4778
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni c9eff4a70c
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni 879f63d1c1
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni 3fb458dd19
Update cps/translations/fr/LC_MESSAGES/messages.po 
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
 5 years ago
Yamakuni d9a73b4fa3 French translation 
Add and modify some little things
 5 years ago
Ozzieisaacs 23b3bfd967 Additional fix #1016 5 years ago
Ozzieisaacs f543d7f486 Fix #1016 5 years ago
Radosław Kierznowski 6a058d2c52 Update polish translation 5 years ago
Ozzieisaacs ff41775dbb Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop 5 years ago
Ozzieisaacs d04a78afe6 Merge remote-tracking branch 'public_shelf/Develop' into Develop 5 years ago
Ozzieisaacs f566237be0 Merge remote-tracking branch 'bootstrap/Develop' into Develop 5 years ago
Dmitriy Istomin a65ad9483c update Bootstrap v3.4.0 -> 3.4.1 5 years ago
W1ndst0rm 4cbdccd39e Fix for https://github.com/janeczku/calibre-web/issues/1002 5 years ago
Ozzieisaacs 9356148e2d Added more information about dependencies 5 years ago
Ozzieisaacs 4be55285d8 Fix #1001 5 years ago
Ozzieisaacs 3eae2e9c2c Changed text for not found imports 5 years ago
Ozzieisaacs e9fb5d9f25 Bugfix for comicapi 5 years ago
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
 5 years ago
Ozzieisaacs 82ca3f31f9 Merge remote-tracking branch 'pwr/master' 5 years ago
Ozzieisaacs 97f3aa8325 Update dutch language 5 years ago
Daniel Pavel 7c503b4a31 provide a default logging configuration (fixes #987) 5 years ago
Daniel Pavel 9f8cab99e3 Moved language names from iso639.pickle to a python file 5 years ago
Ozzieisaacs 5f25b81004 Final fix for #983 5 years ago
Ozzieisaacs 73bbffccaa Fix for login issue on MacOS 5 years ago
Ozzieisaacs f59d9d5aa8 Merge remote-tracking branch 'polish/master' 5 years ago
Radosław Kierznowski 746b7b1262 Update polish translation 5 years ago
Ozzieisaacs 5f228fbb40 Update german translation 5 years ago
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1' 
Merge remote-tracking branch 'german/master'
 5 years ago
Mainak 7f43a2e104
Update messages.po 
update and revision of the Spanish translation file.
 5 years ago
Ozzieisaacs 00f17bb697 Mature contents no longer displayed in/allowed to (#975): 
- typeahead tags
- advanced search tags buttons
- read
- download
 5 years ago
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)
 5 years ago
Ozzieisaacs fc4dc36c65 Fix #969 (duplicate code "init" in epub reader) 
Fix for #890
 5 years ago
Ozzieisaacs 97a0dccdec Fix for display of format, series, category, ratings, 
Fix for display of language (sorting not working yet)
 5 years ago
Ozzieisaacs 9f64a96502 Fix for #890 5 years ago
Ozzieisaacs b9c3a3fcea Fix #652 5 years ago
Ozzieisaacs 6d43e0422a Fix for non found flask_login version (#968) 5 years ago
Ozzieisaacs 0d7e58ce79 Fix for #968 (database conversion fails for default strings under python2.7) 5 years ago
Ozzieisaacs 3e008ef29b Fix update dates shown in local time format again 
Fix "to update" history is shown again
 5 years ago
Ozzieisaacs 5c6be5d6d0 Fix for python 3 and existing unrar entry in db 
deleted unnecessary lines in config html template
 5 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider 
deleted duplicate download counting function
 5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 5 years ago
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
 5 years ago
Ozzieisaacs d168e3bfdb Add licence to oauth 
fix comicapi dependency
 5 years ago
Daniel Pavel 99c6247baf use the standard socket library to validate the ip address argument 5 years ago
Daniel Pavel a334ef28e7 about page: build the versions dictionary only once 5 years ago
Daniel Pavel 63634961d4 cleaner worker api 
the worker thread now stops on its own
 5 years ago
Ozzieisaacs d82289e303 Deactivate ldap 
Fix setup for pypi
 5 years ago
Daniel Pavel a836df9a5a more robust disposing of database session 
avoid spamming the log with debug messages from libraries
 5 years ago
Ozzieisaacs 8bfcdffeb6 Fix feature support 5 years ago
Ozzieisaacs e411c0fded Fix logging in debug mode 5 years ago
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
 5 years ago
Ozzieisaacs 792367e35e Version update 5 years ago
Ozzieisaacs be64961de5 Code cosmetics comic reader 5 years ago
Ozzieisaacs 405a3909b0 Fix for opds with LDAP authentication 5 years ago
Ozzieisaacs b1cb7123a3 Fix for #959 5 years ago
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 5 years ago
Daniel Pavel 006e596c72 Moved config class into separate file. 
Moved Goodreads and LDAP services into separate package.
 5 years ago
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
 5 years ago
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)
 5 years ago
Ozzieisaacs ad44e58c7a Sorting for comics 
Audiobook support
 5 years ago
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2 5 years ago
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)
 5 years ago
Ozzieisaacs cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 5 years ago
Ozzieisaacs 5c7aeb2f2c Change GDrive 5 years ago
Daniel Pavel e254565901 support binding the http server to a unix socket file instead of TCP socket 5 years ago
Heimen Stoffels d9f69ca264
Updated Dutch translation 5 years ago
Ozzieisaacs cd546eb6d4 Update comic reader js 5 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 5 years ago
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
 5 years ago
Ozzieisaacs d45b1b8ea5 Fix #937 
logviewerintegrated
Code cosmetics
 5 years ago
Ozzieisaacs e67d707867 Fix for #588 
Merge remote-tracking branch 'linuxserver/master'
 5 years ago