Kristjan
f771df86d2
removed end tag ("source" is a self-closing tag)
2019-12-24 23:43:49 +01:00
Andy Allan
dddef7672e
Use _html suffix to avoid using raw when displaying translated strings
...
This is safer than raw, since any user input is still escaped.
2019-12-22 11:28:18 +01:00
Andy Allan
217f616630
Use _html suffix to avoid using raw when displaying translated strings
...
This is safer than raw, since any user input is still escaped.
2019-12-20 14:32:00 +01:00
Andy Allan
dfedf85b6c
Use _html suffix to avoid using raw when displaying translated strings
...
This is safer than raw, since any user input is still escaped.
2019-12-20 10:29:07 +01:00
Andy Allan
1ff7e3ac71
Replace custom css class with bootstrap inline utility
...
This has actually been broken since the controller was renamed,
but nobody noticed.
2019-12-19 19:31:52 +01:00
Andy Allan
1586e2ba80
Use badges for the trace visibility labels
...
Our green is currently just on the side of triggering black text,
hence the override to make it look consistent with the other badges.
2019-12-19 19:18:00 +01:00
Andy Allan
a3e3be007e
Use text-danger style for pending trace warning
2019-12-19 19:15:36 +01:00
Andy Allan
410fe87045
Use a warning alert for reporting new issues
...
This removes custom colouring for the alert. The list overrides
need to stay until we unpick more of our custom styling.
2019-12-19 17:50:22 +01:00
Tom Hughes
32fa124698
Merge remote-tracking branch 'upstream/pull/2452'
2019-12-18 18:23:42 +00:00
Tom Hughes
6f8966e7c1
Note events use "opened" not "open" as the status
2019-12-16 22:26:33 +00:00
Tom Hughes
a2ad08b2e2
Use correct link for settings page
2019-12-12 19:12:38 +00:00
Tom Hughes
9153fd3559
Fix link in error page when a user has public edits disabled
2019-12-12 18:50:30 +00:00
Andy Allan
13f0591605
Wrap table header rows in thead
2019-12-11 17:22:23 +01:00
Andy Allan
dc96834ebb
Use bootstrap cards to spruce up the help page
2019-12-11 10:24:57 +01:00
Tom Hughes
86b355c4df
Use delete method correctly when deleting traces
...
Fixes #2453
2019-12-04 21:06:19 +00:00
Tom Hughes
fc8189685e
Fix erblint warnings
2019-12-04 19:58:21 +00:00
Tom Hughes
6a68e7676d
Merge remote-tracking branch 'upstream/pull/2451'
2019-12-04 16:08:26 +00:00
Andy Allan
35370684e5
Make the back button link to the inbox when reading received messages
2019-12-04 16:42:57 +01:00
Andy Allan
44c6fdc273
Use the conventional 'destroy' method name for destroying traces
2019-12-04 11:59:18 +01:00
Tom Hughes
dba3940571
Replace content_tag_for with a simple tr element
2019-12-03 22:54:55 +00:00
Tom Hughes
b6ecdb7507
Drop use of record_tag_helper
...
We only had one place using it and there's no sign of
upstream doing a rails 6 compatible release.
2019-11-24 11:05:02 +00:00
Mayank Tankhiwale
4596fa9420
Fix 2402 PR lint errors
2019-11-23 22:22:29 +05:30
Mayank Tankhiwale
11cd1c9fc1
Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website
2019-11-23 20:32:47 +05:30
Mayank Tankhiwale
9f7ec064e4
Fix #2402
...
1. Modified about routes
2. Accept the new params in site#about
3. Update about.html.erb
2019-11-23 20:26:19 +05:30
Tom Hughes
81fb26d840
Merge remote-tracking branch 'upstream/pull/2434'
2019-11-20 19:17:29 +00:00
Tom Hughes
b5d4c262dd
Switch to using jbuilder for JSON templates
2019-11-20 18:54:04 +00:00
Andy Allan
8ad88b9ddc
Move user preference XML generation to a view
2019-11-20 16:39:23 +01:00
rubynho
a65ccb55b5
Improve parameters alignment
2019-11-17 16:08:38 -02:00
rubynho
5542fd2bce
Pluralize notifier message when other than 1
...
Correctly pluralize the word point in the notification message based
on the given possible points.
2019-11-17 14:55:20 -02:00
Andy Allan
7410b59a50
Remove unused trace_optionals partial
...
Although the code to render the partial runs, `yield :optionals`
was removed from the site layout in 2013. So the code has been
ineffective since then.
2019-10-30 15:02:35 +01:00
Andy Allan
fb709531ba
Convert various moderator? tests to use cancancan permissions checks
2019-10-23 11:26:16 +02:00
Andy Allan
60ecfde65c
Convert various administator? tests to use cancancan permissions checks
2019-10-23 10:52:12 +02:00
Tom Hughes
936967d0cb
Allow administrators to see deleted diary comments
2019-10-17 12:16:28 +01:00
Tom Hughes
3b636ddb6f
Don't try and commas to the trace size
...
It breaks pluralisation lookups in the locale and in any case
adding a comma every three digits is locale specific.
Fixes #2388
2019-10-13 10:54:47 +01:00
Tom Hughes
d99374434e
Merge remote-tracking branch 'upstream/pull/2362'
2019-08-28 17:49:35 +01:00
Tom Hughes
783b5e3729
Merge remote-tracking branch 'upstream/pull/1926'
2019-08-28 17:23:10 +01:00
Andy Allan
0baa293699
Make the logo on the error page clickable
...
Also use the same picture/srcset code as on the main header
2019-08-28 16:02:34 +02:00
Andy Allan
a7092491b0
Merge pull request #2266 from systemed/patch-2
...
Add user_<uid> class to diary entry div
2019-08-28 15:20:21 +02:00
Sam Jenkins
42345cb9b7
Include any current search terms in the page title
...
Fixes #2336
Closes #2347
2019-08-14 18:58:08 +01:00
Tom Hughes
91a37235ac
Remove support for old style user images
2019-07-16 22:33:26 +01:00
Tom Hughes
6c202448ad
Move user images to Active Storage with paperclip as a fallback
2019-07-09 19:17:30 +01:00
Tom Hughes
d021bdf5cf
Merge remote-tracking branch 'upstream/pull/2223'
2019-07-07 16:14:32 +01:00
Tom Hughes
e8e44dbb9f
More tweaks for RTL email
...
Fixes #2297
2019-07-03 14:19:45 +01:00
Tom Hughes
f9109b7a75
Fix styling of email notifications in RTL languages
...
Fixes #2297
2019-07-03 09:49:46 +01:00
mmd
11cc4a5e60
Merge branch 'master' into patch/view_migration
2019-06-27 22:40:51 +02:00
mmd-osm
cf3cf5216f
Avoid unnecessary arrays
2019-06-27 18:33:12 +02:00
mmd-osm
d0de9967b9
Simplify partial rendering
2019-06-26 22:29:18 +02:00
mmd-osm
45e7c9a32e
Avoid using @variables in partials
2019-06-26 21:34:40 +02:00
Tom Hughes
a66c34991a
Merge remote-tracking branch 'upstream/pull/2280'
2019-06-26 19:57:12 +01:00
Tom Hughes
89f8f7af35
Merge remote-tracking branch 'upstream/pull/2281'
2019-06-26 19:19:58 +01:00
