Skip to content

Commit

Permalink
Merge pull request #70 from urbanriskmap/dev
Browse files Browse the repository at this point in the history
Merge dev to form v3.0.4 release
  • Loading branch information
tomasholderness authored Dec 13, 2017
2 parents 282045f + ff2cea3 commit 098ad6b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ API Server for CogniCity
* Added /reports/timeseries endpoint
* Added time window check on archive and time series endpoints
* Updated API definitions in swagger file

### v3.0.4
* Added Semarang instance for Indonesian deployment
* Fixed out of date link in README to list of releases
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Build Status](https://travis-ci.org/urbanriskmap/cognicity-server.svg?branch=master)](https://travis-ci.org/urbanriskmap/cognicity-server) [![Coverage Status](https://coveralls.io/repos/github/urbanriskmap/cognicity-server/badge.svg?branch=server-object-refactor)](https://coveralls.io/github/urbanriskmap/cognicity-server?branch=server-object-refactor)

DOI for current stable release [v3.0.1](https://github.com/urbanriskmap/cognicity-server/releases/tag/v3.0.1)
DOI for current [stable release] (https://github.com/urbanriskmap/cognicity-server/releases)


[![DOI](https://zenodo.org/badge/73803254.svg)](https://zenodo.org/badge/latestdoi/73803254)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cognicity-server",
"version": "3.0.3",
"version": "3.0.4",
"description": "Data Server for CogniCity",
"main": "dist",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default {
PGTIMEOUT: process.env.PGTIMEOUT || 10000,
PGUSER: process.env.PGUSER || 'postgres',
PORT: process.env.PORT || 8001,
REGION_CODES: (process.env.REGION_CODES || 'jbd,bdg,sby').split(','),
REGION_CODES: (process.env.REGION_CODES || 'jbd,bdg,sby,srg').split(','),
REPORT_TYPES: (process.env.REPORT_TYPES || 'drain,desilting,canalrepair,treeclearing,flood').split(','),
RESPONSE_TIME: process.env.RESPONSE_TIME === 'true' || false,
SECURE_AUTH0: process.env.SECURE_AUTH0 === 'true' || false,
Expand Down

0 comments on commit 098ad6b

Please sign in to comment.