Skip to content

Commit

Permalink
Merge branch 'master' into tsconfig
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/webapp/app/shared/components/inputs/input/input.component.ts
#	src/main/webapp/app/shared/components/list/list.component.ts
  • Loading branch information
loicgreffier committed Jan 2, 2024
2 parents 09b3a54 + 54e204b commit f10e13c
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
report_paths: 'target/surefire-reports/TEST-*.xml'

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jar
path: ${{ github.workspace }}/target/suricate.jar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
report_paths: 'target/surefire-reports/TEST-*.xml'

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jar
path: ${{ github.workspace }}/target/suricate.jar
Expand Down
Binary file added .readme/dashboard.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Suricate

<div align="center">
<img src="src/main/webapp/assets/images/logo.png" height="100" alt="suricate logo"/>
</div>

[![GitHub Build](https://img.shields.io/github/actions/workflow/status/michelin/suricate/continuous_integration.yml?branch=master&logo=github&style=for-the-badge)](https://img.shields.io/github/actions/workflow/status/michelin/suricate/continuous_integration.yml)
[![GitHub release](https://img.shields.io/github/v/release/michelin/suricate?logo=github&style=for-the-badge)](https://github.com/michelin/suricate/releases)
[![GitHub commits since latest release (by SemVer)](https://img.shields.io/github/commits-since/michelin/suricate/latest?logo=github&style=for-the-badge)](https://github.com/michelin/suricate/commits/master)
Expand All @@ -13,7 +17,7 @@

This repository contains the source code of the Suricate application.

![Suricate dashboard developer environment](src/main/webapp/assets/images/dashboard.png)
![Suricate dashboard developer environment](.readme/dashboard.gif)

## Table of Contents

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<properties>
<base62.version>0.1.3</base62.version>
<checkstyle.version>10.12.4</checkstyle.version>
<checkstyle.version>10.12.7</checkstyle.version>
<commons-io.version>2.15.1</commons-io.version>
<commons-lang3.version>3.14.0</commons-lang3.version>
<frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
<graalvm.version>23.1.1</graalvm.version>
<guava.version>32.1.3-jre</guava.version>
<guava.version>33.0.0-jre</guava.version>
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
<jasypt.version>3.0.5</jasypt.version>
<java.version>21</java.version>
Expand All @@ -37,13 +37,13 @@
<jgit.version>6.7.0.202309050840-r</jgit.version>
<lombok.version>1.18.30</lombok.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<maven-checkstyle-plugin>3.3.0</maven-checkstyle-plugin>
<maven-checkstyle-plugin>3.3.1</maven-checkstyle-plugin>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<mockito.version>4.11.0</mockito.version>
<mustache.version>0.9.11</mustache.version>
<packaging.type>jar</packaging.type>
<testcontainers.version>1.19.3</testcontainers.version>
<springdoc.version>2.2.0</springdoc.version>
<springdoc.version>2.3.0</springdoc.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.organization>michelin</sonar.organization>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
}

.list-detail {
max-width: 80%;
display: flex;
flex-direction: column;
justify-content: center;
Expand Down Expand Up @@ -85,8 +86,7 @@
h2 {
font-size: 0.9em;
max-width: 100%;
text-overflow: ellipsis;
overflow: hidden;
overflow-wrap: break-word;
}

h3 {
Expand All @@ -97,6 +97,8 @@

.list-buttons {
display: flex;
justify-content: flex-end;
flex: 1 1 20%;
gap: 8px;
padding: 0 20px;
}
Expand Down
Binary file removed src/main/webapp/assets/images/dashboard.png
Binary file not shown.

0 comments on commit f10e13c

Please sign in to comment.