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

Merge branch 'develop' of github.com:diaspora/diaspora into develop

Browse source 
Conflicts:
	Changelog.md
This commit is contained in:
Jonne Haß 2013-08-28 20:43:01 +02:00
commit e194a07f18
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Changelog.md
View file

@ -1,15 +1,16 @@
# Head # Head
## Refactor ## Refactor
Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363) * Move non-model federation stuff into lib/ [#4363](https://github.com/diaspora/diaspora/pull/4363)
## Bug fixes ## Bug fixes
Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441) * Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441)
Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448) * Make invite code input width consistent across borwsers [#4448](https://github.com/diaspora/diaspora/pull/4448)
* Fix style of contacts in profile sidebar [#4451](https://github.com/diaspora/pull/4451)
## Features ## Features
Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353) * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
One click to select the invite URL [#4447](https://github.com/diaspora/diaspora/pull/4447) * One click to select the invite URL [#4447](https://github.com/diaspora/diaspora/pull/4447)
# 0.2.0.0 # 0.2.0.0

2
app/assets/stylesheets/profile.css.scss
View file

@ -22,7 +22,7 @@
} }
} }
#image_list { .image_list {
.section { .section {
margin-bottom: 4px; margin-bottom: 4px;
} }

6
app/views/people/_profile_sidebar.html.haml
View file

@ -56,7 +56,7 @@
=t('.born') =t('.born')
= birthday_format(person.birthday) = birthday_format(person.birthday)
- if @photos.present? - if @photos.present?
%li#image_list %li.image_list
%h4 %h4
= t('.photos') = t('.photos')
.item_count .item_count
@ -67,7 +67,7 @@
= link_to t('layouts.header.view_all'), person_photos_path(person) = link_to t('layouts.header.view_all'), person_photos_path(person)
- if person == current_user.person - if person == current_user.person
%li#image_list %li.image_list
%h4 %h4
= t('_contacts') = t('_contacts')
.item_count .item_count
@ -77,7 +77,7 @@
= person_image_link contact.person, :size => :thumb_small = person_image_link contact.person, :size => :thumb_small
%p.see_all= link_to t('layouts.header.view_all'), contacts_path %p.see_all= link_to t('layouts.header.view_all'), contacts_path
- elsif @contact.persisted? && @contacts_of_contact_count > 0 - elsif @contact.persisted? && @contacts_of_contact_count > 0
%li#contacts_of_contact %li.image_list
%h4 %h4
= t('_contacts') = t('_contacts')
.item_count .item_count

2
features/desktop/profile_photos.feature
View file

@ -16,7 +16,7 @@ Feature: show photos
Scenario: see my own photos Scenario: see my own photos
When I am on "robert@grimm.grimm"'s page When I am on "robert@grimm.grimm"'s page
And I follow "View all" within "#image_list" And I follow "View all" within ".image_list"
Then I should be on person_photos page Then I should be on person_photos page
Scenario: I cannot see photos of people who don't share with me Scenario: I cannot see photos of people who don't share with me