Update changelog, revert gitignore stuff

This commit is contained in:
carbotaniuman 2020-06-28 12:44:43 -05:00
parent c5d3208b9b
commit ccb526079c
4 changed files with 3 additions and 4 deletions

2
.gitignore vendored
View file

@ -107,5 +107,3 @@ log/**
cache/** cache/**
dev dev
settings.json

View file

@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Added ### Added
- [2020-06-23] Added Gitlab CI integration by [@lflare]. - [2020-06-23] Added Gitlab CI integration by [@lflare].
- [2020-06-28] Added `client_external_port setting` [@wedge1001].
### Changed ### Changed
@ -15,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed ### Removed
### Fixed ### Fixed
- [2020-06-28] Fixed various state transition bugs by [@carbotaniuman].
### Security ### Security

View file

@ -113,6 +113,6 @@ class ServerHandler(private val settings: ClientSettings) {
private val STRING_ANY_MAP_LENS = Body.auto<Map<String, Any>>().toLens() private val STRING_ANY_MAP_LENS = Body.auto<Map<String, Any>>().toLens()
private val SERVER_SETTINGS_LENS = Body.auto<ServerSettings>().toLens() private val SERVER_SETTINGS_LENS = Body.auto<ServerSettings>().toLens()
private const val SERVER_ADDRESS = "https://api.mangadex.network/" private const val SERVER_ADDRESS = "https://api.mangadex.network/"
//private const val SERVER_ADDRESS = "https://mangadex-test.net/" // private const val SERVER_ADDRESS = "https://mangadex-test.net/"
} }
} }

View file

@ -51,7 +51,6 @@ import java.io.InputStream
import java.net.InetSocketAddress import java.net.InetSocketAddress
import java.net.SocketException import java.net.SocketException
import java.security.PrivateKey import java.security.PrivateKey
import java.security.cert.Certificate
import java.security.cert.CertificateFactory import java.security.cert.CertificateFactory
import java.security.cert.X509Certificate import java.security.cert.X509Certificate
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit