nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2016-02-06 15:40:16 +01:00
commit 936460e874
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -117,6 +117,7 @@ Contributions are very welcome, the hard work is done!
## 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)

BIN
app/assets/images/user/uma.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 67 KiB

BIN
app/assets/images/user/wolf.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 25 KiB

12
spec/javascripts/helpers/factory.js
View file

@ -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 = {
"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,