544 Commits

Author	SHA1	Message	Date
OzzieIsaacs	b7535b9526	Merging master branch ... - fix title sort function - fix focus on search	2020-05-21 22:31:29 +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
celogeek	051ffdda35	activate search focus if search in progress	2020-05-21 16:42:02 +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	273572f44c	Merge branch 'master' into Develop ... # Conflicts: # cps/ub.py	2020-05-13 20:03:54 +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	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	308fd55483	#1141 (Setting for file size limit on email)	2020-05-09 20:29:17 +02:00
Ozzieisaacs	0a02caad04	Improvements	2020-05-09 11:01:00 +02:00
Ozzieisaacs	a437c603c6	Merge remote-tracking branch 'kepubify/Develop' into Develop ... # Conflicts: # cps/admin.py # cps/helper.py # cps/templates/config_edit.html # cps/web.py	2020-05-08 14:53:21 +02:00
Ozzieisaacs	48f4b12c0e	Merge branch 'master' into Develop ... # Conflicts: # cps/editbooks.py	2020-05-06 18:47:33 +02:00
Ozzieisaacs	e1439b529b	Config Options for limiting email size, change username to e-mail adress, use kepubify ... Added work on Unrar5 decompression (breaks comic reader totally)	2020-05-04 18:19:30 +02:00
Ozzieisaacs	0adcd1b3d9	UI Improvements ... Added additional restrictions to Calibre DB interface	2020-05-03 10:55:33 +02:00
Ozzieisaacs	0138ff9e16	Added additional config options	2020-05-02 10:18:01 +02:00
Ozzieisaacs	9bc085a23e	Fixes for comic reader	2020-05-02 09:35:14 +02:00
Ozzieisaacs	0a92d79ec0	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop ... # Conflicts: # cps/static/css/style.css # cps/ub.py # cps/web.py	2020-05-01 17:25:13 +02:00
Ozzieisaacs	d6f41d8dc0	Fix error 404 on reset password (Fix #1342)	2020-05-01 08:33:50 +02:00
Ozzieisaacs	b160a8de0b	Merge branch 'master' into Develop ... # Conflicts: # cps/__init__.py # cps/comic.py # cps/editbooks.py # cps/helper.py # cps/kobo.py # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/uploader.py # cps/web.py	2020-04-30 18:08:28 +02:00
Ozzieisaacs	01ff55c84e	Removed non working filters for search	2020-04-29 17:57:53 +02:00
Ozzieisaacs	bea7223a0a	Renabled cbrimage extraction (via unrar and rarfile)	2020-04-28 16:50:08 +02:00
Ozzieisaacs	44284ea5fb	Merge remote-tracking branch 'opds/master' ... # Conflicts: # cps/translations/cs/LC_MESSAGES/messages.po # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fi/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/hu/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.po # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # messages.pot	2020-04-26 18:55:23 +02:00
Ozzieisaacs	87ec44aed5	Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'	2020-04-26 18:38:09 +02:00
Ozzieisaacs	dc46ad16ae	Bugfix view shelfs on book detail page	2020-04-26 11:35:47 +02:00
Ozzieisaacs	456550a943	Bugfix view shelfs on detiled page ... bugfix datetime in archive mode	2020-04-26 11:34:10 +02:00
Ozzieisaacs	b4d7733e0a	Merge branch 'master' into Develop ... # Conflicts: # cps/templates/list.html # cps/translations/cs/LC_MESSAGES/messages.po # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fi/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/hu/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.po # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # messages.pot	2020-04-25 20:06:25 +02:00
Ozzieisaacs	e29f17ac46	Merge remote-tracking branch 'kobo/shelves' into Develop ... # Conflicts: # cps/kobo.py # cps/shelf.py	2020-04-24 16:56:08 +02:00
Ozzieisaacs	24c743d23d	Code cosmetics	2020-04-19 19:08:58 +02:00
celogeek	d093fbb069	Keep previous search value and focus	2020-04-19 13:12:02 +02:00
pthiben	a5fe08e84c	Fix button color that now matches HEAD on master ... Update name for HTML Series that changed with HEAD	2020-04-18 23:32:15 -04:00
pthiben	ea7058e896	Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa	2020-04-18 23:23:56 -04:00
pthiben	2d66da3cb9	restrict button for grid<->list switch to series lists	2020-04-18 23:23:56 -04:00
pthiben	b7efbf9040	resynced grid view with list view ... Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval	2020-04-18 23:23:56 -04:00
pthiben	1e3a948977	fix linter errors ... Fix the sorting Save the sorting state Remove unnecessary filter Add support for grid view	2020-04-18 23:22:51 -04:00
Ozzieisaacs	902685a197	Fix text in user config section (random books in Detail View)	2020-04-18 21:30:28 +02:00
Ozzieisaacs	c04b146486	Fix #1309 (fix duplicate shelf names in book detail view)	2020-04-18 21:15:02 +02:00
Ozzieisaacs	7bb5afa585	Merge remote-tracking branch 'kobo/shelves' into Develop	2020-04-18 21:12:21 +02:00
Ozzieisaacs	195845ab0c	Fix	2020-04-17 18:17:35 +02:00
Ozzieisaacs	81a329f1e7	Fix for #1087 ( Caliblur! Theme button alignment)	2020-04-17 18:16:28 +02:00
Ozzieisaacs	9e159ed5ab	Merge branch 'master' into Develop ... # Conflicts: # cps/config_sql.py # cps/ub.py # cps/web.py	2020-04-16 20:12:27 +02:00
Ozzieisaacs	2c42972230	Fix for #1307 (Oauth login not working) ... - Changed blueprint reference in Backend from name to id, users can now again be found - Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3) - Redirect to login page in case no user is linked to current oauth account - Flash messages upon successfull login, successsfull linked account	2020-04-16 17:58:42 +02:00
Ozzieisaacs	a784c6bd52	Fixes for oauth login after programming basic tests	2020-04-15 22:03:21 +02:00
Ozzieisaacs	4749eccfa5	Added fix for python2 regex ... Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting Added default empty string on LDAPCertificate Fix ldap as scheme for tls connection Enabled add user on LDAP Authentication LDAP config port is now number input Added header for user import config Added python ldap version to about section Fix: It's no longer possible to login via fallback password as long as LDAP server is available Fix: TypeError on bind is now catched and transformed to error message Update Readme Fixes for ldap	2020-04-14 10:58:32 +02:00
xcffl	70c9dd1b95	Fix opds format errors & extend info	2020-04-11 00:06:50 +08:00