davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into dev

This commit is contained in:
0xboobface 2019-01-23 14:24:34 +01:00
parent 6262d50f74 414d0abaff
commit 0e9ae32161
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java
View File

@ -71,8 +71,12 @@ public class LiveJasminTab extends ThumbOverviewTab {
@Override
protected void onFail(WorkerStateEvent event) {
status.setText("Login failed");
super.onFail(event);
if(Config.getInstance().getSettings().livejasminBetaAcknowledged) {
status.setText("Login failed");
grid.getChildren().remove(acknowledge);
grid.getChildren().remove(createAccount);
super.onFail(event);
}
}
@Override

2
client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java
View File

@ -42,7 +42,7 @@ public class LiveJasminUpdateService extends PaginatedScheduledService {
@Override
public List<Model> call() throws IOException, NotLoggedInExcetion {
//String _url = url + ((page-1) * 36); // TODO find out how to switch pages
if(!SiteUiFactory.getUi(liveJasmin).login()) {
if(!liveJasmin.credentialsAvailable() || !SiteUiFactory.getUi(liveJasmin).login()) {
throw new NotLoggedInExcetion();
}

6
docs/index.html
View File

@ -118,19 +118,19 @@
</script>
<div class="row text-center">
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.16.0/ctbrec-1.16.0-win64-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.17.0/ctbrec-1.17.0-win64-jre.zip');">
<i class="fa fa-windows mr-2"></i>
Download for Windows!
</a>
</div>
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.16.0/ctbrec-1.16.0-macos-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.17.0/ctbrec-1.17.0-macos-jre.zip');">
<i class="fa fa-apple mr-2"></i>
Download for macOS!
</a>
</div>
<div class="col">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.16.0/ctbrec-1.16.0-linux-jre.zip');">
<a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.17.0/ctbrec-1.17.0-linux-jre.zip');">
<i class="fa fa-linux mr-2"></i>
Download for Linux!
</a>