cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5918 commits 4 branches 1 tag 499 MiB
Commit graph

69 commits

Author SHA1 Message Date
Tom Hughes
a8d8e750da Double quote strings that need to be interpolated 2013-09-24 09:59:04 +01:00
Tom Hughes
13597ca259 Fix translation lookups in text version of note comment notification 2013-09-24 09:52:31 +01:00
John Firebaugh
2690342b08 Reduce welcome email to minimal text 
Instead, redirect newly-confirmed users to the welcome
page. If confirmation is not required, redirect immediately
and don't send an email.
 2013-08-12 13:34:40 -07:00
Tom Hughes
62a5e65a87 Fix "lego" translation in message notification email 2013-07-28 12:38:49 +01:00
Harry Wood
9331ea5d71 Remove references to opengeodata.org 2013-07-15 20:58:28 +01:00
Tom Hughes
fecc643c4e Fixed some "lego" messages in plain text emails 2013-05-07 18:59:12 +01:00
Tom Hughes
9f5787fd20 Make the notification mails for notes show when a note is resolved 2013-04-29 19:26:03 +01:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Tom Hughes
6aaaf5dddb Rework signup emails a bit 
Remove "lego" strings and try and reduce duplication between the
text and HTML versions of the mails.
 2012-11-05 09:54:58 +00:00
Kai Krueger
104727f889 Trust Google and Yahoo to return valid email addresses 
Both Google and Yahoo guarantee that the email address they return
during the OpenID authentication are emails that they have already
verified:

  http://stackoverflow.com/q/5639419

Therefore special case these OpenID providers and automatically
activate the new users account without requiring a separate email
verification step.

This therefore reduces the signup procedure by one step and makes
it easier for new users of these OpenID providers, which cover the
majority of users.
 2012-10-30 19:14:45 +00:00
Tom Hughes
654d22ed2e Return the body of a note comment as a rich text object 2012-10-15 22:34:55 +01:00
Tom Hughes
92ce228cbe Get note comment notification working again 2012-10-14 16:01:34 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
2a35f530bd Add an HTML version of the diary comment notification mail 2012-03-17 16:36:58 +00:00
Tom Hughes
aa4205482a Treat all newly entered blocks of text as Markdown 2012-03-17 16:36:55 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Tom Hughes
f093b9a600 Replace @body with @text again... 2011-12-18 17:46:21 +00:00
Tom Hughes
4eefbaa9db Don't escape anything in text/plain message notifications 2011-12-03 17:58:21 +00:00
Tom Hughes
ce4a6eefa7 Add an HTML version of the message notification email 2011-12-01 19:17:16 +00:00
Tom Hughes
52452d95b4 Don't escape HTML in text/plain message notification emails 2011-12-01 19:03:30 +00:00
Tom Hughes
d4853bdc29 Looks like @body is special somehow so use @text instead 2011-11-15 14:49:38 +00:00
Tom Hughes
dc9b0e8c94 Rename notifier views to new style names 2011-11-14 09:42:45 +00:00
Tom Hughes
22594361d5 Mark some strings that shouldn't be escaped as raw 2011-11-14 09:42:41 +00:00
Tom Hughes
e3b8b89330 Mass rename of "bugs" as "notes" for increased user friendliness 2011-05-21 17:22:31 +01:00
Kai Krueger
b3d62bb85a Send notification emails when someone comments on a map bug report 2011-04-27 12:01:52 -06:00
Tom Hughes
d9f9cf4056 Mention help.openstreetmap.org in the welcome message 2010-09-10 11:20:00 +01:00
Tom Hughes
8f5c54f805 Fix typo 2010-09-09 09:06:58 +01:00
Tom Hughes
5e9ae68fb2 Make friend notification messages include a link to add a reciprocal 
friendship if it doesn't already exist. Closes #2754.
 2010-03-01 12:08:11 +00:00
Tom Hughes
8b5847f7e3 Remove "do not reply" banner from message and comment notifications. 2009-11-06 16:08:35 +00:00
Tom Hughes
27a3dc447c Mention the OSM blob and twitter in the signup message. 2009-10-18 14:02:13 +00:00
Tom Hughes
e890528aac Rework password reset system to do away with the second email and instead 
just allow the user (providing they possess a valid token from the first
email) to enter a new password on the site.
 2009-08-03 23:42:29 +00:00
Tom Hughes
2e2f212472 Rename views to rails 2 style names. 2009-06-09 20:50:14 +00:00
Ævar Arnfjörð Bjarmason
938cdd8503 Made GPX notification E-Mails translatable 
The multiline 'notifier.gpx_notification.success.loaded_successfully'
message is how one should properly do multiline messages to be
embedded into E-Mail. It wraps at 80 columns (if translated correctly)
and isn't as inhererently limited as splitting the E-Mail into one
message per-line like the other notification messages do it.
 2009-06-07 15:50:30 +00:00
Ævar Arnfjörð Bjarmason
e72f35f8d9 Make URL that link to the OSM Wiki configurable by translations. A lot 
of these pages have been translated into other languages and users
using other languages would want to visit those in preference to the
English version.
 2009-06-06 21:36:49 +00:00
Tom Hughes
d9dbd3edf1 Make the rest of the email translatable. 2009-06-05 23:53:47 +00:00
Ævar Arnfjörð Bjarmason
e70e2dbe9f Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer 2009-06-02 12:23:37 +00:00
Tom Hughes
35eeff0081 Fix up translation issues in diary comment notifier. 2009-06-02 08:25:00 +00:00
Ævar Arnfjörð Bjarmason
b720048e95 fixed fatal error as a result of copy/paste programming 2009-06-01 22:51:33 +00:00
Tom Hughes
ceb6a86430 Merge a final translation from i18n branch. 2009-05-31 23:22:10 +00:00
Shaun McDonald
ff6eeff075 Bugfix to the diary entry comment notifier with the missing closing %> 2009-05-31 22:24:57 +00:00
Jenny Herbert
1d89654a79 Added translations for friend_notification 2009-05-31 17:41:56 +00:00
Andy Allan
9eb2d86824 fix html email stuff 2009-05-31 17:03:28 +00:00
Andy Allan
99903362ca i18n signup html 2009-05-31 16:44:58 +00:00
Jenny Herbert
d4f87f6b9b Added translations to notifier/diary_comment_notification 2009-05-31 16:29:42 +00:00
Andy Allan
f4f0c4b155 confirmation email plain text version - comments on wrapping? 2009-05-31 16:04:00 +00:00
Steve Coast
ec7e89f757 nicer signup confirmation email 2009-01-19 03:45:41 +00:00
Tom Hughes
64ecd02f0b Allow users to change their email address. Closes #546. 2008-08-13 11:39:33 +00:00
Tom Hughes
953599970e Capitalise German message correctly. 2008-07-05 23:45:15 +00:00
Tom Hughes
563172b2c8 Minor correction to German translation. 2008-06-25 16:46:25 +00:00
Tom Hughes
65ff860da9 Handle international idiots in a reasonable selection of languages. 2008-06-25 15:18:07 +00:00