Ozzie Isaacs
91b9370a21
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/libs/bootstrap-table.min.css
# cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
# cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
4 years ago
Ozzie Isaacs
1c42c4c969
Update bootstrap-table
...
Fixes for book edit
4 years ago
cbartondock
42a23ea23c
removed some dumb graphical inconsistencies
4 years ago
cbartondock
f637ba4dad
Fixed border display in book details
4 years ago
Ozzie Isaacs
f26beec1d3
Updated pdf reader
4 years ago
Ozzie Isaacs
c4225e29ed
Updated pdf reader
4 years ago
Ozzie Isaacs
4909ed5ccd
Merge remote-tracking branch 'cliblur/master' into development
...
# Conflicts:
# cps/static/css/style.css
4 years ago
Northguy
bfe36d3f4a
change in color definition
...
Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
color: hsla(0, 0%, 100%, .45)
}
4 years ago
Northguy
d42bf44fad
Added same color for series name and series number
4 years ago
Ozzie Isaacs
42707a19bd
Code cosmetics
4 years ago
Ozzie Isaacs
0888706790
Code cosmetics
4 years ago
Ozzie Isaacs
2fbb7466d3
Code cosmetics
4 years ago
Ozzie Isaacs
f29f94f45f
Code cosmetics
4 years ago
Ozzie Isaacs
cd973868fc
Code cosmetics
4 years ago
Ozzie Isaacs
3c35f02cac
Code cosmetics
4 years ago
Ozzie Isaacs
22c93e2389
Merge branch 'master' into development
4 years ago
Ozzie Isaacs
8c751eb532
Some code cosmetics
4 years ago
Ozzie Isaacs
f52fa41439
Fix restart server
...
Some code cosmetics
4 years ago
Ozzie Isaacs
f77d72fd86
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/style.css
4 years ago
Ozzie Isaacs
9b80c84794
Some code cosmetics
4 years ago
Ozzie Isaacs
725fc658f8
Some code cosmetics
4 years ago
Ozzie Isaacs
b9c0c8d2dc
Update bootstrap table to 1.18.2
4 years ago
Ozzie Isaacs
eeb7974e05
User table:
...
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
4 years ago
mmonkey
bc8bdfe385
Merge remote-tracking branch 'upstream/master' into master
4 years ago
Ozzieisaacs
7e0ed537b7
irst steps Advanced search with mulitselects
4 years ago
Ozzieisaacs
1a83bddf8c
Merge bubble read status
4 years ago
Ozzieisaacs
9a20faf640
Revert accidentally deleted lines in caliblur! theme
4 years ago
mmonkey
2d498dd138
Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.
4 years ago
Ozzieisaacs
d64009e23e
preparation for filtered and ordered shelfs
4 years ago
Ozzieisaacs
fd8b642d64
Code cosmetics css
...
Code cosmetics js
Fixes for links with remote_login
4 years ago
Ozzieisaacs
9130aceb5a
Changed admin page
4 years ago
Ozzieisaacs
b8336c03c3
Changed admin page
4 years ago
Ozzieisaacs
eed2f0a430
Merge remote-tracking branch 'comic/master' into master
4 years ago
Ozzieisaacs
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
4 years ago
celogeek
754b9832e9
fix height container
4 years ago
celogeek
097ac879ea
render read
4 years ago
cbartondock
da9dfd166d
fixed incorrect cover widths
4 years ago
cbartondock
1be07a42df
Flex display to fix columns issue
4 years ago
Ghighi Eftimie
cedfa90d76
fix for #981
4 years ago
Ghighi Eftimie
f1e6f6e505
fixes for #1560
4 years ago
Ozzieisaacs
52489a484a
Merge remote-tracking branch 'Knepherbird/master' into master
...
# Conflicts:
# cps/jinjia.py
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/web.py
4 years ago
Ozzieisaacs
e1d5c2c578
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
4 years ago
Ozzieisaacs
49f49632ad
Renamed CalibLur.css
4 years ago
Ghighi Eftimie
6dadc6fb1e
same fix but hopefully better
4 years ago
Ghighi Eftimie
c33c6bbff0
fix for #1594
4 years ago
Ozzieisaacs
861f1b2ca3
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
4 years ago
Ryan Long
a6002a2c6c
1622_updated_css
4 years ago
Ozzieisaacs
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
OzzieIsaacs
28733179d2
Merge remote-tracking branch 'caliblur/editMetaFix' into Develop
4 years ago
blitzmann
3e378bd665
Some more clean up
4 years ago