nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/notifier
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
..
_notifier_css.haml Correct email picture url 2011-01-28 11:43:15 -08:00
also_commented.html.haml added the files 2011-01-06 16:51:34 -08:00
also_commented.text.haml do not escape html in text only emails 2011-03-08 20:45:02 +01:00
comment_on_post.html.haml comment emails have text 2011-02-03 13:07:26 -08:00
comment_on_post.text.haml do not escape html in text only emails 2011-03-08 20:45:02 +01:00
liked.html.haml fixed the formatting on emails 2011-05-11 17:02:05 -07:00
liked.text.haml fixed the formatting on emails 2011-05-11 17:02:05 -07:00
mentioned.html.haml make the mention in html email not a link 2011-02-10 14:43:23 -08:00
mentioned.text.haml do not escape html in text only emails 2011-03-08 20:45:02 +01:00
private_message.html.haml use conversations_url() with a param in private message emails 2011-03-08 22:11:34 -08:00
private_message.text.haml fixed some translations 2011-03-09 15:33:46 +01:00
single_admin.html.haml add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
single_admin.text.haml add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
started_sharing.html.haml request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
started_sharing.text.haml request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00