nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/helpers
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
..
application_helper.rb moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
aspects_helper.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
comments_helper.rb Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
error_messages_helper.rb
language_helper.rb Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
layout_helper.rb Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
likes_helper.rb likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
mobile_helper.rb
notifications_helper.rb Merge branch 'master' into follow 2011-05-04 11:35:35 -07:00
people_helper.rb Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
publics_helper.rb Mini refactor, removed terse_url function 2010-11-29 23:23:51 +01:00
sockets_helper.rb fixed comment socketing bug, post ordering on own profile page. 2011-03-29 19:40:44 -07:00
status_messages_helper.rb Specs passing with text 2011-03-14 11:39:31 -07:00
tags_helper.rb Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
users_helper.rb