nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20866 commits 4 branches 0 tags 121 MiB
Commit graph

127 commits

Author SHA1 Message Date
Jonne Haß
348a7b6c5b update branding 2013-08-25 18:21:14 +02:00
twain
e1ca8df15e added strip_markdown to notification mails 2013-07-03 11:16:31 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Steven Hancock
2ae366ad19 Render invitation email without a layout 
Ideally, we'll probably want to add a layout for this email at some point,
but this simplifies it to the bare minimum and gets rid of the "click here
to change your notification settings" link.

fixes #3270
 2012-05-17 17:51:20 -07:00
Maxwell Salzberg
c8f3bb3e9b small typo in notifier.rb 2012-05-08 10:42:24 -07:00
Steven Hancock
56db268613 Use markerb for emails 
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
 2012-05-07 19:41:30 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated 
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
 2012-04-09 00:25:08 +02:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
MrZYX
1ab9520b36 generate recipient header with Mail::Address to properly handle non-ASCII characters 2012-01-21 19:16:09 +01:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
Ilya Zhitomirskiy
c64588a68d adding attachments to all recepients 2011-10-31 18:09:43 -07:00
Ilya Zhitomirskiy
9cadb99f8a sending csv as a file 2011-10-31 16:39:09 -07:00
Ilya Zhitomirskiy
53b27a7627 added a rake task to email retention to admins 2011-10-26 16:35:20 -07:00
Dan Hansen
32f1b61719 Mail doesn't seem to like the name-addr spec from RFC2822 2011-10-10 00:35:04 -05:00
Dan Hansen
f6845c360f Revert "change namespace from Mail to Mailers" 
This reverts commit f859904c76.
 2011-10-09 23:34:03 -05:00
Dan Hansen
f859904c76 change namespace from Mail to Mailers 
locally when Resque tried to constantize Jobs::Mail Object.const_get("Jobs") returned our Jobs module but when it tried to const_get("Mail") it returned the Mail gem.
added copyright
 2011-10-09 22:41:01 -05:00
Dan Hansen
814eb7b426 RFC2822 specifies that you use parentheses to denote a mailbox list. Use the addr-name spec to specify a display name and the from address. 
Check against the raw headers of the mail as @mail.from excludes the display name
Extract shared logic between notifier methods
 2011-10-09 22:19:50 -05:00
Maxwell Salzberg
75aa3f8f97 include people names in the from field 2011-10-05 17:12:31 -07:00
Dan Hansen
8c15ca2a4b PMs and comments contain author name in "From" header 
refactor notifier
 2011-10-04 23:48:28 -05:00
Maxwell Salzberg
0780491d4f fix for 'undefined method 'post' for nil:NilClass' in Mail::AlsoCommented 2011-09-03 16:06:30 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Sarah Mei
db6acebb6c Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates. 
Also, for some reason, had to move the include of NotifierHelper to the view itself. That requires more investigation.
 2011-08-21 19:11:46 -07:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Raphael Sofaer
a2043671ce Move comment email subject line code into models 2011-08-11 10:46:15 -07:00
Raphael Sofaer
8086b9a9d4 Eliminate 500 errors on also_commented emails, the copy there is terrible 2011-08-10 16:58:35 -07:00
Raphael Sofaer
3658481c38 Fix errors when trying to mail comment notifications to post authors on posts other than status messages 2011-08-10 15:40:32 -07:00
Maxwell Salzberg
2d6a69cdc8 fix for 500s in liked emails for reshares and activity streams photos 2011-08-10 10:25:43 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Sebastian
37ccbce153 Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update 2011-06-01 16:26:53 +02:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -07:00
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
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
maxwell
a036a8035f 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
zhitomirskiyi
8bcf1b49c7 notifier for the messages, we're so close 2011-03-08 10:53:49 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
MrZYX
3c089506ff localize emails 2011-02-12 17:35:12 +01:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
Raphael
dde8fd65e5 Fix build 2011-01-28 12:18:56 -08:00
Raphael
767e58bf94 Correct email picture url 2011-01-28 11:43:15 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
zhitomirskiyi
3fae950905 also commented notification and sending ids into resque so that it works 2011-01-06 15:56:03 -08:00
zhitomirskiyi
67be774b7a setting the comment 2011-01-05 15:35:40 -08:00
zhitomirskiyi
7254db5cbc Revert "Revert "added comment on post mail method"" 
This reverts commit c9b3066599.
 2011-01-05 14:59:15 -08:00
zhitomirskiyi
c9b3066599 Revert "added comment on post mail method" 
This reverts commit c00226238b.
 2011-01-05 14:56:04 -08:00
zhitomirskiyi
c00226238b added comment on post mail method 2011-01-05 14:55:17 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
maxwell
d24be269f2 small refactor of admin mail. don't call deliver in the method 2010-12-14 17:36:26 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
maxwell
d9f25473d2 fix a bug with the notifier and attachment 2010-12-13 14:28:21 -08:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
MrZYX
6a4351378b fixed bug in the mailer that caused a invalid To: header in the mail 2010-12-05 20:48:18 +01:00
MrZYX
a605ab482b made sender address in notifier.rb configurable. This fixes #657 2010-12-03 15:49:34 +01:00
Raphael
5791ffba79 Add administrative mail method 2010-12-01 11:20:10 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
Raphael
38a2ea5199 Remove auto-friending in db:reset for dev servers 2010-11-24 17:55:51 -05:00
Raphael
93ebbbb65f put some logging in the mailer 2010-11-24 17:13:28 -05:00
MrZYX
9ceb3e2fd1 found some still untranslatable strings in helpers and stuff 2010-11-12 06:07:36 +01:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04 more testing 2010-11-05 11:46:43 -07:00
maxwell
53b25728ce yay for typo 2010-11-05 11:46:43 -07:00
maxwell
4154cec28a made mailer query based on ids, rather than making them serialize ruby objects 2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
danielvincent
a31c22adb3 mailer doesn't break everything anymore. attachments are also inlined. 2010-11-02 17:59:50 -07:00
danielvincent
a995d250f1 added white text on grey asset to mailer 2010-11-02 17:19:49 -07:00
maxwell
c6fbcd28f7 stubbing out the hub publish method 2010-10-29 12:09:10 -07:00
maxwell
096a0308e1 update attachment with emails 2010-10-22 17:12:28 -07:00
ilya
9a217d1fa8 MS IZ request acceptance email 2010-10-22 11:55:50 -07:00
maxwell
20a5ec863f small bugfixes for the mailer 2010-10-22 00:49:01 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
ilya
80cd4761f3 started the new invitation email 2010-10-22 00:49:01 -07:00