Jonne Haß b8128d356b Merge branch 'hotfix/0.0.2.4' into develop ... Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb		2013-02-01 22:24:37 +01:00
..
app	Reshare alert box is appearing twice	2013-01-31 14:52:47 -03:00
helpers	seperate interactions from posts	2012-05-12 17:41:58 -07:00
support	more work on new stream interactions, hella refactorz.	2012-05-21 17:15:10 -07:00
widgets	Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948	2013-02-01 22:20:31 +01:00
alert-spec.js
bookmarklet-spec.js	in 'standalone' mode, the close button is hidden	2012-09-17 20:46:33 +02:00
contact-list-spec.js
diaspora-spec.js
rails-spec.js
search-spec.js	fix jasmine specs	2012-04-02 18:17:55 -07:00
validation-spec.js
view-spec.js	fix jasmine specs	2012-04-02 18:17:55 -07:00