Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/v0.8.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
indietyp committed Jun 21, 2018
2 parents c0c6da2 + b8f433d commit 74cb29e
Show file tree
Hide file tree
Showing 37 changed files with 3,717 additions and 2,932 deletions.
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
interface/static/** linguist-vendored
*.inc linguist-vendored
hawthorne.inc linguist-vendored=false

core/migrations/** linguist-generated
log/migrations/* linguist-generated

docs/** linguist-documentation
api/reference/** linguist-documentation

include/** linguist-language=SourcePawn
*.inc linguist-language=SourcePawn
6 changes: 3 additions & 3 deletions ajax/views/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.conf import settings

from ajax.views import renderer
from core.models import User, ServerGroup
from core.models import User, Role
from log.models import ServerChat


Expand Down Expand Up @@ -37,8 +37,8 @@ def log(request, page, *args, **kwargs):


@login_required(login_url='/login')
@permission_required('core.view_servergroup')
@permission_required('core.view_role')
@require_http_methods(['POST'])
def group(request, page, *args, **kwargs):
obj = ServerGroup.objects.all().order_by('immunity')
obj = Role.objects.all().order_by('immunity')
return renderer(request, 'partials/admin/group.pug', obj, page)
6 changes: 3 additions & 3 deletions api/management/commands/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ def handle(self, *args, **options):
base['openapi'] = '3.0.0'
base['info'] = {
'description': 'The hawthorne API is the main way to interact with the management server.',
'version': '1.0.0a2',
'version': '0.8.7',
'title': 'hawthorne',
'contact': {'email': '[email protected]'},
}
base['servers'] = [
{'url': 'demo.hawthorne.in/api/v1', 'description': 'Demo production server'},
{'url': 'dev.hawthorne.in/api/v1', 'description': 'Bleeding edge test machine for public use'},
{'url': 'demo.hawthornepanel.org/api/v1', 'description': 'Demo production server'},
{'url': 'dev.hawthornepanel.org/api/v1', 'description': 'Bleeding edge test machine for public use'},
{'url': '{host}:{port}/api/v1', 'description': 'Your own server'}
]
base['components'] = {}
Expand Down
4,414 changes: 2,252 additions & 2,162 deletions api/reference/index.html

Large diffs are not rendered by default.

Loading

0 comments on commit 74cb29e

Please sign in to comment.