mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-12-08 17:28:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into database_fix

Browse Source 
# Conflicts:
#	cps/editbooks.py
This commit is contained in:
Ozzieisaacs
2020-09-07 18:21:33 +02:00
parent f49688fdb9 4b7a37cf7d
commit ae15544aed
34 changed files with 4674 additions and 4538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cps/templates/email_edit.html
View File

@@ -37,7 +37,7 @@
</div>
<label for="mail_size">{{_('Attachment Size Limit')}}</label>
<div class="form-group input-group">
<input type="number" min="1" max="600" step="1" class="form-control" name="mail_size" id="mail_size" value="{% if content.mail_size != None %}{{ (content.mail_size / 1024 / 1024)|int }}{% endif %}">
<input type="number" min="1" max="600" step="1" class="form-control" name="mail_size" id="mail_size" value="{% if content.mail_size != None %}{{ (content.mail_size / 1024 / 1024)|int }}{% endif %}" required>
<span class="input-group-btn">
<button type="button" id="attachement_size" class="btn btn-default" disabled>MB</button>
</span>