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

4493 commits

Author SHA1 Message Date
Tom Hughes
e23541c20f Allow a POST with no arguments to trace#edit to fetch the form 2017-02-13 10:09:43 +00:00
Herve Saint-Amand
a520f1251c merging master into html-mail-fixes 2017-02-12 21:05:38 +00:00
Tom Hughes
8376a430b6 Allow context menu to add notes without panning the map 2017-02-12 19:19:14 +00:00
Tom Hughes
e58a5c69d3 Make context menu entries translateable 2017-02-12 19:19:14 +00:00
Tom Hughes
430978fab7 Improve context menu initialisation to avoid namespace pollution 2017-02-12 19:19:13 +00:00
Tom Hughes
043d29fd7e Merge remote-tracking branch 'openstreetmap/pull/1030' into next 2017-02-12 15:04:50 +00:00
Herve Saint-Amand
fcba1a9857 A better way to contrain the width of the message box whilst also allowing it to shrink on narrow displays 
Setting a hard "width" it very compatible, but won't squeeze on narrow screens. Setting max-width works well, except in Outlook and Hotmail. We resort to old skool table tricks: a table with width=100%, with 3 columns, only oneof which, the middle one, had content, and a fixed with. This works.
 2017-02-12 12:04:43 +00:00
Herve Saint-Amand
6964c44584 Two more "nowrap" instructions removed to accommodate narrower displays 2017-02-11 21:08:36 +00:00
Herve Saint-Amand
acf933055f Remove nowrap on footer text, to accommodate narrow screens 2017-02-11 20:51:03 +00:00
Herve Saint-Amand
44d4a521a3 Set font on title 2017-02-11 20:50:28 +00:00
Herve Saint-Amand
82a6bb0d5a Make the mails squeezable on narrow screens 2017-02-09 21:39:49 +00:00
Tom Hughes
c439f957ae Only add traces for POST requests 2017-02-09 21:07:44 +00:00
Tom Hughes
92fe7a8506 Only create diary entries for POST requests 2017-02-09 21:07:18 +00:00
Herve Saint-Amand
852cc97707 Fixed alignment & underlining bugs in Outlook / WinMail 2017-02-09 20:38:02 +00:00
Tom Hughes
afa82bd2b1 Render message properly on error 2017-02-09 20:20:55 +00:00
Tom Hughes
4709d90594 Only send messages for POST requests 2017-02-09 19:37:48 +00:00
Herve Saint-Amand
f2645dd699 Avoid squished-up grey borders around the message on narrow screens 2017-02-08 23:23:46 +00:00
Herve Saint-Amand
5a6c0eb49e Even out the widths of the white bars around the message box 2017-02-08 23:00:52 +00:00
Herve Saint-Amand
68b1d33917 Better alt text for the logo 
This is what clients that block images will display, so shorter is better.
 2017-02-08 22:37:00 +00:00
Herve Saint-Amand
cca78f9790 Use the same fonts for the footer text as for the rest of the mail 2017-02-08 22:36:21 +00:00
Herve Saint-Amand
07531e8477 Fix title alignment in Outlook/WindowsMail 2017-02-08 22:35:42 +00:00
Herve Saint-Amand
448a68447f Don't display a box at all if the note event doesn't include a comment body 
Before this it just displays en empty box, which looks wrong.
 2017-02-08 22:22:21 +00:00
Herve Saint-Amand
68a4002366 Removed italic styling on message body 
Contributor BushmanK pointed out quite rightly that italic isn't appropriate for a full body of text.
 2017-02-08 21:34:10 +00:00
Herve Saint-Amand
f3941b7ee0 Force the font on every <p> tag 
Without this Outlook and Windows Mail don't honour the font set at the top level. Note that this change predates all the screenshots I uploaded to the wiki on 2017-02-02, I'd just forgotten to commit them.
 2017-02-08 21:34:10 +00:00
Herve Saint-Amand
60e1895da1 Tweak cell width for proper centering on narrow screens 2017-02-08 21:34:10 +00:00
Tom Hughes
579e323d09 Only record a visible object if it exists 
Fixes #1430
 2017-02-08 09:54:14 +00:00
Tom Hughes
f435fce007 Link GPX fixture files instead of stubbing 2017-02-05 17:26:31 +00:00
Tom Hughes
94ab5c3635 Make TraceController#list sort by id instead of timestamp 
The effect is much the same but id is guaranteed to give a stable
sort if two traces have the same timestamp.
 2017-02-05 16:18:56 +00:00
Tom Hughes
a28f264ad1 Fix rubocop warnings 2017-02-05 14:33:48 +00:00
Tom Hughes
c57d2b29fc Merge remote-tracking branch 'openstreetmap/pull/1401' 2017-02-05 13:50:07 +00:00
Tom Hughes
c8671c137a Update rubocop 2017-02-05 11:12:37 +00:00
Tom Hughes
7793cd27ab Merge remote-tracking branch 'openstreetmap/pull/1423' 2017-02-02 17:21:41 +00:00
Andy Allan
c55169659c Add a user_role factory 
Naming the association in the model makes the relationship easier
to express in the factory.
 2017-02-02 12:35:29 +00:00
Frederik Ramm
ad2b4fe12a Reduce maximum changeset size to 10k changes 
Ten thousand changes ought to be enough for any normal mapping activity.

Automatic edits and imports are controlled by scripts anyway so it doesn't
make a difference to them as they just have to adapt the limit.

The reason for my suggestion is that large changesets are becoming
increasingly difficult to handle due to frequent timeouts when trying
to load and process them.

The changeset size limit is returned by the API in the "capabilities" request
so client software that honours that information will automatically pick up
the new limit.

Closes #1259
 2017-01-31 18:15:42 +00:00
Herve Saint-Amand
223a12caf8 That new message in the HTML version of the mail should also be added to the plain text version of the mail 
Duh.
 2017-01-28 23:29:44 +00:00
Herve Saint-Amand
a371aad9ac Renamed apply_inline_css to style_message as suggested 2017-01-28 23:08:25 +00:00
Herve Saint-Amand
f83b719f03 Set border=0 on that img 
IE9 shows a big nasty blue border on linked images if you don't specify border=0
 2017-01-27 23:20:11 +00:00
Herve Saint-Amand
1def88b5d2 Left-align logo 2017-01-25 23:01:37 +00:00
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
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
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
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