Ozzieisaacs
|
1db1c2e7df
|
Enabling LDAP working again
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
|
6 years ago |
Ozzieisaacs
|
da3fcb9a72
|
Merge branch 'master' into Develop
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
|
6 years ago |
Ozzieisaacs
|
8612dce97c
|
Merge remote-tracking branch 'author/shorten-authors'
|
6 years ago |
Ozzieisaacs
|
0b0e62fdf2
|
Merge remote-tracking branch 'dialog/master'
Fix for #833
|
6 years ago |
Ozzieisaacs
|
6f80a63ca6
|
Fix for #827
|
6 years ago |
Andrew Sullivan
|
3dfc2f2580
|
fixing issue #833
|
6 years ago |
Ozzieisaacs
|
6f0b3bbda0
|
Fix for #812
|
6 years ago |
Ozzieisaacs
|
feb6a71f95
|
Fix uncompressed cbz files
merge from master -> file extension limitation
|
6 years ago |
Ozzieisaacs
|
1561a4abdf
|
Comic improvments
|
6 years ago |
Ozzieisaacs
|
f483ca3214
|
Code cosmetics
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
|
6 years ago |
Ozzieisaacs
|
466af21548
|
Code Cosmetics
|
6 years ago |
Ozzieisaacs
|
0224d45961
|
Code cosmetics
|
6 years ago |
Ozzieisaacs
|
fb23db57b4
|
Added filtering of authors, series, categories, publishers
|
6 years ago |
Ozzieisaacs
|
68a36597ab
|
Fix opds login on python3
|
6 years ago |
Ozzieisaacs
|
361a1243d7
|
Improvements #828
|
6 years ago |
Virgil Grigoras
|
bd7b0175a1
|
Fix remaining shown by codacy
|
6 years ago |
Virgil Grigoras
|
f5cf62f209
|
Fix issues shown by codacy
|
6 years ago |
Virgil Grigoras
|
d3ed0317bb
|
styling and javascript for hiding authors
|
6 years ago |
Ozzieisaacs
|
f6fbe2e135
|
Fix #766
Update pdf upload
Translation of uploadprogress dialog
|
6 years ago |
Ozzieisaacs
|
cc3088c52f
|
Merge branch 'master' into Develop
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
|
6 years ago |
Ozzieisaacs
|
0facb8fffa
|
Fix #766
|
6 years ago |
Ozzieisaacs
|
1a7052b287
|
Update pdf upload
Translation of uploadprogress dialog
|
6 years ago |
Ozzieisaacs
|
17b7333992
|
Merge remote-tracking branch 'caliblur/master'
|
6 years ago |
hexeth
|
9a0e8fefb7
|
re-add loader code
|
6 years ago |
Matt
|
c07cb23ef2
|
Merge branch 'master' of git://github.com/janeczku/calibre-web
|
6 years ago |
hexeth
|
5a863541de
|
Fix object object
|
6 years ago |
Ozzie Isaacs
|
4c80db4324
|
Revert bootstrap update 3.4.0 -> 3.3.7
|
6 years ago |
Ozzieisaacs
|
a0be02e687
|
Ldap working
|
6 years ago |
Ozzieisaacs
|
37007dafee
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
|
6 years ago |
Ozzieisaacs
|
56826f67fc
|
progressbar during upload thanks to jim3ma
|
6 years ago |
lorek123
|
d508b909d1
|
update js and css libs, especially to fix xss in Jquery and Bootstrap
|
6 years ago |
Ozzieisaacs
|
f5235b1d4c
|
Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
|
6 years ago |
Ozzieisaacs
|
5971194678
|
Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
|
6 years ago |
Ozzieisaacs
|
9128615f48
|
Fix #424
Fix #425
|
6 years ago |
Ozzieisaacs
|
ec81a3cd92
|
Fix Authors page pagination
Update infinite scroll plugin
|
6 years ago |
Ozzieisaacs
|
836c6fd245
|
Updated translations
Added license texts in flies
|
6 years ago |
Ozzieisaacs
|
bacb6fb561
|
New updater with default setting -> only stable releases #653
|
6 years ago |
hexeth
|
83a905bfe1
|
Don't remove the dropdown toggle
|
6 years ago |
hexeth
|
c0792b7225
|
Add .sendtokindle-drop to click-off
|
6 years ago |
Matt
|
8825352af6
|
Revert "Add sendtokindle-drop to click-off array"
This reverts commit d83ba315f0 .
|
6 years ago |
hexeth
|
d83ba315f0
|
Add sendtokindle-drop to click-off array
|
6 years ago |
hexeth
|
16e23cb1fe
|
Fix upload tooltip not appearing
|
6 years ago |
hexeth
|
9a12e60b1c
|
Toggle for dropdown
|
6 years ago |
hexeth
|
c620453ebf
|
UL positioning
|
6 years ago |
hexeth
|
4988e3b631
|
add tooltip and move UL higher in DOM
|
6 years ago |
Ozzie Isaacs
|
9e5fa45df7
|
Removed unnecessary wait message
|
6 years ago |
Ozzie Isaacs
|
cc618ecee7
|
Fix Limiting domains (related to #773)
|
6 years ago |
Ozzieisaacs
|
32568c9009
|
Update testing
Update custom columns unicode enums
|
6 years ago |
Ozzieisaacs
|
c527d1f49a
|
Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
|
6 years ago |
hexeth
|
4ace3a5e27
|
test
|
6 years ago |