Skip to content

Commit

Permalink
Merge pull request #4285 from nextcloud/bump-md5
Browse files Browse the repository at this point in the history
[js] Bump blueimp-md5
  • Loading branch information
MorrisJobke authored Apr 11, 2017
2 parents 45a6e37 + 3810e89 commit c2686be
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 598 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"tests"
],
"dependencies": {
"blueimp-md5": "~1.1.0",
"blueimp-md5": "^2.7.0",
"handlebars": "^4.0.5",
"jcrop": "~0.9.12",
"jquery": "~2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion core/js/core.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"underscore/underscore.js",
"moment/min/moment-with-locales.min.js",
"handlebars/handlebars.js",
"blueimp-md5/js/md5.js",
"blueimp-md5/js/md5.min.js",
"bootstrap/js/tooltip.js",
"backbone/backbone.js",
"es6-promise/dist/es6-promise.js",
Expand Down
2 changes: 1 addition & 1 deletion core/vendor/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ underscore/**
# blueimp-md5
blueimp-md5/css
blueimp-md5/js/*
!blueimp-md5/js/md5.js
!blueimp-md5/js/md5.min.js
blueimp-md5/index.html

# momentjs - ignore all files except the two listed below
Expand Down
52 changes: 6 additions & 46 deletions core/vendor/blueimp-md5/.bower.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,14 @@
{
"name": "blueimp-md5",
"version": "1.1.0",
"title": "JavaScript MD5",
"description": "JavaScript MD5 implementation.",
"keywords": [
"javascript",
"md5"
],
"homepage": "https://github.com/blueimp/JavaScript-MD5",
"author": {
"name": "Sebastian Tschan",
"url": "https://blueimp.net"
},
"maintainers": [
{
"name": "Sebastian Tschan",
"url": "https://blueimp.net"
}
],
"contributors": [
{
"name": "Paul Johnston",
"url": "http://pajhome.org.uk/crypt/md5"
}
],
"repository": {
"type": "git",
"url": "git://github.com/blueimp/JavaScript-MD5.git"
},
"bugs": "https://github.com/blueimp/JavaScript-MD5/issues",
"licenses": [
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/MIT"
}
],
"main": "js/md5.js",
"ignore": [
"/*.*",
"css",
"js/demo.js",
"test"
],
"_release": "1.1.0",
"version": "2.7.0",
"_release": "2.7.0",
"_resolution": {
"type": "version",
"tag": "1.1.0",
"commit": "b187bf0abe24bacbca83ea4799978b78829e7914"
"tag": "v2.7.0",
"commit": "31cbd8e463b43882c7b0cf461508ddf1c8f14154"
},
"_source": "git://github.com/blueimp/JavaScript-MD5.git",
"_target": "~1.1.0",
"_source": "https://github.com/blueimp/JavaScript-MD5.git",
"_target": "^2.2.7",
"_originalSource": "blueimp-md5"
}
274 changes: 0 additions & 274 deletions core/vendor/blueimp-md5/js/md5.js

This file was deleted.

2 changes: 2 additions & 0 deletions core/vendor/blueimp-md5/js/md5.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c2686be

Please sign in to comment.