Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BudgetMaster
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

77509556

Commit 77509556 authored 7 years ago by Robert Goldmann Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'v1_3_0' into tests

parents 5ec0cad9 39a03e3d

No related branches found

No related tags found

2 merge requests!142merge v1_3_0 into master,!116merge test into v1_3_0

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

src/de/deadlocker8/budgetmaster/logic/Helpers.java 36 additions, 0 deletions

src/de/deadlocker8/budgetmaster/logic/Helpers.java
src/de/deadlocker8/budgetmaster/logic/ServerConnection.java 1 addition, 1 deletion

src/de/deadlocker8/budgetmaster/logic/ServerConnection.java
src/de/deadlocker8/budgetmaster/ui/ChartController.java 76 additions, 51 deletions

src/de/deadlocker8/budgetmaster/ui/ChartController.java
src/de/deadlocker8/budgetmaster/ui/Controller.java 59 additions, 30 deletions

src/de/deadlocker8/budgetmaster/ui/Controller.java
src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java 33 additions, 20 deletions

src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
src/de/deadlocker8/budgetmaster/ui/SettingsController.java 3 additions, 33 deletions

src/de/deadlocker8/budgetmaster/ui/SettingsController.java
src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java 1 addition, 1 deletion

...deadlocker8/budgetmasterserver/logic/DatabaseHandler.java

with 209 additions and 136 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment