nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/helpers
History
danielgrippi 60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
..
application_helper.rb Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
aspect_global_helper.rb slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
aspects_helper.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -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 Add or later to license notice 2010-10-07 16:25:34 -07:00
language_helper.rb Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
layout_helper.rb slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
likes_helper.rb few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
markdownify_helper.rb slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
mobile_helper.rb MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
notifications_helper.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
people_helper.rb Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
publics_helper.rb Mini refactor, removed terse_url function 2010-11-29 23:23:51 +01:00
sockets_helper.rb Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec" 2011-05-11 11:51:51 +02:00
status_messages_helper.rb Specs passing with text 2011-03-14 11:39:31 -07:00
stream_helper.rb Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
tags_helper.rb Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
users_helper.rb display a users username in the final step 2010-11-21 16:13:02 -08:00