pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-23 15:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: pch_xyz:36d2ae733c3aaa37995ffe8dac4fcb8598b4adda
Branches Tags
pch_xyz:master
pch_xyz:main
pch_xyz:dev
pch_xyz:0.3.3
pch_xyz:0.3.2
pch_xyz:0.3.1
pch_xyz:0.3.0
pch_xyz:0.2.6
pch_xyz:0.2.5
pch_xyz:0.2.4
pch_xyz:0.2.3
pch_xyz:0.2.2
pch_xyz:0.2.1
pch_xyz:0.2.0
pch_xyz:0.1.0
...
compare: pch_xyz:aef97dc6900ae9f3d826cf131acfec3dbafbbfe9
Branches Tags
pch_xyz:main
pch_xyz:dev
pch_xyz:master
pch_xyz:0.3.3
pch_xyz:0.3.2
pch_xyz:0.3.1
pch_xyz:0.3.0
pch_xyz:0.2.6
pch_xyz:0.2.5
pch_xyz:0.2.4
pch_xyz:0.2.3
pch_xyz:0.2.2
pch_xyz:0.2.1
pch_xyz:0.2.0
pch_xyz:0.1.0

2 commits
36d2ae733c ... aef97dc690

Author SHA1 Message Date
Izalia Mae aef97dc690 Merge branch 'dev' into 'master' 
Draft: 0.3.0

See merge request pleroma/relay!57
 2024-03-05 19:09:36 +00:00
Izalia Mae 0e812c012e fix POST /api/token and prevent scroll bar from always showing 2024-03-05 14:05:54 -05:00
2 changed files with 1 additions and 2 deletions
Show stats Expand all files Collapse all files

1
relay/frontend/style.css
View file

@ -89,7 +89,6 @@ textarea {
#container { #container {
width: 1024px; width: 1024px;
margin: 0px auto; margin: 0px auto;
height: 100vh;
} }
#header { #header {

2
relay/views/api.py
View file

@ -75,7 +75,7 @@ class Login(View):
if isinstance(data, Response): if isinstance(data, Response):
return data return data
with self.database.connction(True) as conn: with self.database.session(True) as conn:
if not (user := conn.get_user(data['username'])): if not (user := conn.get_user(data['username'])):
return Response.new_error(401, 'User not found', 'json') return Response.new_error(401, 'User not found', 'json')