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

Jump to bottom

Update Dependencies (REUPLOAD) #22594

Merged
merged 12 commits into from
May 31, 2017
Merged

Update Dependencies (REUPLOAD) #22594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a788369
Update Dependencies (REUPLOAD)
CDAGaming May 10, 2017
c743d91
Merge branch 'v4-dev' into v4-dev
CDAGaming May 20, 2017
ab06add
Merge branch 'v4-dev' into v4-dev
CDAGaming May 27, 2017
7ad14f3
Updates More Dependencies
CDAGaming May 27, 2017
d36c3bb
Merge branch 'v4-dev' of https://github.com/CDAGaming/bootstrap into …
CDAGaming May 27, 2017
a92c434
Update Gem Bundler Dependency
CDAGaming May 27, 2017
fee2a7b
Update Gemfile.lock Dependency
CDAGaming May 27, 2017
55f7c80
Update QUnit
CDAGaming May 27, 2017
a9549ad
Merge branch 'v4-dev' into v4-dev
CDAGaming May 27, 2017
7798d52
Merge branch 'v4-dev' into v4-dev
CDAGaming May 30, 2017
4136f05
Update Uglify-JS to v3.0.13
CDAGaming May 30, 2017
e922134
Merge branch 'v4-dev' into v4-dev
mdo May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.18)
ffi (1.9.18-x64-mingw32)
forwardable-extended (2.6.0)
jekyll (3.4.3)
addressable (~> 2.4)
Expand Down Expand Up @@ -40,13 +41,14 @@ GEM
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.23)
sass (3.4.24)
scss_lint (0.53.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)

PLATFORMS
ruby
x64-mingw32

DEPENDENCIES
jekyll (~> 3.4.3)
Expand All @@ -55,4 +57,4 @@ DEPENDENCIES
scss_lint (~> 0.53.0)

BUNDLED WITH
1.14.6
1.15.0
8 changes: 4 additions & 4 deletions js/tests/vendor/qunit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* QUnit 2.2.0
* QUnit 2.3.2
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2017-03-11T16:19Z
* Date: 2017-04-18T02:19Z
*/

/** Font Family and Sizes */
Expand Down Expand Up @@ -236,7 +236,7 @@
}

#qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass {
#qunit-tests.hidepass li.pass:not(.todo) {
visibility: hidden;
position: absolute;
width: 0;
Expand Down Expand Up @@ -433,4 +433,4 @@
left: -10000px;
width: 1000px;
height: 1000px;
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please re-add the final new-line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's there. was just an invisible diff, and shouldnt need to be worried about

12 changes: 6 additions & 6 deletions js/tests/vendor/qunit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* QUnit 2.2.0
* QUnit 2.3.2
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2017-03-11T16:19Z
* Date: 2017-04-18T02:19Z
*/
(function (global$1) {
'use strict';
Expand All @@ -21,12 +21,12 @@
var document = window && window.document;
var navigator = window && window.navigator;

var sessionStorage = function () {
var localSessionStorage = function () {
var x = "qunit-test-string";
try {
sessionStorage.setItem(x, x);
sessionStorage.removeItem(x);
return sessionStorage;
global$1.sessionStorage.setItem(x, x);
global$1.sessionStorage.removeItem(x);
return global$1.sessionStorage;
} catch (e) {
return undefined;
}
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,26 +74,26 @@
"popper.js": "^1.9.9"
},
"devDependencies": {
"autoprefixer": "^6.7.7",
"autoprefixer": "^7.1.1",
"babel-cli": "^6.24.1",
"babel-eslint": "^7.2.2",
"babel-eslint": "^7.2.3",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
"babel-preset-es2015": "^7.0.0-alpha.7",
"clean-css-cli": "^4.0.12",
"clean-css-cli": "^4.1.3",
"eslint": "^3.19.0",
"htmlhint": "^0.9.13",
"htmllint-cli": "^0.0.6",
"node-sass": "^4.5.2",
"node-sass": "^4.5.3",
"nodemon": "^1.11.0",
"npm-run-all": "^4.0.2",
"phantomjs-prebuilt": "^2.1.14",
"postcss-cli": "^3.1.1",
"postcss-flexbugs-fixes": "^2.1.1",
"postcss-cli": "^4.0.0",
"postcss-flexbugs-fixes": "^3.0.0",
"qunit-phantomjs-runner": "^2.3.0",
"qunitjs": "^2.3.1",
"qunitjs": "^2.3.2",
"shelljs": "^0.7.7",
"shx": "^0.2.2",
"uglify-js": "^2.8.22"
"uglify-js": "^3.0.13"
},
"engines": {
"node": ">=4"
Expand Down