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

2682 commits

Author SHA1 Message Date
Herve Saint-Amand
39c3fa427e Added a greeting to the changeset comment message 
The greeting includes the recipient's user name (as for the message notification mail), which should increase the recipient's trust that the message isn't spam. Greetings were reused from each language's respective locale flie.
 2017-01-12 21:52:17 +00:00
Herve Saint-Amand
31778fd155 Removed unbalanced tag HTML tag 2017-01-11 22:03:00 +00:00
Herve Saint-Amand
3aa69ffbdd Dressed up a few more messages. 
email_confirm, message_notification and signup_confirm now use the new templates. This fixes some, but not all, of the currently broken tests.
 2017-01-09 23:42:43 +00:00
Herve Saint-Amand
417176f868 Moved message table HTMl to a partial template 
Several notifications are about a message having been sent from one user to another via OSM. I've moved the code for the HTML table that holds the actual user message, with the avatar and the body text, to its own partial template, so that it can be reused. I've updated a second notifier message to the new template, diary_comment_notification.
 2017-01-08 22:09:10 +00:00
Herve Saint-Amand
479a4bd0d7 First steps towards using layouts 
Since all HTML mails will presumably share the same overall layout, and the markup is fairly dense, it makes sense to use Rails layouts to share the structure across mail templates. This commit moves the core structure of the HTML mail to a layout. It will need to be further refined so that notifications that involve a text message sent by another user can share the avatar-and-message-text structure.
 2017-01-06 22:37:28 +00:00
Herve Saint-Amand
ac081305f2 Remove HTML markup from locale file 
Rather than including HTML markup in the locale file (which also has the inconvenience of requiring both a plain-text and an HTML duplicate of the same string), move the markup to the template. Also added a helper to reduce clutter in the template slightly.
 2017-01-03 22:38:58 +00:00
Herve Saint-Amand
b5fd9f5fbe Use parameterised server root URL rather than hardcoded 2017-01-01 22:35:59 +00:00
Herve Saint-Amand
20bd72d9e9 Move localised text to locale file 
Moved a string of English text that will require translation from the HTML template to the locale I18N file.
 2017-01-01 22:30:41 +00:00
Herve Saint-Amand
b5ef2be021 Better loading of attached images 
Got rid of that big ugly base64 blob which was only a temporary crutch anyway. Added a png file instead. Use File.read rather than File.open for a 66% reduction in verbosity.
 2017-01-01 22:11:56 +00:00
Herve Saint-Amand
5f663b765a Tweaked cell padding 
Tweaked cell padding to align the top of the avatar and of the message text a bit better.
 2016-12-31 00:14:24 +00:00
Herve Saint-Amand
94062a17b3 Cleaned up HTML 
Removed some cargo-cult HTML attributes and CSS. Styling HTML for email clients is trickier than for browsers, I'm trying to keep the code as succinct but also as compatible as possible.
 2016-12-30 23:45:32 +00:00
Herve Saint-Amand
1f0f7ba621 avatar inline attachment; text alignment 2016-12-29 23:37:39 +00:00
Herve Saint-Amand
e6d19586df intial commit, for 'en' locale only, for changeset_comment_notification only, doesn't load images properly yet 2016-12-29 21:54:46 +00:00
Tom Hughes
69b967c9ff Add support for Wikimedia authentication 
Closes #1146
 2016-12-20 22:32:25 +00:00
Thomas Skowron
fe0f4543c1 Add tab icon for safari/touchbar 
Closes #1382
 2016-11-29 19:01:12 +00:00
Tom Hughes
34c473f503 Use only_path instead of setting an explicit host 2016-11-24 20:33:36 +00:00
Tom Hughes
1309661b15 Use image_url instead of image_path with the host option 
Fixes #1379
 2016-11-24 20:23:42 +00:00
Andy Allan
1e3a35f971 Add missing xmlns:dc for notes rss 2016-11-24 17:47:16 +00:00
Andy Allan
33a1fca883 Use the assets pipeline for images in the changeset feeds. 
This brings it into line with the other feeds.
 2016-11-24 17:07:59 +00:00
Andy Allan
63271147a0 Use a full url for the image in the diary rss feed. 
This is what was intended by ee2a941d3e
which fixed the same problem in a different place.
 2016-11-24 17:06:14 +00:00
Andy Allan
83e1700d26 Add missing xmlns declaration for diary_entries 
This is already present in the other feeds.
 2016-11-24 11:41:04 +00:00
Martin Raifer
2a2a204125 Fix misspelling (lon -> lng) 
Fixes https://github.com/openstreetmap/iD/issues/3588
Closes #1374
 2016-11-17 20:37:27 +00:00
Bryan Housel
6fae46122e Fix misspelling, @lng -> @lon 2016-11-15 10:40:42 -05:00
Bryan Housel
6c3a31d06c Update to iD v2.0.0 2016-11-15 10:16:34 -05:00
Tom Hughes
48eb8eb369 Merge remote-tracking branch 'openstreetmap/pull/1349' 2016-10-29 18:08:31 +01:00
Andy Allan
4a9aa0a12e Avoid double-escaping diary entry titles 
The XML builder takes care of the escaping, and adding h() lead to
double-escaped titles in the RSS feed.
 2016-10-29 17:17:56 +02:00
Andy Allan
968447595b Use dc:creator for note RSS feeds 
The author tag is reserved for email addresses
 2016-10-29 17:14:56 +02:00
Andy Allan
5164c71646 Use dc:creator for diary entry RSS 
The author tag is reserved for email addresses, and we already use
dc:creator in other feeds.
 2016-10-29 17:10:24 +02:00
Andy Allan
ee2a941d3e Use a full url for the image in the diary rss feed. 
Picked up by a validator, see
https://validator.w3.org/feed/docs/error/InvalidFullLink.html
 2016-10-29 17:08:21 +02:00
Andy Allan
27ee98cf4c Make the image title match the feed title in diary rss 
This is recommended at https://validator.w3.org/feed/docs/warning/ImageTitleDoesntMatch.html
 2016-10-29 17:05:30 +02:00
Mikel Maron
3726d561ea last minor fixes 2016-10-11 20:42:10 -04:00
Mikel Maron
bb22e23dfb css in right place; fix structure.sql 2016-10-06 21:47:29 -04:00
Mikel Maron
e055eaf690 tests passing 2016-10-06 21:33:47 -04:00
Mikel Maron
3c01d2e80d more idiomatic models for diary entry subscriptions 2016-10-06 20:31:10 -04:00
Mikel Maron
44b08cc35d not api endpoints, moved to button, fixed notifier message, fixed tests 2016-10-03 22:20:04 -04:00
Mikel Maron
443080d7b0 WIP diary comment subscriptions 2016-10-03 15:04:22 -04:00
Andy Allan
38e12759ea Rubocop autofixes. 2016-09-07 11:07:42 +01:00
Andy Allan
6cc4f4506b Use .present? instead of double negative to check if terms_agreed timestamp is set. 2016-09-07 11:02:20 +01:00
Andy Allan
924f9fa083 User.consider_pd is boolean, so no need for double negation. 2016-09-07 10:59:00 +01:00
Matt Amos
c3ad6aa292 More whitespace fixes. Attempting to get tests to pass. 2016-08-22 18:38:03 +01:00
Frederik Ramm
f3519e9781 fix build on wily; fix some moderation branch language constants 2016-08-22 16:19:14 +01:00
Shrey
916f2c9036 Added helper + minor UI changes 
(cherry picked from commit 3a6550ff54eb08ec282d13ebf85dc3461cca2983)
 2016-08-22 16:18:15 +01:00
Shrey
ed84930283 UI changes + Redirection after creating report fixed 
(cherry picked from commit 987fcf0ba5e7e914dc479e9dc7613400e72148a0)
 2016-08-22 16:18:15 +01:00
Shrey
b598979374 Changed report button + Added disclaimer on report page + Added search filter 2016-08-22 16:18:15 +01:00
Shrey
69c1f6d186 Added sortable headers + search + reportable Notes 2016-08-22 16:18:15 +01:00
Shrey
206e1309a9 Added report icon + changes to admin UI + changes to report form + few other minor changes 2016-08-22 16:17:54 +01:00
Shrey
732e1ab03a Fixed link to DiaryComments 2016-08-22 16:17:54 +01:00
Shrey
b17f9a6157 Fixed an error + Added email notifications for moderators 2016-08-22 16:17:54 +01:00
Shrey
b68b29b43c Added support for reporting Changesets + Deleting issues from the CLI 2016-08-22 16:17:54 +01:00
Shrey
cf639202b8 Added a few more tests 2016-08-22 16:17:54 +01:00