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

MARP-1580 Merge master to dev #85

Merged
merged 20 commits into from
Dec 16, 2024
+6 −6
Merged

MARP-1580 Merge master to dev #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e76c93e
MARP-1200 Publish process analytics as market solution
ntqdinh-axonivy Nov 29, 2024
428a79a
[maven-release-plugin] prepare release v11.3.1
ntqdinh-axonivy Nov 29, 2024
4ea43c8
[maven-release-plugin] prepare for next development iteration
ntqdinh-axonivy Nov 29, 2024
828a248
Merge pull request #64 from axonivy-market/new-release
ntqdinh-axonivy Nov 29, 2024
0dc5885
MARP-1200 Publish process analytics as market solution (#66)
ntqdinh-axonivy Dec 2, 2024
e316d9b
MARP-1590 Migrate to 12.0 :camel: (#69)
ivy-rew Dec 3, 2024
57cf3b7
Merge branch 'develop'
ntqdinh-axonivy Dec 5, 2024
f1960bc
MARP-1590 Update gif imaged for Readme (#75)
ntqdinh-axonivy Dec 5, 2024
bf97131
MARP-1590 Migrate to 12.0 (#76)
ntqdinh-axonivy Dec 9, 2024
8bac36a
[maven-release-plugin] prepare release v12.0.0
ntqdinh-axonivy Dec 9, 2024
334671e
[maven-release-plugin] prepare for next development iteration
ntqdinh-axonivy Dec 9, 2024
7f1f885
Merge pull request #77 from axonivy-market/new-release
ntqdinh-axonivy Dec 9, 2024
d21ea94
Change logic for custom fields
nntthuy-axonivy Dec 11, 2024
4b97c96
Remove converter
nntthuy-axonivy Dec 12, 2024
984f6a3
Release 12.0.1 (#81)
ntqdinh-axonivy Dec 12, 2024
c7a35e5
Release 12.0.1 (#82)
ntqdinh-axonivy Dec 12, 2024
baa7c0a
Release (#83)
github-actions[bot] Dec 12, 2024
6e7d9ba
Merge branch 'develop' into feature/MARP-1580-Remove-required-rule-fo…
nntthuy-axonivy Dec 13, 2024
b7bcecb
Merge branch 'master' into feature/MARP-1580-Remove-required-rule-for…
nntthuy-axonivy Dec 16, 2024
c007422
Merge branch 'develop' into feature/MARP-1580-Remove-required-rule-fo…
nntthuy-axonivy Dec 16, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.axonivy.solutions.process.analyser</groupId>
<name>process-analyser</name>
<artifactId>process-analyser-modules</artifactId>
<version>12.0.1-SNAPSHOT</version>
<version>12.0.2-SNAPSHOT</version>
<packaging>pom</packaging>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion process-analyser-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.solutions.process.analyser</groupId>
<artifactId>process-analyser-demo</artifactId>
<version>12.0.1-SNAPSHOT</version>
<version>12.0.2-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion process-analyser-product/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.solutions.process.analyser</groupId>
<artifactId>process-analyser-product</artifactId>
<version>12.0.1-SNAPSHOT</version>
<version>12.0.2-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion process-analyser-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.solutions.process.analyser</groupId>
<artifactId>process-analyser-test</artifactId>
<version>12.0.1-SNAPSHOT</version>
<version>12.0.2-SNAPSHOT</version>
<packaging>iar-integration-test</packaging>
<properties>
<ivy.engine.version>12.0.0</ivy.engine.version>
Expand Down
2 changes: 1 addition & 1 deletion process-analyser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.solutions.process.analyser</groupId>
<artifactId>process-analyser</artifactId>
<version>12.0.1-SNAPSHOT</version>
<version>12.0.2-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>12.0.0</project.build.plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion ...r/src_hd/com/axonivy/solutions/process/analyser/component/CustomFilter/CustomFilter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@
</h:panelGroup>
</h:panelGroup>
</cc:implementation>
</html>
</html>
Loading