Skip to content

Commit b5eee3b

Browse files
committed
Merge branch 'master' into 'master'
Merge changes for Version 1.0 See merge request Axelander/openbudgeteer!2
2 parents f917482 + f606b84 commit b5eee3b

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 1.0 (2020-08-10)
2+
3+
* First major release
4+
* Repository now Open Source
5+
16
### 0.12 (2020-08-04)
27

38
* [Add] Current version number and database name to header

OpenBudgeteer.Blazor/Shared/NavMenu.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@using OpenBudgeteer.Core.Common
1+
@using OpenBudgeteer.Core.Common
22
@using Microsoft.EntityFrameworkCore
33
@inject DbContextOptions<DatabaseContext> DbContextOptions
44

@@ -47,7 +47,7 @@
4747
</div>
4848
<div class="navbar-text">
4949
<span>
50-
Version: 0.12 (<a href="https://gitlab.com/Axelander/openbudgeteer/-/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)
50+
Version: 1.0 (<a href="https://gitlab.com/Axelander/openbudgeteer/-/blob/master/CHANGELOG.md" target="_blank">Change Log</a>)
5151
</span>
5252
</div>
5353
</div>

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ You can use the pre-built Docker Image from [Docker Hub](https://hub.docker.com/
1515
| Connection:Password | Database password | MyOpenBudgeteerPassword |
1616

1717
```
18-
docker run -d --name='openbudgeteer'
19-
-e 'Connection:Server'='192.168.178.100'
20-
-e 'Connection:Port'='3306'
21-
-e 'Connection:Database'='MyOpenBudgeteerDb'
22-
-e 'Connection:User'='MyOpenBudgeteerUser'
23-
-e 'Connection:Password'='MyOpenBudgeteerPassword'
24-
-p '6100:80/tcp'
25-
'axelander/openbudgeteer:latest'
18+
docker run -d --name='openbudgeteer' \
19+
-e 'Connection:Server'='192.168.178.100' \
20+
-e 'Connection:Port'='3306' \
21+
-e 'Connection:Database'='MyOpenBudgeteerDb' \
22+
-e 'Connection:User'='MyOpenBudgeteerUser' \
23+
-e 'Connection:Password'='MyOpenBudgeteerPassword' \
24+
-p '6100:80/tcp' \
25+
'axelander/openbudgeteer:latest'
2626
```
2727

2828
If you don't change the Port Mapping you can access the App with Port `80`. Otherwise like above example it can be accessed with Port `6100`
@@ -32,14 +32,14 @@ If you don't change the Port Mapping you can access the App with Port `80`. Othe
3232
A Pre-Release version can be used with the Tag `pre-release`
3333

3434
```
35-
docker run -d --name='openbudgeteer'
36-
-e 'Connection:Server'='192.168.178.100'
37-
-e 'Connection:Port'='3306'
38-
-e 'Connection:Database'='MyOpenBudgeteerDb'
39-
-e 'Connection:User'='MyOpenBudgeteerUser'
40-
-e 'Connection:Password'='MyOpenBudgeteerPassword'
41-
-p '6100:80/tcp'
42-
'axelander/openbudgeteer:pre-release'
35+
docker run -d --name='openbudgeteer' \
36+
-e 'Connection:Server'='192.168.178.100' \
37+
-e 'Connection:Port'='3306' \
38+
-e 'Connection:Database'='MyOpenBudgeteerDb' \
39+
-e 'Connection:User'='MyOpenBudgeteerUser' \
40+
-e 'Connection:Password'='MyOpenBudgeteerPassword' \
41+
-p '6100:80/tcp' \
42+
'axelander/openbudgeteer:pre-release'
4343
```
4444

4545
## How to use
@@ -75,4 +75,4 @@ Once all Transactions are assigned properly you can go back to the Bucket Overvi
7575

7676
OpenBudgeteer has a built-in versioning for Buckets which enables a proper histroy view on previous months. If you modify a Bucket, like changing the Type or the Target Amount, it will create a new version for the current selected month. It is not recommended to change a Bucket in the past, a change between two Bucket Version is prevented.
7777

78-
If you close a Bucket it will be marked as `Inactive` for the next month. This can be only done if the Bucket Balance is 0 to prevent wrong calculations.
78+
If you close a Bucket it will be marked as `Inactive` for the next month. This can be only done if the Bucket Balance is 0 to prevent wrong calculations.

0 commit comments

Comments
 (0)