Commit graph

2083 commits

Author SHA1 Message Date
Tom Hughes
1c77d2432e Avoid using rinku's auto_link helper
It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.
2017-10-27 19:45:32 +01:00
Tom Hughes
0b0ff1bcc5 Remove reference to large screen stylesheet
The separate large screen stylesheet was removed in 4dceacdeb but
we are still referencing it on Internet Explorer.
2017-10-09 13:47:48 +01:00
Tom Hughes
6e0ca57e2f Fix typo that means fe0f4543c1 has never worked 2017-10-09 08:39:14 +01:00
Wille Marcel
a402e811da Add padding between the last diary post and the pagination links
Closes #1634
2017-09-08 16:50:09 +01:00
Tom Hughes
a70898be6d Make sure we show errors correctly when resetting a password 2017-08-11 17:45:57 +01:00
Tom Hughes
85b0098b1c Make sure the account form is POSTed
Fixes #1601
2017-08-02 15:32:13 +01:00
Tom Hughes
bc10bc8758 Merge remote-tracking branch 'upstream/pull/1603' 2017-08-02 15:02:39 +01:00
Andy Allan
389095df1c Remove unused user save template.
This template isn't used, since all the controller methods redirect
to other views.
2017-08-02 14:48:04 +01:00
Tom Hughes
f258af223b Fix user settings form
Fixes #1601
2017-08-01 19:25:07 +01:00
Tom Hughes
24fc94944b Change user forms to use current user instead of @user 2017-07-27 19:40:20 +01:00
Andy Allan
c819bec8b7 Use a current_user helper for accessing the logged in user in all views. 2017-07-27 10:07:51 +01:00
Andy Allan
cbf71f04c2 Hide contributor terms details, unless the user hasn't agreed
It's no longer important to show when users agreed to the contributor terms.
For users that haven't agreed, we still show their status on their profile.

Logic was also re-written to avoid lots of `if not` things, and tests added.
2017-07-05 12:39:52 +01:00
Tom Hughes
5d740d8733 Don't disable search submission buttons on form submission 2017-06-30 10:01:22 +01:00
Tom Hughes
fe1e28b4f4 Fix more parameter sanitisation issues and add tests 2017-06-29 20:52:57 +01:00
Tom Hughes
117f0e8226 Sanitize parameters for various paged views 2017-06-29 10:55:53 +01:00
Tom Hughes
3893fd72a9 Fix some tests for changes in rails 5 2017-06-27 08:26:44 +01:00
Andy Allan
396f2e28dd Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509 2017-06-23 14:03:57 +01:00
Tom Hughes
3b2d1886eb Make delete button translatable 2017-06-03 12:04:00 +01:00
Hamel Desai
fa7b3022a8 Add delete button to message view
Fixes #1504
Closes #1557
2017-06-02 20:31:59 +01:00
Tom Hughes
80d27a7fae Sanitise parameters used in URL generation 2017-06-02 20:27:07 +01:00
Tom Hughes
4ef7b2c651 Remove duplicate size specification for user image
Either the size or the width and height can be passed but passing
both doesn't make any sense and in rails 5.0 will error.
2017-06-02 20:27:07 +01:00
Tom Hughes
3a16b68368 Use POST when editing GPX trace details
Fixes #1533
2017-05-01 16:56:02 +01:00
daganzdaanda
8b68acec3e Move list of containing relations to top of browse views
Moves the list of containing relations to above the list of
members for ways and relations - nodes have no equivalent list
so no change is needed there.

Fixes #794
Closes #1501
2017-04-24 20:25:22 +01:00
Matt Amos
c7391595d8 Credit the whole of UCL, rather than just the Bartlett / VR centre. 2017-04-22 11:47:12 +01:00
Herve Saint-Amand
2ae479e3f3 Fix indentation in email template
The plain text templates had nice indentation in the source however that
got reflected in the output, which was visibly and needlessly indented.

Closes #1512
2017-04-08 16:36:40 +01:00
Tom Hughes
1b9ea430d1 Make the publisher URL configurable, with no default 2017-03-22 18:42:58 +00:00
Tom Hughes
24271b75bd Use canonical-rails gem to generate canonical URLs 2017-03-22 18:16:53 +00:00
Tom Hughes
419edf951d Add a canonical URL to the head 2017-03-22 17:14:55 +00:00
Tom Hughes
5cdb835de3 Show offline/readonly messages as normal flash messages 2017-03-10 16:30:04 +00:00
Tom Hughes
dff0eef787 Remove inline styles 2017-03-05 19:51:01 +00:00
Tom Hughes
d7b4f88d5e Remove inline javascript from page header 2017-03-01 21:19:32 +00:00
Tom Hughes
293fb99467 Remove inline javascript from id views 2017-03-01 18:07:22 +00:00
Tom Hughes
1b21b8a209 Remove inline javascript from potlatch2 view 2017-03-01 00:12:42 +00:00
Tom Hughes
8c3d16ecc4 Remove inline javascript from potlatch view 2017-02-28 20:41:22 +00:00
Tom Hughes
56e96d856c Merge remote-tracking branch 'openstreetmap/pull/1469' 2017-02-28 00:21:23 +00:00
Tom Hughes
d13348c0ea Remove inline javascript from user views 2017-02-27 22:51:03 +00:00
Herve Saint-Amand
b69e8b5c42 Included greeting string in changeset_comment_notification email 2017-02-27 22:36:09 +00:00
Tom Hughes
57443546f8 Revert "Update iD frame parameters if the parent URL changes"
This reverts commit a6fa8cc273.
2017-02-27 14:31:56 +00:00
Tom Hughes
a6fa8cc273 Update iD frame parameters if the parent URL changes
Fixes #1468
2017-02-27 13:23:27 +00:00
Tom Hughes
392b68a65f Merge remote-tracking branch 'openstreetmap/pull/1436' 2017-02-23 10:06:42 +00:00
Tom Hughes
425f3f309b Use created at for RSS format with note#show
This matches other formats and is also what the tests expect.
2017-02-20 08:50:56 +00:00
Matt Amos
469f64384d Implement the OWG credit policy for hosting partners.
See https://operations.osmfoundation.org/policies/hosting/
2017-02-17 11:52:04 +00:00
Herve Saint-Amand
a520f1251c merging master into html-mail-fixes 2017-02-12 21:05:38 +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
Herve Saint-Amand
852cc97707 Fixed alignment & underlining bugs in Outlook / WinMail 2017-02-09 20:38:02 +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