Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge develop into main #60

Merged
merged 2 commits into from
Mar 27, 2024
Merged

merge develop into main #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ec626e
hot fix
Mar 27, 2024
6fafd76
update version to 2.3.2
Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
[2.3.2] - 2024-03-27
- Increase webtools transaction timeout

[2.3.1] - 2024-03-21
### Fixed
- Handle cost, tags, target and location on the Webtools import [#54](https://github.com/rokwire/gateway-building-block/issues/54)
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
Patches for **Gateway Building Block** in this repository will only be applied to the following versions:
| Version | Supported |
| ------- | ------------------ |
| 2.3.1 | :white_check_mark: |
| < 2.3.1 | :x: |
| 2.3.2 | :white_check_mark: |
| < 2.3.2 | :x: |

## Reporting a Bug or Vulnerability

Expand Down
2 changes: 1 addition & 1 deletion core/logic_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func (e eventsLogic) processWebToolsEvents() {
//* keep the already exisiting events IDS THE SAME!

return nil
}, 60000)
}, 180000)

if err != nil {
e.logger.Errorf("error performing transaction - %s", err)
Expand Down
2 changes: 1 addition & 1 deletion driver/web/docs/gen/def.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: 3.0.3
info:
title: Rokwire Gateway Building Block API
description: Gateway Building Block API Documentation
version: 2.3.1
version: 2.3.2
servers:
- url: 'https://api.rokwire.illinois.edu/gateway'
description: Production server
Expand Down
2 changes: 1 addition & 1 deletion driver/web/docs/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: 3.0.3
info:
title: Rokwire Gateway Building Block API
description: Gateway Building Block API Documentation
version: 2.3.1
version: 2.3.2
servers:
- url: 'https://api.rokwire.illinois.edu/gateway'
description: Production server
Expand Down
Loading