Skip to content

Commit

Permalink
Merge branch 'hotfix/0.11.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kruptein committed Nov 9, 2018
2 parents 7fe17bc + 359014c commit b2c3d64
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file.

## Unreleased

## 0.11.2

Another hotfix for 0.10.0.

### Fixed
- Made a woopsie while fixing the earlier user creation error.

## 0.11.1

This version contains hotfixes for the 0.10.0 release
Expand Down
2 changes: 1 addition & 1 deletion PlanarAlly/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.0
0.11.2
4 changes: 2 additions & 2 deletions PlanarAlly/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ async def login(request):
password = data["password"]
form = {"username": username, "password": password}
if "register" in data:
if User.by_name(name=username):
if User.by_name(username):
form["error"] = "Username already taken"
elif not username:
form["error"] = "Please provide a username"
elif not password:
form["error"] = "Please provide a password"
else:
with db.atomic():
u = User(username)
u = User(user=username)
u.set_password(password)
u.save()
valid = True
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Some key features are:

This tool is provided free to use and is open source.

![Example view of a player with a light source](https://planarally.readthedocs.io/en/dev/_images/player-base.png)
_Credits to Gogots for the background map used [source](https://gogots.deviantart.com/art/City-of-Moarkaliff-702295905)_

# Documentation
User documentation can be found [here](https://planarally.readthedocs.io/en/latest/).
User documentation can be found [here](https://planarally.readthedocs.io/en/dev/).
This is still a work in progress, so some elements may still be undocumented.

Installation instructions for DM's can also be found in the link above. As a player you won't have to install anything.

![Example view of a player with a light source](https://planarally.readthedocs.io/en/dev/_images/player-base.png)
_Credits to Gogots for the background map used [source](https://gogots.deviantart.com/art/City-of-Moarkaliff-702295905)_

0 comments on commit b2c3d64

Please sign in to comment.