453 Commits

Author	SHA1	Message	Date
Ozzieisaacs	486c0f2937	Fix for #1382 (Restrictions with "&" in it can't be deleted)	2020-05-11 18:41:16 +02:00
Ozzieisaacs	16a3deec2c	Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py	2020-05-10 19:24:55 +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
jvoisin	30c9aa3df9	Minor fixes to caliBlur.js ... - Add alt attributes to images - Fix a broken tag	2020-05-09 17:07:22 +02:00
jvoisin	688184e255	Bump jquery	2020-05-09 17:00:03 +02:00
jvoisin	264b4b669e	Bump underscorejs version from 1.9.1 to 1.12.2	2020-05-09 16:54:21 +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	fcefd8031a	Fix #985 (png and webp are extracted as cover files from comic files)	2020-05-02 11:24:30 +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	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
jvoisin	806a5f209f	Fix two minor xss	2020-04-29 11:33:33 +02:00
Ozzieisaacs	2d92818613	Code cosmetics	2020-04-27 20:01:13 +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	063ee5e855	Merge remote-tracking branch 'remove_usage_local_var_undeclared' ... Code cosmetics	2020-04-24 21:05:56 +02:00
jvoisin	d8bf540db2	Remove an undeclared and useless local variable	2020-04-24 18:04:27 +02:00
pthiben	58943bb156	update filtering so that it also uses isotope everywhere. ... Fix asc/desc that did not match list view	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	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	a194216568	Merge remote-tracking branch 'origin/master'	2020-04-05 19:10:27 +02:00
Ozzieisaacs	8bee424cc0	Merge remote-tracking branch 'ldap/master' ... # Conflicts: # cps/admin.py # cps/templates/admin.html # cps/templates/config_edit.html # cps/web.py	2020-04-05 17:31:41 +02:00
Ozzieisaacs	587174b771	Fix #1272	2020-04-04 08:53:22 +02:00
Ozzieisaacs	5864637f1c	Merge branch 'master' into Develop	2020-04-04 06:22:17 +02:00
hexeth	da42c51af2	Updated to exclude new modules	2020-03-31 08:42:08 -07:00
Ozzieisaacs	f6c04b9b84	Merge branch 'master' into Develop	2020-03-29 16:48:56 +02:00
Ozzieisaacs	4eacb21259	Update updater ... Update change logfile code cosmetics js files	2020-03-29 16:44:24 +02:00
Ozzieisaacs	f243515261	Fix #950 (sorting order in comics)	2020-03-14 07:15:15 +01:00
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	2020-03-12 20:43:39 +01:00
Wanoo	a0535aa3db	Add ComicVine Api ... Fetching Metadata for comicBook with ComicVine API	2020-02-28 16:04:07 +01:00
Ozzieisaacs	146068c936	Merge branch 'Develop' ... # Conflicts: # cps/db.py # cps/templates/user_edit.html	2020-02-23 13:15:30 +01:00
Ozzieisaacs	3b8c5ef21a	Merge remote-tracking branch 'get_metadata/patch-1' ... Fix #1210 Load multiple authors correct via get metadata	2020-02-23 13:14:12 +01:00
Ozzieisaacs	7c89f0b5b9	Merge with branch develop ... Release version	2020-02-23 09:08:01 +01:00
OzzieIsaacs	371097eb4d	Update Updater	2020-02-23 07:54:58 +01:00
Johnny A. dos Santos	29cb8bfec4	Fix #1210	2020-02-21 18:25:02 -03:00
Michael Shavit	7d99e21d0d	Merge remote-tracking branch 'original/Develop' into kobo_book_delete	2020-02-17 14:49:42 -05:00
Ozzieisaacs	814ad87a42	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:47 +01:00
Ozzieisaacs	3e4b5e23fa	Updated pdf viewer to 2.2.228 (#1184)	2020-02-09 17:02:28 +01:00
Ozzieisaacs	50ba2e329a	Merge branch 'master' into Develop ... # Conflicts: # cps/shelf.py	2020-02-09 07:00:04 +01:00
Ozzieisaacs	b33a2ac90d	Fix #1170 Auth-digest Header no longer crashs calibre-web ... Fix #1161 Shelfs are reordering again Update Sortable.js to 2.10.1 Code cosmetics	2020-02-02 07:47:27 +01:00
Michael Shavit	c0239a659c	Add UI support for archived books. ... Archived books will no longer appear in any book lists or searches, and may only be restored from the Archive view.	2020-01-26 00:27:54 -05:00
Ozzieisaacs	3a4d351a57	Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop	2020-01-15 17:57:00 +01:00
Ozzieisaacs	973f555544	Merge branch 'master' into Develop ... (updated tinymce and bootstrap datepicker)	2020-01-13 18:39:25 +01:00
Ozzieisaacs	1d7e52c198	Merge with develop: ... - No. of unread books correct calculated - logviewer handles stream output correct - Id for testablility in email server setup	2020-01-13 18:37:29 +01:00
Simon Latapie	56964a890b	caliBlur theme: fix custom column display that contain colons	2020-01-12 14:26:07 +01:00
Ozzieisaacs	68ca0b86da	Updated tiniymce + locale ... updated datepicker + locale Included cs, fi language, updated ru language	2020-01-12 14:11:53 +01:00
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	2020-01-12 13:42:39 +01:00
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	2020-01-07 20:26:59 +01:00
Ozzieisaacs	d9adb4fc94	Improvements for limit tags	2020-01-01 17:30:08 +01:00
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	2020-01-01 17:29:01 +01:00
Ozzieisaacs	1da4efec86	Merge branch 'master' into Develop	2019-12-31 10:52:45 +01:00