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 |
|
Ozzieisaacs
|
742799b4ac
|
Added missing float custom column to search form
|
5 years ago |
|
Ozzieisaacs
|
5405dc5141
|
Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash)
|
5 years ago |
|
Ozzieisaacs
|
013793f989
|
Fix for #1391 (Kobo sync not working if series is given, but no series_index)
|
5 years ago |
|
Ozzieisaacs
|
2468cf63cc
|
Fix for #1397 (changed supported audio files)
Changed max gevent version
Fix for #1397 (changed supported audio files)
|
5 years ago |
|
Ozzieisaacs
|
8e9b5d7e50
|
Merge remote-tracking branch 'caliblur/master'
|
5 years ago |
|
Ozzieisaacs
|
a33515d907
|
Merge remote-tracking branch 'refactor/refactor_uploader'
|
5 years ago |
|
Ozzieisaacs
|
a276a33081
|
Merge remote-tracking branch 'nl/master'
|
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
|
13994a5f96
|
Merge branch 'master' into Develop
|
5 years ago |
|
Ozzieisaacs
|
e8ac62cdd8
|
Moved password replace to prevent incomplete session
|
5 years ago |
|
Ozzieisaacs
|
1bc7134ec2
|
Fix error 500 on reset password in debug mode
|
5 years ago |
|
Ozzieisaacs
|
273572f44c
|
Merge branch 'master' into Develop
# Conflicts:
# cps/ub.py
|
5 years ago |
|
Ozzieisaacs
|
ac37483d47
|
Fix for #1391 (kobo sync errors out if read/unread books had been present in app.db during initial database migration)
|
5 years ago |
|
Ozzieisaacs
|
0cc2b49296
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/book_edit.html
|
5 years ago |
|
Ozzieisaacs
|
44d5adc16f
|
Fix #1390
|
5 years ago |
|
Ozzieisaacs
|
f749fc641b
|
Temporary fix for #1390
|
5 years ago |
|
Ozzieisaacs
|
87c76c09e2
|
temporary fix for #1390
|
5 years ago |
|
Ozzieisaacs
|
e787f9dd9f
|
Automatic username (#1172)
|
5 years ago |
|
Ozzieisaacs
|
ec7d5b17ab
|
Added table view for books
|
5 years ago |
|
Ozzieisaacs
|
47641eee59
|
Merge branch 'master' into Develop
|
5 years ago |
|
Ozzieisaacs
|
42abe28cc1
|
Fix for #1389 (import ldap users with whitespaces)
|
5 years ago |
|
Ozzieisaacs
|
b48afa38ac
|
Fix #1386 (Add asin to recognized identifiers)
|
5 years ago |
|
Ozzieisaacs
|
f7269d8df2
|
Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)
|
5 years ago |
|
Ozzieisaacs
|
ce0fab8d2f
|
Fix duplicate shelf names in "search"
|
5 years ago |
|
Ozzieisaacs
|
33472567de
|
Improved Debug output on send email
|
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 |
|
jvoisin
|
e69c4cd1dc
|
Refactor a bit cps/uploader.py
|
5 years ago |
|
Marcel
|
e0d3ccd8d1
|
Update messages.po
|
5 years ago |
|
Ozzieisaacs
|
16a3deec2c
|
Merge branch 'master' into Develop
# Conflicts:
# cps/helper.py
|
5 years ago |
|
OzzieIsaacs
|
92db00692a
|
Merge all headers to download response
Updated test results
|
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 |
|
OzzieIsaacs
|
a9085752c1
|
Fix error "email" not in to_save
|
5 years ago |
|
OzzieIsaacs
|
e1fbc9255c
|
Merge remote-tracking branch 'sec_fixes/bump_underscore'
|
5 years ago |
|
OzzieIsaacs
|
f33e25ac40
|
Merge remote-tracking branch 'sec_fixes/cookies_improvement'
|
5 years ago |
|
OzzieIsaacs
|
51365ab006
|
Merge remote-tracking branch 'sec_fixes/strong_session_protection'
|
5 years ago |
|
OzzieIsaacs
|
d61b7e48d7
|
Merge remote-tracking branch 'sec_fixes/random_password'
|
5 years ago |
|
OzzieIsaacs
|
f590b24f85
|
Merge remote-tracking branch 'sec_fixes/https'
|
5 years ago |
|
Ozzieisaacs
|
308fd55483
|
#1141 (Setting for file size limit on email)
|
5 years ago |
|
Ozzieisaacs
|
fefb44e612
|
#1356 (fixes for readonly metadata.db)
Fix remove trailing metadata.db at entering calibre_db_path
|
5 years ago |
|
jvoisin
|
dd3b562f1a
|
Change some links from http to https
|
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 |
|
Ozzieisaacs
|
75fb7c2e95
|
Allowing upload extensions (#1119)
|
5 years ago |
|
jvoisin
|
264b4b669e
|
Bump underscorejs version from 1.9.1 to 1.12.2
|
5 years ago |
|
Ozzieisaacs
|
51f12c51ad
|
Fix #1361 (covers of archived books not shown)
|
5 years ago |
|
Ozzieisaacs
|
03d134697c
|
Fix #1361 (covers of archived books not shown)
|
5 years ago |