861f1b2ca3
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
4 years ago
a6002a2c6c
1622_updated_css
4 years ago
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
98494c610a
Merge branch 'master' into Develop
4 years ago
28733179d2
Merge remote-tracking branch 'caliblur/editMetaFix' into Develop
4 years ago
3e378bd665
Some more clean up
4 years ago
c120138f26
Fixes for pagination ugliness for caliBlur! style
4 years ago
31b20362ec
caliBlur! style: Fixes issue with edit metadata button not getting styled correctly
4 years ago
4c38b0ab10
Prepare for save name sort order
4 years ago
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
4 years ago
4c6f5096be
get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results.
4 years ago
f8139f3198
Store last selected view for sidebar (not for categories, series, publishers, ..)
...
Started making search paged
5 years ago
2f833dc457
Fix login with remember me token
5 years ago
22344a3971
Improvements for delete book
5 years ago
8dde6ba60f
UI improvements table buttons
5 years ago
d44f283a05
View status in books table is stored
5 years ago
c18d5786dd
Improved validation check
5 years ago
f26ccfe16c
Table edit: validator routine to prevent empty fields working
5 years ago
1c681ee378
Improvements for books table editor
5 years ago
7b4306b1d6
UI improvements (same colors of buttons, etc.)
...
Changed Editable default value
5 years ago
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
5 years ago
0dd0605a1f
Book list for merging
5 years ago
94592b74a6
Merge branch 'master' into Develop
5 years ago
eef2112e1e
#1430 (changed color of rating stars)
5 years ago
b852fb0e26
Merge branch 'Develop'
5 years ago
5cceeb6ef2
Fix: correct property typo
...
Correcting 'box-sizeing' to 'box-sizing'
5 years ago
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
e325c3dbf6
fixed div selection in caliBlur.js
5 years ago
b3fef625a8
Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
5 years ago
e787f9dd9f
Automatic username ( #1172 )
5 years ago
f5e12328dc
Fix for #1382 (Restrictions with "&" in it can't be deleted)
5 years ago
486c0f2937
Fix for #1382 (Restrictions with "&" in it can't be deleted)
5 years ago
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
5 years ago
fe88010a72
Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'
5 years ago
99ae4be2c2
Merge remote-tracking branch 'sec_fixes/bump_jquery'
5 years ago
30c9aa3df9
Minor fixes to caliBlur.js
...
- Add alt attributes to images
- Fix a broken tag
5 years ago
688184e255
Bump jquery
5 years ago
264b4b669e
Bump underscorejs version from 1.9.1 to 1.12.2
5 years ago
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
fcefd8031a
Fix #985 (png and webp are extracted as cover files from comic files)
5 years ago
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
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
806a5f209f
Fix two minor xss
5 years ago
ce6b689147
Code cosmetics
5 years ago
2d92818613
Code cosmetics
5 years ago
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
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
5 years ago
d8bf540db2
Remove an undeclared and useless local variable
5 years ago
b90048d72e
fix badge color on grid view to match list view
5 years ago
38bb10d36b
apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
...
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
5 years ago
Ozzieisaacs