diaspora/app/views
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
..
admins New configuration system 2012-09-26 20:19:37 +02:00
aspect_memberships
aspects Stream form on profile page 2013-01-31 00:15:27 -03:00
comments remove disable_with depreciation warning. 2012-05-31 22:35:07 -07:00
community_spotlight some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
contacts Refactor contacts/index 2013-01-29 10:01:08 -02:00
conversations Issue #3874: Distorted profile thumbnail 2013-01-21 22:43:48 -03:00
devise New configuration system 2012-09-26 20:19:37 +02:00
errors 404 page set for mobile 2012-09-08 19:43:10 +02:00
home Rails.root and File.join cleanup 2012-06-11 03:13:20 -07:00
invitations add email validation to invitations 2012-11-25 14:25:20 +01:00
layouts Side panel ui changes 2013-01-27 08:04:33 -03:00
likes remove app/views/likes/likes_container 2012-11-06 21:39:36 -02:00
messages Hovering a Timeago-String should show the Timestamp 2013-01-31 13:43:37 -03:00
notifications Issue #3874: Distorted profile thumbnail 2013-01-21 22:43:48 -03:00
notifier some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
people Merge branch 'hotfix/0.0.2.4' into develop 2013-02-01 22:24:37 +01:00
photos add settings web mobile 2013-01-27 20:38:19 +01:00
posts some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
profiles add settings web mobile 2013-01-27 20:38:19 +01:00
publics query the set url only through #pod_uri in the app 2012-09-26 20:19:37 +02:00
registrations Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser 2012-12-08 14:59:01 +01:00
reshares
services
sessions Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser 2012-12-08 14:59:01 +01:00
shared Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile 2013-01-29 14:58:11 +01:00
status_messages Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
tags port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
users add settings web mobile 2013-01-27 20:38:19 +01:00