Skip to content

Commit 3714744

Browse files
authored
Merge changes for version 1.8.3 (#243)
* Fix #234 * Update Version * Update CHANGELOG.md * Update README.md * Update SECURITY.md * Replace News with Link to GitHub Announcements #241 * Cleanup files * Update README.md * Update README.md
1 parent 21666fe commit 3714744

File tree

12 files changed

+51
-133
lines changed

12 files changed

+51
-133
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 1.8.3 (2024-05-20)
2+
3+
### :warning: Breaking Changes
4+
5+
* Dropping support for SQLite [#239](https://github.com/TheAxelander/OpenBudgeteer/issues/239) [#242](https://github.com/TheAxelander/OpenBudgeteer/discussions/242)
6+
7+
### :gear: Features & Enhancements
8+
9+
* Replace News with Link to GitHub Announcements [#241](https://github.com/TheAxelander/OpenBudgeteer/issues/241)
10+
11+
### :beetle: Bug Fixes
12+
13+
* Fix error message after creating new Bucket [#234](https://github.com/TheAxelander/OpenBudgeteer/issues/234) Thanks also [Anu6is](https://github.com/Anu6is)
14+
115
## 1.8.2 (2024-04-04)
216

317
### :hammer: Maintenance

OpenBudgeteer.Blazor/Pages/Index.razor

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,14 @@
4646
<div class="card card-home m-2">
4747
<div class="row g-0">
4848
<div class="col-4 card-img-col-padding">
49-
<img src="css/icons8/question-group.png" class="img-fluid rounded-start" alt="...">
49+
<img src="css/icons8/announce.png" class="img-fluid rounded-start" alt="...">
5050
</div>
5151
<div class="col-8">
5252
<div class="card-body">
53-
<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank"><h5 class="card-title">Display Change Log</h5></a>
54-
<p class="card-text">See latest updates and changes.</p>
53+
<a href="https://github.com/TheAxelander/OpenBudgeteer/discussions/categories/announcements" target="_blank"><h5 class="card-title">Display Announcements</h5></a>
54+
<p class="card-text">See latest updates and announcements.</p>
5555
</div>
5656
</div>
5757
</div>
5858
</div>
5959
</div>
60-
61-
<h4>What's new</h4>
62-
<div style="max-width: 1000px; margin:auto">
63-
@_convertedHtml
64-
</div>
65-
66-
@if (_showErrorMessage)
67-
{
68-
<div class="alert alert-danger d-flex align-items-center" role="alert" style="margin-bottom: 0">
69-
<svg class="bi flex-shrink-0 me-2" width="24" height="24" role="img" aria-label="Danger:"><use xlink:href="#exclamation-triangle-fill"/></svg>
70-
<div>Unable to load News</div>
71-
</div>
72-
}

OpenBudgeteer.Blazor/Pages/Index.razor.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

OpenBudgeteer.Blazor/Shared/MainLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</button>
1717
<span class="navbar-brand flex-fill ms-2 fs-5">OpenBudgeteer</span>
1818
<span class="navbar-text ms-3 d-none d-md-block">Database: @CurrentDatabase</span>
19-
<span class="navbar-text ms-3 d-none d-md-block">Version: 1.8.2 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)</span>
19+
<span class="navbar-text ms-3 d-none d-md-block">Version: 1.8.3 (<a href="https://github.com/TheAxelander/OpenBudgeteer/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)</span>
2020
</div>
2121
</header>
2222
<div class="container-fluid">
Loading

OpenBudgeteer.Contracts/OpenBudgeteer.Contracts.csproj

Lines changed: 0 additions & 8 deletions
This file was deleted.

OpenBudgeteer.Core/ViewModels/EntityViewModels/BucketViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,8 @@ public ViewModelOperationResult CreateOrUpdateBucket()
612612
ServiceManager.BucketService.Update(BucketVersion.HasModification
613613
? ConvertToDtoWithNewVersion()
614614
: ConvertToDto());
615+
CalculateValues();
615616
}
616-
CalculateValues();
617617
return new ViewModelOperationResult(true, true);
618618
}
619619
catch (Exception e)

README.md

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,11 @@
33
</p>
44

55
<p align="center">
6-
<a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml">
7-
<img alt="Docker Image pre-release" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml/badge.svg">
8-
</a>
9-
<a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml">
10-
<img alt="Docker Image latest" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml/badge.svg">
11-
</a>
6+
<a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml" target="_blank"><img alt="Docker Image pre-release" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-pre-release.yml/badge.svg"></a>
7+
<a href="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml" target="_blank"><img alt="Docker Image latest" src="https://github.com/TheAxelander/OpenBudgeteer/actions/workflows/docker-image-master.yml/badge.svg"></a>
128
</p>
139
<p align="center">
14-
<a href="https://github.com/awesome-selfhosted/awesome-selfhosted#money-budgeting--management">
15-
<img alt="Mentioned in Awesome-Selfhosted" src="https://awesome.re/mentioned-badge.svg">
16-
</a>
10+
<a href="https://github.com/awesome-selfhosted/awesome-selfhosted#money-budgeting--management" target="_blank"><img alt="Mentioned in Awesome-Selfhosted" src="https://awesome.re/mentioned-badge.svg"></a>
1711
<img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/axelander/openbudgeteer">
1812
<img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/theaxelander/openbudgeteer">
1913
</p>
@@ -30,24 +24,9 @@ Within the [Documentation](https://theaxelander.github.io) you will find all the
3024

3125
## Quick Start
3226

33-
For a quick ramp-up up of OpenBudgeteer using Docker and Sqlite use below command or docker compose.
34-
35-
### docker run
36-
37-
```bash
38-
docker run -d --name='openbudgeteer' \
39-
-e 'CONNECTION_PROVIDER'='SQLITE' \
40-
-e 'CONNECTION_DATABASE'='/srv/openbudgeteer.db' \
41-
-p 8080:8080 \
42-
-v 'data:/srv' \
43-
'axelander/openbudgeteer:latest' # alternatively use 'pre-release' or a specific version tag
44-
```
45-
46-
### docker compose
27+
For a quick ramp-up up of OpenBudgeteer using Docker and MariaDB use below docker compose.
4728

4829
```yml
49-
version: "3"
50-
5130
services:
5231
openbudgeteer:
5332
image: axelander/openbudgeteer:latest
@@ -57,10 +36,33 @@ services:
5736
ports:
5837
- 8080:8080
5938
environment:
60-
- CONNECTION_PROVIDER=SQLITE
61-
- CONNECTION_DATABASE=/srv/openbudgeteer.db
39+
- CONNECTION_PROVIDER=mariadb
40+
- CONNECTION_SERVER=openbudgeteer-mysql
41+
- CONNECTION_PORT=3306
42+
- CONNECTION_DATABASE=openbudgeteer
43+
- CONNECTION_USER=openbudgeteer
44+
- CONNECTION_PASSWORD=openbudgeteer
45+
- APPSETTINGS_CULTURE=en-US
46+
- APPSETTINGS_THEME=solar
47+
depends_on:
48+
- mariadb
49+
50+
mariadb:
51+
image: mariadb
52+
container_name: openbudgeteer-mysql
53+
environment:
54+
MYSQL_ROOT_PASSWORD: myRootPassword
6255
volumes:
63-
- data:/srv
56+
- data:/var/lib/mysql
57+
58+
# optional
59+
phpmyadmin:
60+
image: phpmyadmin/phpmyadmin
61+
container_name: openbudgeteer-phpmyadmin
62+
links:
63+
- mariadb:db
64+
ports:
65+
- 8081:80
6466

6567
volumes:
6668
data:

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
| Version | Supported |
66
|-------------| ------------------ |
7-
| 1.8.2 | :white_check_mark: |
7+
| 1.8.3 | :white_check_mark: |
88
| pre-release | :white_check_mark: |
9-
| < 1.8.2 | :x: |
9+
| < 1.8.3 | :x: |
1010

1111
## Reporting a Vulnerability
1212

docker-compose.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

examples/compose-sqlite.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

examples/compose-tempdb.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)