Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into FIO-1062-added-auto…
Browse files Browse the repository at this point in the history
…mated-tests
  • Loading branch information
travist committed Mar 9, 2021
2 parents 7308eaf + c903c25 commit 87c8464
Show file tree
Hide file tree
Showing 554 changed files with 20,786 additions and 2,148 deletions.
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

### 4.13.0-rc.16
#### Fixed
- UIP-279: Added the root change for row's components
- UIP-280: add prop inEditGrid to components inside it on form use
- UIP-232: EditGrid templates not shown with protected-eval plugin

### 4.13.0-rc.15
#### Fixed
- FIO-1382: Fixes an issue where scroll does not work properly for modal windows
Expand Down
75 changes: 24 additions & 51 deletions app/bootswatch/package.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,27 @@
{
"_args": [
[
"[email protected]",
"/Users/travistidwell/Documents/formio/modules/formio.js"
]
],
"_development": true,
"_from": "[email protected]",
"_id": "[email protected]",
"_inBundle": false,
"_integrity": "sha512-Yr6YqFBC8jwTzoJoLViYlvO97IhPWGqZEm+6FXHfD/G6gbUok6sZkdXxdh4Zb6iCGEwr9p7zGCn38yKQD/bh2Q==",
"_location": "/bootswatch",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
"raw": "[email protected]",
"name": "bootswatch",
"escapedName": "bootswatch",
"rawSpec": "4.6.0",
"saveSpec": null,
"fetchSpec": "4.6.0"
},
"_requiredBy": [
"#DEV:/"
],
"_resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.6.0.tgz",
"_spec": "4.6.0",
"_where": "/Users/travistidwell/Documents/formio/modules/formio.js",
"author": {
"name": "Thomas Park"
"name": "bootswatch",
"description": "Bootswatch is a collection of themes for Bootstrap.",
"version": "4.6.0",
"author": "Thomas Park",
"homepage": "https://bootswatch.com",
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/thomaspark/bootswatch.git"
},
"bugs": {
"url": "https://github.com/thomaspark/bootswatch/issues"
},
"scripts": {
"build": "grunt swatch",
"htmllint": "grunt htmllint",
"stylelint": "stylelint \"**/*.scss\" --rd",
"test": "npm run stylelint"
},
"files": [
"dist/**/*.{css,scss}"
],
"dependencies": {},
"description": "Bootswatch is a collection of themes for Bootstrap.",
"devDependencies": {
"@lodder/grunt-postcss": "^3.0.0",
"autoprefixer": "^10.1.0",
Expand All @@ -55,22 +41,9 @@
"postcss": "^8.2.0",
"stylelint": "^13.8.0",
"stylelint-config-twbs-bootstrap": "^2.1.0"
},
"files": [
"dist/**/*.{css,scss}"
],
"homepage": "https://bootswatch.com",
"license": "MIT",
"name": "bootswatch",
"repository": {
"type": "git",
"url": "git+https://github.com/thomaspark/bootswatch.git"
},
"scripts": {
"build": "grunt swatch",
"htmllint": "grunt htmllint",
"stylelint": "stylelint \"**/*.scss\" --rd",
"test": "npm run stylelint"
},
"version": "4.6.0"
}
}

,"_resolved": "https://registry.npmjs.org/bootswatch/-/bootswatch-4.6.0.tgz"
,"_integrity": "sha512-Yr6YqFBC8jwTzoJoLViYlvO97IhPWGqZEm+6FXHfD/G6gbUok6sZkdXxdh4Zb6iCGEwr9p7zGCn38yKQD/bh2Q=="
,"_from": "[email protected]"
}
81 changes: 25 additions & 56 deletions app/fontawesome/package.json
Original file line number Diff line number Diff line change
@@ -1,79 +1,48 @@
{
"_args": [
[
"[email protected]",
"/Users/travistidwell/Documents/formio/modules/formio.js"
]
],
"_development": true,
"_from": "[email protected]",
"_id": "[email protected]",
"_inBundle": false,
"_integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
"_location": "/font-awesome",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
"raw": "[email protected]",
"name": "font-awesome",
"escapedName": "font-awesome",
"rawSpec": "4.7.0",
"saveSpec": null,
"fetchSpec": "4.7.0"
"name": "font-awesome",
"description": "The iconic font and CSS framework",
"version": "4.7.0",
"style": "css/font-awesome.css",
"keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
"homepage": "http://fontawesome.io/",
"bugs": {
"url" : "http://github.com/FortAwesome/Font-Awesome/issues"
},
"_requiredBy": [
"#DEV:/"
],
"_resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
"_spec": "4.7.0",
"_where": "/Users/travistidwell/Documents/formio/modules/formio.js",
"author": {
"name": "Dave Gandy",
"email": "[email protected]",
"url": "http://twitter.com/davegandy"
"web": "http://twitter.com/davegandy"
},
"bugs": {
"url": "http://github.com/FortAwesome/Font-Awesome/issues"
"repository": {
"type": "git",
"url": "https://github.com/FortAwesome/Font-Awesome.git"
},
"contributors": [
{
"name": "Brian Talbot",
"url": "http://twitter.com/talbs"
"web": "http://twitter.com/talbs"
},
{
"name": "Travis Chase",
"url": "http://twitter.com/supercodepoet"
"web": "http://twitter.com/supercodepoet"
},
{
"name": "Rob Madole",
"url": "http://twitter.com/robmadole"
"web": "http://twitter.com/robmadole"
},
{
"name": "Geremia Taglialatela",
"url": "http://twitter.com/gtagliala"
"web": "http://twitter.com/gtagliala"
}
],
"dependencies": {},
"description": "The iconic font and CSS framework",
"engines": {
"node": ">=0.10.3"
},
"homepage": "http://fontawesome.io/",
"keywords": [
"font",
"awesome",
"fontawesome",
"icon",
"font",
"bootstrap"
],
"license": "(OFL-1.1 AND MIT)",
"name": "font-awesome",
"repository": {
"type": "git",
"url": "git+https://github.com/FortAwesome/Font-Awesome.git"
"dependencies": {
},
"style": "css/font-awesome.css",
"version": "4.7.0"
}
"engines" : {
"node" : ">=0.10.3"
}

,"_resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz"
,"_integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
,"_from": "[email protected]"
}
2 changes: 1 addition & 1 deletion dist/formio.contrib.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.contrib.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.contrib.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
MIT License: http://getify.mit-license.org
*/

/*! formiojs v4.13.0-rc.15 | https://unpkg.com/[email protected].15/LICENSE.txt */
/*! formiojs v4.13.0-rc.16 | https://unpkg.com/[email protected].16/LICENSE.txt */

/**
* @license
Expand Down
2 changes: 1 addition & 1 deletion dist/formio.embed.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/*! formiojs v4.13.0-rc.15 | https://unpkg.com/[email protected].15/LICENSE.txt */
/*! formiojs v4.13.0-rc.16 | https://unpkg.com/[email protected].16/LICENSE.txt */
6 changes: 3 additions & 3 deletions dist/formio.form.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.form.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.form.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/*! choices.js v9.0.1 | © 2019 Josh Johnson | https://github.com/jshjohnson/Choices#readme */

/*! formiojs v4.13.0-rc.15 | https://unpkg.com/[email protected].15/LICENSE.txt */
/*! formiojs v4.13.0-rc.16 | https://unpkg.com/[email protected].16/LICENSE.txt */

/**
* @license
Expand Down
6 changes: 3 additions & 3 deletions dist/formio.full.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.full.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.full.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/*! choices.js v9.0.1 | © 2019 Josh Johnson | https://github.com/jshjohnson/Choices#readme */

/*! formiojs v4.13.0-rc.15 | https://unpkg.com/[email protected].15/LICENSE.txt */
/*! formiojs v4.13.0-rc.16 | https://unpkg.com/[email protected].16/LICENSE.txt */

/**
* @license
Expand Down
2 changes: 1 addition & 1 deletion dist/formio.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formio.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
MIT License: http://getify.mit-license.org
*/

/*! formiojs v4.13.0-rc.15 | https://unpkg.com/[email protected].15/LICENSE.txt */
/*! formiojs v4.13.0-rc.16 | https://unpkg.com/[email protected].16/LICENSE.txt */

/**
* @license
Expand Down
2 changes: 1 addition & 1 deletion dist/formio.utils.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
MIT License: http://getify.mit-license.org
*/

/*! formiojs v4.13.0-rc.15 | https://unpkg.com/[email protected].15/LICENSE.txt */
/*! formiojs v4.13.0-rc.16 | https://unpkg.com/[email protected].16/LICENSE.txt */

/**
* @license
Expand Down
Loading

0 comments on commit 87c8464

Please sign in to comment.