Commit 87ef4446 authored by Dennis Schubert's avatar Dennis Schubert Committed by Steffen van Bergerem

Remove uma.jpg and wolf.jpg

closes #6673
parent fa97a5a5
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
## Refactor ## Refactor
* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554) * Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
* Make mention parsing a bit more robust [#6658](https://github.com/diaspora/diaspora/pull/6658) * Make mention parsing a bit more robust [#6658](https://github.com/diaspora/diaspora/pull/6658)
* Remove unlicensed images [#6673](https://github.com/diaspora/diaspora/pull/6673)
## Bug fixes ## Bug fixes
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630) * Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
......
...@@ -44,9 +44,9 @@ var factory = { ...@@ -44,9 +44,9 @@ var factory = {
"id": id, "id": id,
"diaspora_id": "bob@bob.com", "diaspora_id": "bob@bob.com",
"avatar":{ "avatar":{
"large":"http://localhost:3000/assets/user/uma.jpg", "large":"http://localhost:3000/assets/user/default.png",
"medium":"http://localhost:3000/assets/user/uma.jpg", "medium":"http://localhost:3000/assets/user/default.png",
"small":"http://localhost:3000/assets/user/uma.jpg"} "small":"http://localhost:3000/assets/user/default.png"}
}; };
return _.extend(defaultAttrs, overrides); return _.extend(defaultAttrs, overrides);
...@@ -90,9 +90,9 @@ var factory = { ...@@ -90,9 +90,9 @@ var factory = {
"full_name": "bob grimm", "full_name": "bob grimm",
"gender": "robot", "gender": "robot",
"id": id, "id": id,
"image_url": "http:\/\/localhost:3000\/assets\/user\/wolf.jpg", "image_url": "http://localhost:3000/assets/user/default.png",
"image_url_medium": "http:\/\/localhost:3000\/assets\/user\/wolf.jpg", "image_url_medium": "http://localhost:3000/assets/user/default.png",
"image_url_small": "http:\/\/localhost:3000\/assets\/user\/wolf.jpg", "image_url_small": "http://localhost:3000/assets/user/default.png",
"last_name": "Grimm", "last_name": "Grimm",
"location": "Earth", "location": "Earth",
"nsfw": false, "nsfw": false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment