Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from kitodo:master #258

Merged
merged 41 commits into from
Oct 25, 2023
Merged

[pull] master from kitodo:master #258

merged 41 commits into from
Oct 25, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 13, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

oliver-stoehr and others added 30 commits June 1, 2023 17:04
* Add editCommentDialog.xhtml

* Enable removal of Comment in CommentService and CommentsForm

* Add integration test for CommentService

* Changed properties of comments association in Process bean

* Add edit comment messages

* Update kitodo.css
* Added missing javadoc

* Codacy issue
Codacy
* Only allow edit/delete by author and newest comment

* Corrected incorrect include
* Remove unnecessary code CommentService.java

* Add Comment to ObjectType.java

* Add helper method call in CommentForm.java
Ensure editcommentform is only rendered when edited comment is not null
* Add editCommentDialog.xhtml

* Enable removal of Comment in CommentService and CommentsForm

* Add integration test for CommentService

* Changed properties of comments association in Process bean

* Add edit comment messages

* Update kitodo.css
* Added missing javadoc

* Codacy issue
Codacy
* Only allow edit/delete by author and newest comment

* Corrected incorrect include
* Remove unnecessary code CommentService.java

* Add Comment to ObjectType.java

* Add helper method call in CommentForm.java
Ensure editcommentform is only rendered when edited comment is not null
* Extract saveProcessAndTasksIndex method

* Index process when editing or deleting comments

* Update CommentForm.java

* Update CommentForm.java

* Update CommentForm.java

* Update CommentForm.java
@pull pull bot added the ⤵️ pull label Oct 13, 2023
solth and others added 5 commits October 18, 2023 12:11
…fields

Always reset password input fields when opening 'change password' dialog
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…0231013

Bump org.json:json from 20230227 to 20231013
@pull pull bot merged commit 98be130 into slub:master Oct 25, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants