Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

hotspot
- Activity
- Members
- Labels
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

38d1758f

Commit 38d1758f authored 4 years ago by Sebastian

Downloads
- Plain Diff

Merge branch 'website-template' into 'master'

Use HTML template to render designed website

Closes briar#2022

See merge request !9

parents ed0fa0d1 a77a56ee

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/build.gradle 1 addition, 0 deletions

app/build.gradle
app/src/main/assets/hotspot.html 101 additions, 0 deletions

app/src/main/assets/hotspot.html
app/src/main/java/org/briarproject/hotspot/NetworkUtils.java 7 additions, 1 deletion

app/src/main/java/org/briarproject/hotspot/NetworkUtils.java
app/src/main/java/org/briarproject/hotspot/WebServer.java 75 additions, 8 deletions

app/src/main/java/org/briarproject/hotspot/WebServer.java
app/src/main/res/values/strings.xml 10 additions, 0 deletions

app/src/main/res/values/strings.xml

with 194 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment