summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-07-22 22:49:45 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-07-22 22:49:45 +0200
commit2d1f7705e1291a15036b0318fea70a311c5d7aaa (patch)
treefcbb618dc3e67bd06df984d609b6e6d5c33b3a98
parentf137f1a0493b0c7fb27893c8d2677af221908de3 (diff)
parent640d55cc2a63bf7ee564ca57d246289637281249 (diff)
downloadnextcloud-server-2d1f7705e1291a15036b0318fea70a311c5d7aaa.tar.gz
nextcloud-server-2d1f7705e1291a15036b0318fea70a311c5d7aaa.zip
Merge pull request #17815 from owncloud/update-blueimp-md5
Update blueimp-md5 to 1.1.0
-rw-r--r--bower.json2
-rw-r--r--core/vendor/blueimp-md5/.bower.json21
2 files changed, 12 insertions, 11 deletions
diff --git a/bower.json b/bower.json
index 87e9c016fce..a1bfa40f23b 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
"tests"
],
"dependencies": {
- "blueimp-md5": "~1.0.1",
+ "blueimp-md5": "~1.1.0",
"handlebars": "~1.3.0",
"jcrop": "~0.9.12",
"jquery": "~1.10.0",
diff --git a/core/vendor/blueimp-md5/.bower.json b/core/vendor/blueimp-md5/.bower.json
index 89288baad76..5559df825c5 100644
--- a/core/vendor/blueimp-md5/.bower.json
+++ b/core/vendor/blueimp-md5/.bower.json
@@ -1,6 +1,6 @@
{
"name": "blueimp-md5",
- "version": "1.0.3",
+ "version": "1.1.0",
"title": "JavaScript MD5",
"description": "JavaScript MD5 implementation.",
"keywords": [
@@ -35,19 +35,20 @@
"url": "http://www.opensource.org/licenses/MIT"
}
],
- "devDependencies": {
- "mocha": "1.11.0",
- "expect.js": "0.2.0",
- "uglify-js": "2.3.6"
- },
"main": "js/md5.js",
- "_release": "1.0.3",
+ "ignore": [
+ "/*.*",
+ "css",
+ "js/demo.js",
+ "test"
+ ],
+ "_release": "1.1.0",
"_resolution": {
"type": "version",
- "tag": "1.0.3",
- "commit": "299407012031ac6f60f832d3b5fa975fcb88b550"
+ "tag": "1.1.0",
+ "commit": "b187bf0abe24bacbca83ea4799978b78829e7914"
},
"_source": "git://github.com/blueimp/JavaScript-MD5.git",
- "_target": "~1.0.1",
+ "_target": "~1.1.0",
"_originalSource": "blueimp-md5"
} \ No newline at end of file