Merge branch 'main' into switch-edition

This commit is contained in:
Mouse Reeve
2020-12-16 09:21:02 -08:00
15 changed files with 878 additions and 209 deletions

View File

@ -67,7 +67,7 @@ def register(request):
if not form.is_valid():
errors = True
username = form.data['username']
username = form.data['username'].strip()
email = form.data['email']
password = form.data['password']
@ -216,6 +216,7 @@ def edit_profile(request):
return redirect('/user/%s' % request.user.localname)
@require_POST
def resolve_book(request):
''' figure out the local path to a book from a remote_id '''
remote_id = request.POST.get('remote_id')