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

7904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Herve Saint-Amand
cf11913d58 Apply inline styling to all <p> tags 
Solved the problem of <p> tags being given different padding or color by different clients, without having to copy-paste a string of CSS into every <p> tag in the templates.
 2017-01-25 22:50:52 +00:00
Andy Allan
7b0b09a527 Remove unused user_tokens fixture and pointless test. 2017-01-25 16:43:04 +00:00
Herve Saint-Amand
25d80789dd Put the user avatar in a <p> block 
This improves rendering on those clients that set the margin to 0 on <p> blocks.
 2017-01-23 22:26:34 +00:00
Tom Hughes
5bcf82d865 Update to leaflet 1.0.3 2017-01-23 12:30:11 +00:00
Niklas Laxström
c4488a0e54 Localisation updates from https://translatewiki.net. 2017-01-23 13:15:00 +01:00
Tom Hughes
c985c2d4ce Update Potlatch 2 to 2.4-32-gecf1e0b build 2017-01-19 15:03:56 +00:00
Niklas Laxström
3993415cd9 Localisation updates from https://translatewiki.net. 2017-01-19 05:47:17 +01:00
Herve Saint-Amand
774e583b20 Rubocop says to use "hash rockets" 
Rubocop will have its way.
 2017-01-16 23:12:59 +00:00
Herve Saint-Amand
1285c9f14b Convert those <nobr> tags to CSS 2017-01-16 22:53:04 +00:00
Herve Saint-Amand
e3e5ad4c5f Refactored the code to invoke the message body partial layout, as suggested in the PR 2017-01-16 22:50:01 +00:00
Herve Saint-Amand
e5152c3931 Move attach_project_logo to be its own before_action filter, as suggested 2017-01-16 21:21:55 +00:00
Herve Saint-Amand
1e19e80d0e Renamed @user_message_author to @author as suggested 2017-01-16 21:13:52 +00:00
Niklas Laxström
2e66950029 Localisation updates from https://translatewiki.net. 2017-01-16 03:38:06 +01:00
Herve Saint-Amand
a0627ec0c6 Revert "Added a greeting to the changeset comment message" 
This reverts commit 39c3fa427e.
 2017-01-14 21:48:46 +00:00
Herve Saint-Amand
433b7c5dfa Remove that ugly style="margin: 0" 
It's really only needed for rendering in Yahoo. Let's try to do without having to copy-paste that into every html template.
 2017-01-13 22:58:57 +00:00
Herve Saint-Amand
c94213847b Simplified the partial layout 
Rather than wrap the body in a :body block, just make it the default, unnamed block, which keeps the markup more lightweight.
 2017-01-13 22:43:23 +00:00
Herve Saint-Amand
75f96fcc9a Logo was being attached twice on changeset comment notifications 2017-01-13 21:45:52 +00:00
Herve Saint-Amand
7ef57b2fe8 Dressed up note comment messages 2017-01-12 23:02:57 +00:00
Herve Saint-Amand
235e77fc26 Dressed up lost password mail 2017-01-12 22:30:31 +00:00
Herve Saint-Amand
6d1c10afbc Dressed up gpx notification mails 2017-01-12 22:28:09 +00:00
Herve Saint-Amand
22f7c1f721 Dressed up friend_notification mail 2017-01-12 22:11:23 +00:00
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
e59d6c567b Rubocop finds 'return' statements redundant 2017-01-11 23:26:56 +00:00
Herve Saint-Amand
0449024ca0 Modify tests to search only text parts 
The tests assumed that every part in the multipart emails that we send were either plain text or HTML. Now we have image attachments, against whose contents the tests were still trying to match regexes. The tests have been modified to only run regexes on the text parts of the mails.
 2017-01-11 23:17:24 +00:00
Herve Saint-Amand
31778fd155 Removed unbalanced tag HTML tag 2017-01-11 22:03:00 +00:00
Tom Hughes
96c91757fc Don't try and look up traces until the user is logged in 
Fixes #1411
 2017-01-11 21:11:37 +00:00
Niklas Laxström
3f59e82926 Localisation updates from https://translatewiki.net. 2017-01-11 19:37:30 +01: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
Tom Hughes
0ca8b0a327 Place GPS tiles in the overlayPane 2017-01-05 08:45:59 +00:00
Niklas Laxström
78bb2b22f1 Localisation updates from https://translatewiki.net. 2017-01-05 08:26:29 +01:00
Tom Hughes
757ef87179 Use https compatible names for GPS tile servers 2017-01-05 00:15:04 +00:00
Lars Sonchocky-Helldorf
df17b997b3 Add public gps tiles layer for debugging purposes 
Fixes #1239
Closes #1406
 2017-01-04 19:26:15 +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
Harry Wood
ea93c0338c More dependency tweaks for gem2.3 and apache2-dev 
Closes #1405
 2017-01-03 15:06:20 +00:00
Harry Wood
194eaeb687 ruby2.0->ruby 2.3 
change dependancies. nokogiri requires a later ruby now as pointed out here: https://github.com/openstreetmap/openstreetmap-website/issues/1402 ruby2.0->ruby 2.3 ...which then entails a later ubuntu if we're installing from packages.
 2017-01-03 13:40:57 +00:00
Grant Slater
89ba5eab46 Switch vagrant Ubuntu Trusty -> Xenial 2017-01-03 12:42:35 +00:00
Herve Saint-Amand
beaa85e21c More compact image paths 
Make the file paths to image assets more compact. I investigated using `image_path` but could only get it to return the path for a public URL, which is different and also includes the asset pipeline digest.
 2017-01-02 23:48:49 +00:00
Tom Hughes
777b19c775 Make export action send TOTP cookie 2017-01-02 22:51:18 +00:00
Tom Hughes
93631482ce Make export form send authenticity token 2017-01-02 22:50:59 +00:00
Herve Saint-Amand
ab9aaf7e97 Proper way to get path to small avatar 
Rather than performing perilous string substitution on paths, just use the built-in way to select the small version of the avatar image file.
 2017-01-02 21:35:59 +00:00
Tom Hughes
9a82ae069a Remove dot prefix from cookie domain 2017-01-02 21:33:58 +00:00
Tom Hughes
d83cc0f15b Reduce TOTP cookie expiry to one hour 2017-01-02 21:17:37 +00:00
Tom Hughes
17135cad03 Add support for generating TOTP cookies 
This allows other sites in the openstreetmap.org domain to validate
that requests are coming from a www.openstreetmap.org user.
 2017-01-02 19:01:01 +00:00
Niklas Laxström
08b0cbb7d7 Localisation updates from https://translatewiki.net. 2017-01-02 13:24:49 +01:00
Herve Saint-Amand
7a4e13ecad Fixed quotes 
Replaced single quotes with double quotes, to comply with rubocop rules.
 2017-01-01 23:39:42 +00:00
Herve Saint-Amand
20a74fcbf1 Remove unused variable 2017-01-01 22:39:07 +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
1d86379a5c Remove unused import 2017-01-01 22:33:22 +00:00