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.

Sign up for GitHub

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

Align OP-1199 with develop #2047

Merged
merged 8 commits into from
Sep 2, 2024
Merged

Align OP-1199 with develop #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2629180
OP-1315 add MessageType to sms.properties.dist (#2029)
dbmalkovsky Jul 31, 2024
185740a
OP-1319 Fix prices update upon pricelist change (#2031)
mwithi Aug 6, 2024
d758e13
OP-1323 Fix shared report between "base" and "stat" (#2034)
mwithi Aug 8, 2024
fb826b2
Chore(deps): Bump org.slf4j:slf4j-api from 2.0.13 to 2.0.16
dependabot[bot] Aug 12, 2024
c9cc200
Merge pull request #2038 from informatici/dependabot/maven/org.slf4j-…
dbmalkovsky Aug 15, 2024
d25528d
OP-1322: add message for valid validation of user id (#2035)
dbmalkovsky Aug 17, 2024
41a6000
Chore(deps): Bump org.apache.maven.plugins:maven-surefire-plugin
dependabot[bot] Aug 19, 2024
a14e21c
Merge pull request #2040 from informatici/dependabot/maven/org.apache…
dbmalkovsky Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundle/language_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1720,6 +1720,7 @@ angal.userbrowser.step2.pleaserepeatthenewpassword.label
angal.userbrowser.theadminusercannotbedeleted.msg = The "admin" user cannot be deleted.
angal.userbrowser.thepasswordhasbeenchanged.msg = The password has been changed.
angal.userbrowser.theuseralreadyexists.fmt.msg = The user "{0}" already exists.
angal.userbrowser.theusernamecontainsinvalidcharacters.msg = The user name must contain only a-z, 0-9, dash, period and underscore characters.
angal.userbrowser.title = User Browser
angal.userbrowser.user.col = User
angal.vaccine.deletevaccine.fmt.msg = Delete vaccine: {0}?
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -296,7 +296,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.13</version>
<version>2.0.16</version>
</dependency>
<dependency>
<groupId>org.imgscalr</groupId>
Expand Down
2 changes: 2 additions & 0 deletions rsc/sms.properties.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ skebby-gateway-service.ribbon.base-url=https://api.skebby.it:443
# USER_KEY and ACCESS_TOKEN avoids the login call every time we need to send sms
skebby-gateway-service.accessToken=
skebby-gateway-service.userKey=
# message_type: GP for Classic+, TI for Classic, SI for Basic (default)
#skebby-gateway-service.messageType=


##################################################################
Expand Down
Loading