Skip to content

Commit 21813f1

Browse files
committed
Merge branch 'security/lp-2020-01' into develop
Conflicts: CHANGELOG.md
2 parents e5cc783 + 4da80f5 commit 21813f1

File tree

7 files changed

+21
-25
lines changed

7 files changed

+21
-25
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
2424

2525
- Nothing.
2626

27-
## 1.4.1 - TBD
27+
## 1.4.1 - 2020-04-01
2828

2929
### Added
3030

@@ -44,7 +44,7 @@ All notable changes to this project will be documented in this file, in reverse
4444

4545
### Fixed
4646

47-
- Nothing.
47+
- Provides fixes related to [security advisory LP-2020-01](https://getlaminas.org/security/advisory/LP-2020-01).
4848

4949
## 1.4.0 - 2018-05-03
5050

asset/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Laminas API Tools Assets
2-
================
2+
========================
33

44
This directory contains build tools and assets for the api-tools module. CSS
55
in this directory is primarily geared towards projects started with the

asset/api-tools/css/bootstrap.min.css

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asset/api-tools/js/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Files in this directory
22
=======================
33

4-
- bootstrap.min.js: Minified version of the Bootstrap 3 javascript.
5-
- jquery.min.js: Minified version of jquery 2.0.3
4+
- bootstrap.min.js: Minified version of the Bootstrap 3.4.1 javascript.
5+
- jquery.min.js: Minified version of jquery 2.2.4

asset/api-tools/js/bootstrap.min.js

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asset/api-tools/js/jquery.min.js

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

asset/bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "api-tools",
3-
"version": "0.9.0dev",
3+
"version": "1.4.1",
44
"homepage": "https://api-tools.getlaminas.org",
55
"description": "Laminas API Tools Admin UI",
66
"keywords": [
@@ -16,8 +16,8 @@
1616
"vendor"
1717
],
1818
"dependencies": {
19-
"bootstrap": "~3.0.3",
20-
"jquery": "~2.0.3",
19+
"bootstrap": "~3.4.1",
20+
"jquery": "~2.2.4",
2121
"sass-bootstrap-glyphicons": "~1.0.0"
2222
}
2323
}

0 commit comments

Comments
 (0)