nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/aspects
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
..
_aspect.haml fix cucumber 2011-03-23 12:42:07 -07:00
_aspect_contacts.haml Add aspect list to contact page 2010-12-13 15:58:08 -08:00
_aspect_list_item.haml accept invitation feature passing 2011-02-08 16:40:28 -08:00
_aspect_listings.haml added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
_aspect_stream.haml Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
_edit_aspect_pane.html.haml Placeholder views for contacts_visible in aspects 2011-01-27 13:41:22 -08:00
_new_aspect.haml make aspect list visible option on new_aspect pane 2011-01-27 13:41:23 -08:00
_no_posts_message.haml collapsed aspect_listing and contact_listing on aspects/index 2011-01-08 13:11:53 -08:00
create.js.erb green everywhere. 2011-04-08 17:10:43 -07:00
edit.html.haml refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
index.html.haml Merge branch 'master' into follow. all specs green. 2011-04-11 17:48:37 -07:00
index.js.erb Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would. 2011-04-06 12:11:49 -07:00
index.mobile.haml Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
manage.html.haml All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
toggle_contact_visibility.js.erb added title to padlock on aspect edit pane 2011-03-09 12:15:23 -08:00
update.js.erb simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00