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

0f36798c

Commit 0f36798c authored 6 months ago by jenkins

Downloads
- Plain Diff

Merge branch 'v2_17_1'

parents 39998ba0 3a84c2b8

No related branches found

No related tags found

No related merge requests found

Pipeline #9253 passed 6 months ago

Stage: external

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

BudgetMasterServer/pom.xml 1 addition, 1 deletion

BudgetMasterServer/pom.xml
BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java 1 addition, 1 deletion

.../deadlocker8/budgetmaster/controller/AboutController.java
BudgetMasterServer/src/main/resources/static/css/transactionImport.css 16 additions, 12 deletions

...erver/src/main/resources/static/css/transactionImport.css
BudgetMasterServer/src/main/resources/static/js/transactionImport.js 16 additions, 4 deletions

...rServer/src/main/resources/static/js/transactionImport.js
BudgetMasterServer/src/main/resources/templates/transactions/transactionImportMacros.ftl 9 additions, 7 deletions

...ources/templates/transactions/transactionImportMacros.ftl
BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/CsvImportTest.java 6 additions, 6 deletions

...ker8/budgetmaster/integration/selenium/CsvImportTest.java
Dockerfile 1 addition, 1 deletion

Dockerfile
README.md 1 addition, 1 deletion

README.md
pom.xml 2 additions, 2 deletions

pom.xml

with 53 additions and 35 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