nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/people
History
danielgrippi 648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
..
_add_contact_small.haml moar translatable 2011-03-22 22:45:36 +01:00
_aspect_list.haml added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
_person.html.haml fixed #1027 2011-04-19 00:27:31 +02:00
_person.mobile.haml Pull relationship action button from search results out into a partial. 2011-03-19 15:59:56 -07:00
_profile_photo_upload.html.haml fixed untranslatable strings 2010-12-10 16:52:35 +01:00
_profile_sidebar.html.haml Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
_relationship_action.haml edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -07:00
contacts.haml Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
index.html.haml fixed adding contact feedback on people search result page 2011-04-30 17:00:52 +02:00
index.mobile.haml some fixes to the translations of the mobile site 2011-01-27 18:20:25 +01:00
show.html.haml Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
show.mobile.haml Use correct pagination in mobile person show 2011-04-30 10:26:16 -07:00