Skip to content

Commit

Permalink
Merge pull request #245 from qld-gov-au/develop
Browse files Browse the repository at this point in the history
grid1.3.0, storybook 7.5.2, dev dependancy updates
  • Loading branch information
duttonw committed Oct 31, 2023
2 parents 540f159 + 6ac8817 commit c602730
Show file tree
Hide file tree
Showing 9 changed files with 1,575 additions and 3,696 deletions.
2,855 changes: 155 additions & 2,700 deletions .github/workspace/grid/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/workspace/grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"scripts": {
"update": "npm update `npm outdated | awk '{print $1}' | tr '\n' ' '` ",
"copy-formio-grid-changelog": "cp node_modules/@formio/grid/Changelog.md ../../../lib/grid.changlog.md",
"copy-formios-grid": "mkdir ../../../lib/grid && cp -rf node_modules/@formio/grid/dist/* ../../../lib/grid",
"copy-formios-grid": "mkdir -p ../../../lib/grid && cp -rf node_modules/@formio/grid/dist/* ../../../lib/grid",
"cleanup": "rm -rf ../../../lib/*server*",
"copy-all": "npm run copy-formios-grid && npm run cleanup"
},
"devDependencies": {},
"dependencies": {
"@formio/grid": "1.1.1"
"@formio/grid": "1.3.0"
}
}
101 changes: 78 additions & 23 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<a name="unreleased"></a>
## [Unreleased]

## [Unreleased]

<a name="v2.0.0"></a>

## [v2.0.0] - 2023-08-09

### Pull Requests

- Merge pull request [#130](https://github.com/qld-gov-au/formio/issues/130) from qld-gov-au/develop
- Merge pull request [#129](https://github.com/qld-gov-au/formio/issues/129) from qld-gov-au/QOLDEV-539_FormIo.8.1.0_premium1.19.1_formiojs4.15.1
- Merge pull request [#126](https://github.com/qld-gov-au/formio/issues/126) from qld-gov-au/develop
Expand All @@ -22,55 +25,69 @@
- Merge pull request [#107](https://github.com/qld-gov-au/formio/issues/107) from qld-gov-au/Storybook7Upgrade
- Merge pull request [#72](https://github.com/qld-gov-au/formio/issues/72) from qld-gov-au/update-changelog


<a name="v1.1.6-beta003"></a>

## [v1.1.6-beta003] - 2022-11-21

### Pull Requests

- Merge pull request [#101](https://github.com/qld-gov-au/formio/issues/101) from qld-gov-au/FOR-271_formiojs4.14.9_premium1.19.0-rc.3
- Merge pull request [#96](https://github.com/qld-gov-au/formio/issues/96) from qld-gov-au/update-readme-part2
- Merge pull request [#95](https://github.com/qld-gov-au/formio/issues/95) from qld-gov-au/update-readme


<a name="v1.1.6-beta002"></a>

## [v1.1.6-beta002] - 2022-10-06

<a name="v1.1.6-beta001"></a>

## [v1.1.6-beta001] - 2022-09-12

<a name="v1.1.5"></a>

## [v1.1.5] - 2022-08-23

<a name="v1.1.4"></a>

## [v1.1.4] - 2022-08-19

<a name="v1.0.14"></a>

## [v1.0.14] - 2022-08-18

<a name="v1.0.14-beta001"></a>

## [v1.0.14-beta001] - 2022-08-12

<a name="v1.0.13"></a>

## [v1.0.13] - 2022-08-08

### Pull Requests

- Merge pull request [#89](https://github.com/qld-gov-au/formio/issues/89) from qld-gov-au/QOL-7591-update-button-loading-spinner-style
- Merge pull request [#88](https://github.com/qld-gov-au/formio/issues/88) from qld-gov-au/QOL-9130-sso-demo-improvement
- Merge pull request [#87](https://github.com/qld-gov-au/formio/issues/87) from qld-gov-au/QOL-9130-sso-demo-improvement
- Merge pull request [#85](https://github.com/qld-gov-au/formio/issues/85) from qld-gov-au/develop
- Merge pull request [#83](https://github.com/qld-gov-au/formio/issues/83) from qld-gov-au/QOL-8947-customise-formio-error-and-success-message


<a name="v1.1.3"></a>

## [v1.1.3] - 2022-07-13

### Pull Requests

- Merge pull request [#84](https://github.com/qld-gov-au/formio/issues/84) from qld-gov-au/QOL-8947-customise-formio-error-and-success-message
- Merge pull request [#81](https://github.com/qld-gov-au/formio/issues/81) from qld-gov-au/fix-dependabot-alerts
- Merge pull request [#82](https://github.com/qld-gov-au/formio/issues/82) from qld-gov-au/hotfix-prod-css-script-location
- Merge pull request [#76](https://github.com/qld-gov-au/formio/issues/76) from qld-gov-au/add-iOS-12-support


<a name="v1.1.2"></a>

## [v1.1.2] - 2022-07-11

### Pull Requests

- Merge pull request [#77](https://github.com/qld-gov-au/formio/issues/77) from qld-gov-au/add-iOS-12-support
- Merge pull request [#75](https://github.com/qld-gov-au/formio/issues/75) from qld-gov-au/remove-force-hypoerlink-open-in-new-window
- Merge pull request [#74](https://github.com/qld-gov-au/formio/issues/74) from qld-gov-au/QOL-9002-fix-GA-snippet
Expand All @@ -79,90 +96,116 @@
- Merge pull request [#70](https://github.com/qld-gov-au/formio/issues/70) from qld-gov-au/QOL-8993-formio-upgrade
- Merge pull request [#67](https://github.com/qld-gov-au/formio/issues/67) from qld-gov-au/Add-best-pratice-documentation


<a name="v1.0.12"></a>

## [v1.0.12] - 2022-07-08

<a name="v1.0.11"></a>

## [v1.0.11] - 2022-07-07

<a name="v1.0.10"></a>

## [v1.0.10] - 2022-06-29

### Pull Requests
- Merge pull request [#66](https://github.com/qld-gov-au/formio/issues/66) from qld-gov-au/QOL-8950-update-PluPlusAddress-default-label-and-style

- Merge pull request [#66](https://github.com/qld-gov-au/formio/issues/66) from qld-gov-au/QOL-8950-update-PluPlusAddress-default-label-and-style

<a name="v1.1.1"></a>

## [v1.1.1] - 2022-06-28

### Pull Requests
- Merge pull request [#74](https://github.com/qld-gov-au/formio/issues/74) from qld-gov-au/QOL-9002-fix-GA-snippet

- Merge pull request [#74](https://github.com/qld-gov-au/formio/issues/74) from qld-gov-au/QOL-9002-fix-GA-snippet

<a name="v1.1.0"></a>

## [v1.1.0] - 2022-06-28

### Pull Requests

- Merge pull request [#73](https://github.com/qld-gov-au/formio/issues/73) from qld-gov-au/QOL-8993-sync-premium.js
- Merge pull request [#71](https://github.com/qld-gov-au/formio/issues/71) from qld-gov-au/update-changelog


<a name="v1.1.0-beta002"></a>

## [v1.1.0-beta002] - 2022-06-23

### Pull Requests
- Merge pull request [#70](https://github.com/qld-gov-au/formio/issues/70) from qld-gov-au/QOL-8993-formio-upgrade

- Merge pull request [#70](https://github.com/qld-gov-au/formio/issues/70) from qld-gov-au/QOL-8993-formio-upgrade

<a name="v1.1.0-beta001"></a>

## [v1.1.0-beta001] - 2022-06-23

### Pull Requests

- Merge pull request [#67](https://github.com/qld-gov-au/formio/issues/67) from qld-gov-au/Add-best-pratice-documentation
- Merge pull request [#65](https://github.com/qld-gov-au/formio/issues/65) from qld-gov-au/add-theming-support
- Merge pull request [#64](https://github.com/qld-gov-au/formio/issues/64) from qld-gov-au/63-custom-templates-should-be-under-bootstrap3-for-v7-server


<a name="v1.0.9"></a>

## [v1.0.9] - 2022-06-09

### Pull Requests
- Merge pull request [#62](https://github.com/qld-gov-au/formio/issues/62) from qld-gov-au/remove-jquery-reference-from-custom-component-library

- Merge pull request [#62](https://github.com/qld-gov-au/formio/issues/62) from qld-gov-au/remove-jquery-reference-from-custom-component-library

<a name="v1.0.8"></a>

## [v1.0.8] - 2022-05-26

### Pull Requests
- Merge pull request [#58](https://github.com/qld-gov-au/formio/issues/58) from qld-gov-au/update-readme-and-storybook-doc-content

- Merge pull request [#58](https://github.com/qld-gov-au/formio/issues/58) from qld-gov-au/update-readme-and-storybook-doc-content

<a name="v1.0.7-beta001"></a>

## [v1.0.7-beta001] - 2022-05-26

<a name="v1.0.6-beta001"></a>

## [v1.0.6-beta001] - 2022-05-20

<a name="v1.0.7"></a>

## [v1.0.7] - 2022-05-20

### Pull Requests

- Merge pull request [#56](https://github.com/qld-gov-au/formio/issues/56) from qld-gov-au/select-component-data-resource-hotfix
- Merge pull request [#51](https://github.com/qld-gov-au/formio/issues/51) from qld-gov-au/release-v1.0.5


<a name="v1.0.6"></a>

## [v1.0.6] - 2022-05-04

### Pull Requests

- Merge pull request [#50](https://github.com/qld-gov-au/formio/issues/50) from qld-gov-au/release-v1.0.5
- Merge pull request [#49](https://github.com/qld-gov-au/formio/issues/49) from qld-gov-au/release-v1.0.5
- Merge pull request [#48](https://github.com/qld-gov-au/formio/issues/48) from qld-gov-au/release-v1.0.5


<a name="v1.0.5"></a>

## [v1.0.5] - 2022-04-28

### Pull Requests

- Merge pull request [#43](https://github.com/qld-gov-au/formio/issues/43) from qld-gov-au/QOL-8650-fix-gitbridge-issue-in-FormioScript
- Merge pull request [#41](https://github.com/qld-gov-au/formio/issues/41) from qld-gov-au/currentLibs
- Merge pull request [#42](https://github.com/qld-gov-au/formio/issues/42) from qld-gov-au/QOL-8650-fix-form-revision-support


<a name="v1.0.4-beta003"></a>

## [v1.0.4-beta003] - 2022-04-27

### Pull Requests

- Merge pull request [#40](https://github.com/qld-gov-au/formio/issues/40) from qld-gov-au/QOL-8650-add-recaptcha-support-to-FormioLoader
- Merge pull request [#39](https://github.com/qld-gov-au/formio/issues/39) from qld-gov-au/QOL-8091-PlsPlusAddress-patch
- Merge pull request [#38](https://github.com/qld-gov-au/formio/issues/38) from qld-gov-au/QOL-8091-enhance-plsPlusAddress-with-custom-key-support
Expand All @@ -175,13 +218,16 @@
- Merge pull request [#30](https://github.com/qld-gov-au/formio/issues/30) from qld-gov-au/release-v1.0.4
- Merge pull request [#28](https://github.com/qld-gov-au/formio/issues/28) from qld-gov-au/release-v1.0.4


<a name="v1.0.4-beta002"></a>

## [v1.0.4-beta002] - 2022-04-14

<a name="v1.0.4"></a>

## [v1.0.4] - 2022-04-14

### Pull Requests

- Merge pull request [#28](https://github.com/qld-gov-au/formio/issues/28) from qld-gov-au/release-v1.0.4
- Merge pull request [#29](https://github.com/qld-gov-au/formio/issues/29) from qld-gov-au/fixCiCdPostGitCVE
- Merge pull request [#27](https://github.com/qld-gov-au/formio/issues/27) from qld-gov-au/release-v1.0.4
Expand All @@ -196,40 +242,49 @@
- Merge pull request [#20](https://github.com/qld-gov-au/formio/issues/20) from qld-gov-au/release-v1.0.4
- Merge pull request [#19](https://github.com/qld-gov-au/formio/issues/19) from qld-gov-au/ssoWiP3


<a name="v1.0.4-beta001"></a>

## [v1.0.4-beta001] - 2022-04-07

### Pull Requests
- Merge pull request [#11](https://github.com/qld-gov-au/formio/issues/11) from qld-gov-au/QOL-8650-formio-squiz-improvement

- Merge pull request [#11](https://github.com/qld-gov-au/formio/issues/11) from qld-gov-au/QOL-8650-formio-squiz-improvement

<a name="v1.0.3"></a>

## [v1.0.3] - 2022-03-18

### Pull Requests
- Merge pull request [#8](https://github.com/qld-gov-au/formio/issues/8) from qld-gov-au/QOL-8667-add-formio-assets

- Merge pull request [#8](https://github.com/qld-gov-au/formio/issues/8) from qld-gov-au/QOL-8667-add-formio-assets

<a name="v1.0.2"></a>

## [v1.0.2] - 2022-03-17

### Pull Requests
- Merge pull request [#6](https://github.com/qld-gov-au/formio/issues/6) from qld-gov-au/add-external-library

- Merge pull request [#6](https://github.com/qld-gov-au/formio/issues/6) from qld-gov-au/add-external-library

<a name="v1.0.1"></a>

## [v1.0.1] - 2022-03-15

### Pull Requests

- Merge pull request [#5](https://github.com/qld-gov-au/formio/issues/5) from qld-gov-au/QOL-8091-PlsPlus-Address
- Merge pull request [#4](https://github.com/qld-gov-au/formio/issues/4) from qld-gov-au/cicd-updates


<a name="v1.0.0"></a>

## v1.0.0 - 2022-03-14

### Pull Requests

- Merge pull request [#3](https://github.com/qld-gov-au/formio/issues/3) from qld-gov-au/QOL-8091-PlsPlus-Address
- Merge pull request [#2](https://github.com/qld-gov-au/formio/issues/2) from qld-gov-au/foundation
- Merge pull request [#1](https://github.com/qld-gov-au/formio/issues/1) from qld-gov-au/plsplus-address


[Unreleased]: https://github.com/qld-gov-au/formio/compare/v2.0.0...HEAD
[v2.0.0]: https://github.com/qld-gov-au/formio/compare/v1.1.6-beta003...v2.0.0
[v1.1.6-beta003]: https://github.com/qld-gov-au/formio/compare/v1.1.6-beta002...v1.1.6-beta003
Expand Down

0 comments on commit c602730

Please sign in to comment.