Ozzieisaacs
|
0dd0605a1f
|
Book list for merging
|
5 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
|
5 years ago |
|
h1f0x
|
e325c3dbf6
|
fixed div selection in caliBlur.js
|
5 years ago |
|
h1f0x
|
b3fef625a8
|
Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
|
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 |
|
Ozzieisaacs
|
16a3deec2c
|
Merge branch 'master' into Develop
# Conflicts:
# cps/helper.py
|
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 |
|
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 |
|
jvoisin
|
264b4b669e
|
Bump underscorejs version from 1.9.1 to 1.12.2
|
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 |
|
Ozzieisaacs
|
fcefd8031a
|
Fix #985 (png and webp are extracted as cover files from comic files)
|
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
|
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 |
|
jvoisin
|
806a5f209f
|
Fix two minor xss
|
5 years ago |
|
Ozzieisaacs
|
2d92818613
|
Code cosmetics
|
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
|
063ee5e855
|
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
Code cosmetics
|
5 years ago |
|
jvoisin
|
d8bf540db2
|
Remove an undeclared and useless local variable
|
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
|
1e3a948977
|
fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
|
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
|
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
|
5864637f1c
|
Merge branch 'master' into Develop
|
5 years ago |
|
hexeth
|
da42c51af2
|
Updated to exclude new modules
|
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 |
|
Ozzieisaacs
|
f243515261
|
Fix #950 (sorting order in comics)
|
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 |
|
Wanoo
|
a0535aa3db
|
Add ComicVine Api
Fetching Metadata for comicBook with ComicVine API
|
5 years ago |
|
Ozzieisaacs
|
146068c936
|
Merge branch 'Develop'
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
|
5 years ago |
|
Ozzieisaacs
|
3b8c5ef21a
|
Merge remote-tracking branch 'get_metadata/patch-1'
Fix #1210 Load multiple authors correct via get metadata
|
5 years ago |
|
Ozzieisaacs
|
7c89f0b5b9
|
Merge with branch develop
Release version
|
5 years ago |
|
OzzieIsaacs
|
371097eb4d
|
Update Updater
|
5 years ago |
|
Johnny A. dos Santos
|
29cb8bfec4
|
Fix #1210
|
5 years ago |
|
Michael Shavit
|
7d99e21d0d
|
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
|
5 years ago |
|
Ozzieisaacs
|
814ad87a42
|
Updated pdf viewer to 2.2.228 (#1184)
|
5 years ago |
|
Ozzieisaacs
|
3e4b5e23fa
|
Updated pdf viewer to 2.2.228 (#1184)
|
5 years ago |
|
Ozzieisaacs
|
50ba2e329a
|
Merge branch 'master' into Develop
# Conflicts:
# cps/shelf.py
|
5 years ago |
|
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
|
5 years ago |
|
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.
|
5 years ago |
|
Ozzieisaacs
|
3a4d351a57
|
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
|
5 years ago |
|
Ozzieisaacs
|
973f555544
|
Merge branch 'master' into Develop
(updated tinymce and bootstrap datepicker)
|
5 years ago |
|
Ozzieisaacs
|
1d7e52c198
|
Merge with develop:
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
|
5 years ago |
|
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 |