Skip to content

Commit e212c3d

Browse files
CarlaCosteaCarlaCostea
committed
solve conflicts
2 parents 5873460 + 945172e commit e212c3d

177 files changed

Lines changed: 2386 additions & 266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/boilerplate-item-type/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.20.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type@2.19.3...@pie-element/boilerplate-item-type@2.20.0) (2024-08-27)
7+
8+
9+
### Features
10+
11+
* update pie-lib PD-4026, PD-3990 ([395d7d7](https://github.com/pie-framework/pie-elements/commit/395d7d779caae57a810cc19c1d676319d1c19ded))
12+
13+
14+
15+
16+
17+
## [2.19.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type@2.19.2...@pie-element/boilerplate-item-type@2.19.3) (2024-08-22)
18+
19+
20+
### Bug Fixes
21+
22+
* update pie-lib PD-4021 ([07d6e85](https://github.com/pie-framework/pie-elements/commit/07d6e8560ddfe25f95dfbafc2d3155b93eb85404))
23+
24+
25+
26+
27+
628
## [2.19.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type@2.19.1...@pie-element/boilerplate-item-type@2.19.2) (2024-08-19)
729

830

‎packages/boilerplate-item-type/configure/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.19.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type-configure@2.18.3...@pie-element/boilerplate-item-type-configure@2.19.0) (2024-08-27)
7+
8+
9+
### Features
10+
11+
* update pie-lib PD-4026, PD-3990 ([395d7d7](https://github.com/pie-framework/pie-elements/commit/395d7d779caae57a810cc19c1d676319d1c19ded))
12+
13+
14+
15+
16+
17+
## [2.18.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type-configure@2.18.2...@pie-element/boilerplate-item-type-configure@2.18.3) (2024-08-22)
18+
19+
20+
### Bug Fixes
21+
22+
* update pie-lib PD-4021 ([07d6e85](https://github.com/pie-framework/pie-elements/commit/07d6e8560ddfe25f95dfbafc2d3155b93eb85404))
23+
24+
25+
26+
27+
628
## [2.18.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type-configure@2.18.1...@pie-element/boilerplate-item-type-configure@2.18.2) (2024-08-19)
729

830

‎packages/boilerplate-item-type/configure/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@pie-element/boilerplate-item-type-configure",
33
"private": true,
4-
"version": "2.18.2",
4+
"version": "2.19.0",
55
"description": "",
66
"main": "lib/index.js",
77
"module": "src/index.js",
88
"dependencies": {
99
"@material-ui/core": "^3.9.2",
1010
"@pie-framework/pie-configure-events": "^1.3.0",
11-
"@pie-lib/pie-toolbox": "1.29.3",
11+
"@pie-lib/pie-toolbox": "1.30.0",
1212
"debug": "^3.1.0",
1313
"lodash": "^4.17.15",
1414
"prop-types": "^15.6.2",

‎packages/boilerplate-item-type/controller/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [2.18.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type-controller@2.17.3...@pie-element/boilerplate-item-type-controller@2.18.0) (2024-08-27)
7+
8+
9+
### Features
10+
11+
* update pie-lib PD-4026, PD-3990 ([395d7d7](https://github.com/pie-framework/pie-elements/commit/395d7d779caae57a810cc19c1d676319d1c19ded))
12+
13+
14+
15+
16+
17+
## [2.17.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type-controller@2.17.2...@pie-element/boilerplate-item-type-controller@2.17.3) (2024-08-22)
18+
19+
20+
### Bug Fixes
21+
22+
* update pie-lib PD-4021 ([07d6e85](https://github.com/pie-framework/pie-elements/commit/07d6e8560ddfe25f95dfbafc2d3155b93eb85404))
23+
24+
25+
26+
27+
628
## [2.17.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/boilerplate-item-type-controller@2.17.1...@pie-element/boilerplate-item-type-controller@2.17.2) (2024-08-19)
729

830

‎packages/boilerplate-item-type/controller/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@pie-element/boilerplate-item-type-controller",
33
"private": true,
4-
"version": "2.17.2",
4+
"version": "2.18.0",
55
"description": "",
66
"main": "lib/index.js",
77
"module": "src/index.js",
88
"dependencies": {
9-
"@pie-lib/pie-toolbox": "1.29.3",
9+
"@pie-lib/pie-toolbox": "1.30.0",
1010
"debug": "^3.1.0",
1111
"lodash": "^4.17.15"
1212
},

‎packages/boilerplate-item-type/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"access": "public"
55
},
66
"repository": "pie-framework/pie-elements",
7-
"version": "2.19.2",
7+
"version": "2.20.0",
88
"description": "",
99
"dependencies": {
1010
"@material-ui/core": "^3.9.2",
1111
"@pie-framework/pie-player-events": "^0.1.0",
12-
"@pie-lib/pie-toolbox": "1.29.3",
12+
"@pie-lib/pie-toolbox": "1.30.0",
1313
"prop-types": "^15.6.1",
1414
"react": "^16.8.1",
1515
"react-dom": "^16.8.1"

‎packages/calculator/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [4.18.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/calculator@4.17.3...@pie-element/calculator@4.18.0) (2024-08-27)
7+
8+
9+
### Features
10+
11+
* update pie-lib PD-4026, PD-3990 ([395d7d7](https://github.com/pie-framework/pie-elements/commit/395d7d779caae57a810cc19c1d676319d1c19ded))
12+
13+
14+
15+
16+
17+
## [4.17.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/calculator@4.17.2...@pie-element/calculator@4.17.3) (2024-08-22)
18+
19+
20+
### Bug Fixes
21+
22+
* update pie-lib PD-4021 ([07d6e85](https://github.com/pie-framework/pie-elements/commit/07d6e8560ddfe25f95dfbafc2d3155b93eb85404))
23+
24+
25+
26+
27+
628
## [4.17.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/calculator@4.17.1...@pie-element/calculator@4.17.2) (2024-08-19)
729

830

‎packages/calculator/configure/CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.18.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/calculator-configure@3.17.3...@pie-element/calculator-configure@3.18.0) (2024-08-27)
7+
8+
9+
### Features
10+
11+
* update pie-lib PD-4026, PD-3990 ([395d7d7](https://github.com/pie-framework/pie-elements/commit/395d7d779caae57a810cc19c1d676319d1c19ded))
12+
13+
14+
15+
16+
17+
## [3.17.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/calculator-configure@3.17.2...@pie-element/calculator-configure@3.17.3) (2024-08-22)
18+
19+
20+
### Bug Fixes
21+
22+
* update pie-lib PD-4021 ([07d6e85](https://github.com/pie-framework/pie-elements/commit/07d6e8560ddfe25f95dfbafc2d3155b93eb85404))
23+
24+
25+
26+
27+
628
## [3.17.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/calculator-configure@3.17.1...@pie-element/calculator-configure@3.17.2) (2024-08-19)
729

830

‎packages/calculator/configure/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@pie-element/calculator-configure",
3-
"version": "3.17.2",
3+
"version": "3.18.0",
44
"description": "",
55
"main": "lib/index.js",
66
"private": true,
77
"dependencies": {
88
"@material-ui/core": "^3.9.2",
99
"@pie-framework/pie-configure-events": "^1.3.0",
10-
"@pie-lib/pie-toolbox": "1.29.3",
10+
"@pie-lib/pie-toolbox": "1.30.0",
1111
"react": "^16.8.1",
1212
"react-dom": "^16.8.1"
1313
},

‎packages/calculator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pie-element/calculator",
3-
"version": "4.17.2",
3+
"version": "4.18.0",
44
"description": "A catalog tool",
55
"repository": "pie-framework/pie-elements",
66
"scripts": {

0 commit comments

Comments
 (0)