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

5995 commits

Author SHA1 Message Date
Andy Allan
7f9dacbada Add bootstrap 4 2019-12-11 10:24:57 +01:00
Andy Allan
cffff1635d Rename bootstrap-tooltips file 
This avoids clashing with including upstream bootstrap
 2019-12-11 10:24:05 +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
57f5b7840e Fix rubocop warnings 2019-12-04 19:31:53 +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
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
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
Tom Hughes
cc14fbe36e Update to bowser 2.7.0 2019-11-25 12:45:53 +00:00
Tom Hughes
1f4d48eaf3 Fix some deprecation warnings 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
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
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
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
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
efcb56b68b Merge remote-tracking branch 'upstream/pull/2433' 2019-11-14 12:24:50 +00:00
Andy Allan
4e7c0c3008 Move Node.to_xml and to_xml_node out of model and into tests 
This code is only used in the tests for creating 'fixture' payloads,
so it shouldn't be kept in the models.
 2019-11-13 17:01:40 +01:00
Andy Allan
dd294f89b8 Ignore the users.nearby column 
This is the first step of removing the column, see #2417. It needs to be
deployed before a migration to remove it, since the columns are
cached in ActiveRecord and things break if objects exist in memory
that expect the column to be there.
 2019-11-13 14:19:32 +01:00
Tom Hughes
551e4295c0 Merge remote-tracking branch 'upstream/pull/2429' 2019-11-10 09:50:48 +00:00
Chris Gadd
9e64fe73e2 Update hut icons 2019-11-10 14:53:51 +13:00
Enock Seth Nyamador
fef9c8938f add SOTM Africa 2019 banner 2019-11-09 23:37:30 +00:00
mmd-osm
fc8923c305 Remove expand_bbox endpoint 2019-11-09 21:08:40 +01:00
Tom Hughes
816ee8ec92 Merge remote-tracking branch 'upstream/pull/834' 2019-11-07 19:26:03 +00:00
Tom Hughes
90e2a144dc Merge remote-tracking branch 'upstream/pull/2412' 2019-10-30 19:20:30 +00: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
15865b5a8d Remove node/way/relation Search API 
This API clearly shows its age, having never been fully implemented
and simply returning 100 ways (or 2000 relations) at random matching
the provided tags.

It is, as far as I'm aware, completely unused. While it provides a
good amount of humour to anyone who reads the code, the time as come
for it to be retired.
 2019-10-23 11:41:05 +02: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
58e95f7ea4 Merge remote-tracking branch 'upstream/pull/2354' 2019-10-22 20:33:45 +01:00
Tom Hughes
30accae458 Update to sprockets 4.x 2019-10-22 20:20:43 +01:00
Manfred Stock
c3300d8c93 Turn wikimedia_commons values into links 
This turns the value of the 'wikimedia_commons' tag into a link to the
respective page on commons.wikimedia.org (if it is a 'File:' or 'Category:'
item) by enhancing the browse tags helper. See [1] for the tag description.

[1] http://wiki.openstreetmap.org/wiki/Key:wikimedia_commons
 2019-10-19 16:04:09 +02:00
Tom Hughes
936967d0cb Allow administrators to see deleted diary comments 2019-10-17 12:16:28 +01:00
Tom Hughes
0def53c094 Remove unused banner images 2019-10-16 13:59:02 +01:00
Fazle Rabbi
9e1c11626d
add sotm_asia_2019.png for StoM Asia 2019 banner image 2019-10-16 17:04:55 +06: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