Skip to content

Develop to master#204

Merged
Death111 merged 61 commits into
masterfrom
develop
Jun 10, 2026
Merged

Develop to master#204
Death111 merged 61 commits into
masterfrom
develop

Conversation

@Death111

Copy link
Copy Markdown
Collaborator

No description provided.

Death111 and others added 30 commits May 14, 2025 11:48
…showing id instead of friendly project name instead.
* Add tooltips
* Improve dropdown menu
* Fix time adjustment to use 1h steps
* Added tooltip
* Enabled search in comboboxes
* Expired token now shown in red
* Fixed SyncDialog auto-close
* Made auto-deletion of obsolete mappings optional (Keep/Remove)
…tionImprovements

#178: Fix NPE when Heimat Task is no longer available for a day
# Conflicts:
#	src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
…booking hint when manually added. prefix booking hint. show (i) at the end
…tLanguage_2

using consistent english language now. keeping dates in system locale
…ogAnpassungen

PTBAS-738: Adjust sync window
# Conflicts:
#	src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
#	src/main/java/de/doubleslash/keeptime/view/ExternalProjectsSyncController.java
#	src/main/java/de/doubleslash/keeptime/viewpopup/SearchCombobox.java
#	src/test/java/de/doubleslash/keeptime/controller/HeimatControllerTest.java
* improve test
* improve expiration label
* refactor code in ExternalProjectsMapController
* fix work stacking when it is not needed
…_tested_os_list

#194: Add Fedora Workstation 43 to tested OSs
Death111 added 27 commits April 6, 2026 11:20
…Refactoring

PTBAS-742: Refactor Heimat name and update README
# Conflicts:
#	src/main/java/de/doubleslash/keeptime/controller/HeimatController.java
#	src/main/resources/layouts/externalProjectSync.fxml
* issue to reproduce via test was that the db ids are not set correctly in testsetup causing different behavior in tests
* from feature/#188_manualTaskCreation
…ialogAdjustment

PTBAS-741: Adjust Mapping Dialog

* mapping dialog
* - user can now choose to remove invalid mappings, or keep them
* - invalid mappings are also highlighted in ui
* - added filter possibility
* sync dialog
* - fixed issue which closed sync dialog 'directly' after it was openend
* - fixed issue when same project was shown twice in the sync dialog
* setting dialog
* - highlights heimat token expiration in red when expired
update dependencies. remove sonar step in pipeline
@Death111 Death111 self-assigned this Jun 10, 2026
@Death111 Death111 changed the title Develop Develop to master Jun 10, 2026
@Death111 Death111 merged commit 5304395 into master Jun 10, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants