Commit graph

10027 commits

Author SHA1 Message Date
Tom Hughes
57f5b7840e Fix rubocop warnings 2019-12-04 19:31:53 +00:00
Tom Hughes
743a764f3b Remove version lock on autoprefixer-rails 2019-12-04 19:01:26 +00:00
Tom Hughes
95c3e3b6ff Update bundle 2019-12-04 18:42:47 +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
f1c6a87aa1
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
Remove expand_bbox endpoint
2019-12-04 12:48:34 +01:00
Tom Hughes
ff3abf5dd8 Merge remote-tracking branch 'upstream/pull/2450' 2019-12-04 11:33:31 +00: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
translatewiki.net
40809825e8 Localisation updates from https://translatewiki.net. 2019-12-02 09:39:56 +01:00
translatewiki.net
32b5a398a5 Localisation updates from https://translatewiki.net. 2019-11-28 16:50:26 +01:00
Tom Hughes
e6667b7ff5 Fix rubocop warnings 2019-11-27 11:47:16 +00:00
Tom Hughes
461f99dfe0 Merge remote-tracking branch 'upstream/pull/2447' 2019-11-27 11:11:55 +00:00
Andy Allan
a41d500b9f Create an ApplicationRecord for models to inherit from
This is the default for Rails 5+, and also paves the way for
multiple database support.
2019-11-27 11:50:48 +01:00
Tom Hughes
a3a95616d9 Drop bowser, which is no longer used 2019-11-26 18:56:12 +00:00
Guillaume Rischard
7e390ec89b Always use http to talk to josm
See discussion in #2445 and resulting conclusion that JOSM no
longer even listens on the https port.

Closes #2446
2019-11-26 18:53:54 +00:00
translatewiki.net
cd0254d148 Localisation updates from https://translatewiki.net. 2019-11-25 15:43:37 +01:00
Tom Hughes
cc14fbe36e Update to bowser 2.7.0 2019-11-25 12:45:53 +00:00
Tom Hughes
621780c9cf Disable host validation in development mode 2019-11-25 12:45:39 +00:00
Tom Hughes
c672a73de3 Merge remote-tracking branch 'upstream/pull/2423' 2019-11-24 11:37:48 +00:00
Tom Hughes
c468af5fbd Errors have text/plain as the content type 2019-11-24 11:05:02 +00:00
Tom Hughes
1f4d48eaf3 Fix some deprecation warnings 2019-11-24 11:05:02 +00:00
Tom Hughes
22cd2314e5 Update to rails 6.0.1 2019-11-24 11:05:02 +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
Tom Hughes
bf68eb6607 Fix rubocop warning 2019-11-24 11:04:35 +00:00
Tom Hughes
84d54522f2 Update bundle 2019-11-24 10:49:26 +00:00
Tom Hughes
b34e976bb5 Switch to fork of actionpack-page_caching with rails 6 support 2019-11-24 10:47:10 +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
translatewiki.net
7c89e7c0b4 Localisation updates from https://translatewiki.net. 2019-11-21 15:12:33 +01:00
Tom Hughes
db63076247 Merge remote-tracking branch 'upstream/pull/2442' 2019-11-20 19:54:24 +00:00
Tom Hughes
81fb26d840 Merge remote-tracking branch 'upstream/pull/2434' 2019-11-20 19:17:29 +00:00
Tom Hughes
6ec02bcdb2 Merge remote-tracking branch 'upstream/pull/2440' 2019-11-20 19:01:13 +00:00
Tom Hughes
abf35dd756 Merge remote-tracking branch 'upstream/pull/2441' 2019-11-20 18:57:50 +00:00
Tom Hughes
f1905095ed Merge remote-tracking branch 'upstream/pull/2439' 2019-11-20 18:56:42 +00:00
hikemaniac
3ed62aa115 Updated colours of landuse icons, added icon for natural=scrub 2019-11-20 19:55:51 +01: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
Andy Allan
25ebf87e5a Rename UserPreference controller methods to follow rails conventions more closely 2019-11-20 16:09:48 +01:00
Andy Allan
bc850d1d37 Move Relation.to_xml and to_xml_node out of the model and into tests 2019-11-20 15:45:28 +01:00
Andy Allan
2b1bac1279 Move Way.to_xml and to_xml_node out of the model and into tests
This code is only used in the tests. Refs #2433
2019-11-20 15:31:47 +01:00
Andy Allan
56d9b8a4ce Remove the users.nearby column
Refs #2417 and #2432
2019-11-20 15:07:42 +01:00
Tom Hughes
6852bc9c92 Update bundle
Closes #2438
2019-11-20 00:03:36 +00:00
translatewiki.net
ad04bd57f2 Localisation updates from https://translatewiki.net. 2019-11-18 18:23:07 +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
Tom Hughes
893e6fe689 Update bundle 2019-11-14 19:11:45 +00:00
translatewiki.net
6a77bbe544 Localisation updates from https://translatewiki.net. 2019-11-14 17:28:11 +01:00
Tom Hughes
efcb56b68b Merge remote-tracking branch 'upstream/pull/2433' 2019-11-14 12:24:50 +00:00