Skip to content

Conversation

@JaRutkowski
Copy link
Owner

No description provided.

@JaRutkowski JaRutkowski added enhancement New feature or request elibrary-rest-api Issues connected to the elibrary-rest-api module labels Dec 29, 2020
@JaRutkowski JaRutkowski added this to the v4.0 milestone Dec 29, 2020
@JaRutkowski JaRutkowski self-assigned this Dec 29, 2020
@JaRutkowski JaRutkowski marked this pull request as ready for review December 29, 2020 23:41
tabClientEvent.blockClientSuccess = Block/unblock client success.
tabWorkerEvent.blockingLoggedUserWarning = User cannot block himself.
tabWorkerEvent.blockingLoggedUserWarningTitle = Cannot block
aboutPanel.lblELibraryTitle = {0} \u00A9
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicted

tabClientEvent.blockClientSuccess = Block/unblock client success.
tabWorkerEvent.blockingLoggedUserWarning = User cannot block himself.
tabWorkerEvent.blockingLoggedUserWarningTitle = Cannot block
aboutPanel.lblELibraryTitle = {0} \u00A9
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicted

tabClientEvent.blockClientSuccess = Blokowanie/odblokowanie u\u017Cytkownika przebieg\u0142o pomy\u015Blnie.
tabWorkerEvent.blockingLoggedUserWarning = U\u017Cytkownik nie mo\u017Ce zablokowa\u0107 samego siebie.
tabWorkerEvent.blockingLoggedUserWarningTitle = Nie mo\u017Cna zablokowa\u0107
aboutPanel.lblELibraryTitle = {0} \u00A9
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicted

return userDefinedFont;
}

public static Font getApplicationUserDefinedFont(Integer fontSize) {
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicted

@JaRutkowski JaRutkowski merged commit 2125e2f into develop Dec 29, 2020
@JaRutkowski JaRutkowski deleted the #142_About branch January 4, 2021 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

elibrary-rest-api Issues connected to the elibrary-rest-api module enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants