Commit graph

9599 commits

Author SHA1 Message Date
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
translatewiki.net
54d805da33 Localisation updates from https://translatewiki.net. 2019-10-28 16:38:58 +01:00
Tom Hughes
4b2d6436ce Merge remote-tracking branch 'upstream/pull/2413' 2019-10-27 18:59:35 +00:00
translatewiki.net
4035c790f8 Localisation updates from https://translatewiki.net. 2019-10-24 22:14:22 +02:00
Bryan Housel
0f3309291e Update to iD v2.16.0 2019-10-24 00:03:40 -04:00
Tom Hughes
56798e9435 Merge remote-tracking branch 'upstream/pull/2403' 2019-10-23 18:48:17 +01:00
Tom Hughes
8ddd02a2a1 Merge remote-tracking branch 'upstream/pull/2411' 2019-10-23 10:55:02 +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
Andy Allan
edd49e8582 Remove references to libpgosm during travis runs
These were removed from the structure file in 098e73479b
2019-10-23 09:33:05 +02:00
Tom Hughes
8072a82f1d Exclude node_modules form eslint checks 2019-10-22 20:37:39 +01:00
Tom Hughes
58e95f7ea4 Merge remote-tracking branch 'upstream/pull/2354' 2019-10-22 20:33:45 +01:00
Tom Hughes
18c5e16225 Merge remote-tracking branch 'upstream/pull/2408' 2019-10-22 20:29:00 +01:00
Tom Hughes
30accae458 Update to sprockets 4.x 2019-10-22 20:20:43 +01:00
translatewiki.net
ede7f4af55 Localisation updates from https://translatewiki.net. 2019-10-21 17:12:30 +02:00
Matt Amos
689821c224 Ooops, forgot to commit changes to db/structure.sql 2019-10-21 15:05:16 +01:00
Matt Amos
d3d4cff1cf Add pure SQL version of xid_to_int4. 2019-10-21 14:47:46 +01:00
Matt Amos
afe679349f Merge remote-tracking branch 'openstreetmap/master' into mac-os-x-install 2019-10-21 14:22:59 +01:00
Matt Amos
5895ae62af Add section on using rbenv, separate from main installation instructions. 2019-10-21 14:18:25 +01:00
Tom Hughes
3ece776664 Merge remote-tracking branch 'upstream/pull/2400' 2019-10-21 10:31:06 +01:00
Andy Allan
ac3c26c058 Rephrase note on vagrant providers, now that we support multiple providers 2019-10-21 11:27:48 +02:00
Tom Hughes
24cf580979 Suppress new rubocop warning 2019-10-20 19:48:36 +01:00
Tom Hughes
7321023bd5 Update bundle 2019-10-20 19:44:28 +01:00
Tom Hughes
3e17c3aab6 Drop postgres 9.6 specific setting from structure.sql
Closes #2404
2019-10-20 19:22:47 +01:00
Tom Hughes
ce1f0c249e Tidy up C database function support in travis 2019-10-20 19:15:11 +01:00
Tom Hughes
9508368d37 Merge remote-tracking branch 'upstream/pull/2383' 2019-10-20 19:13:30 +01:00
Matt Amos
cc101f582d Fix installation instructions for Mac OS X
The installation of `libxml-ruby` was broken because it was picking up the system version of the libxml2 library. By setting a `bundler` config item, it's possible to point it to the right place.

Also updated the instructions for `phantomjs`, which Homebrew has moved to a cask (and is now not officially supported), and added some of the extra command line tools that are used (`pngcrush`, `optipng`, etc...)
2019-10-18 16:25:30 +01:00
translatewiki.net
1bf2a540d0 Localisation updates from https://translatewiki.net. 2019-10-17 20:10:51 +02:00
Tom Hughes
936967d0cb Allow administrators to see deleted diary comments 2019-10-17 12:16:28 +01:00
Tom Hughes
752f190a24 Merge remote-tracking branch 'upstream/pull/2398' 2019-10-16 14:20:44 +01:00
Tom Hughes
0def53c094 Remove unused banner images 2019-10-16 13:59:02 +01:00
Andy Allan
31db8dffc1 Rephrase changeset comment notifications to clarify the time is for the comment
Refs https://trac.openstreetmap.org/ticket/5307

There's still an unfortunate double use of "comment" to mean both the
ChangesetComment and also the changeset's `comment` tag, but I can't see a
simple way to fix that.
2019-10-16 14:48:45 +02:00
Fazle Rabbi
9e1c11626d
add sotm_asia_2019.png for StoM Asia 2019 banner image 2019-10-16 17:04:55 +06:00
Fazle Rabbi
4b6554ee58
modify banners.yml to add SotM Asia 2019 2019-10-16 17:01:57 +06:00
Andy Allan
41ba976d5a DMCA page is now available over https 2019-10-16 11:25:16 +02:00
Andy Allan
6b6245365a
Merge pull request #2374 from tordans/patch-1
Add reference to settings.local.yml-file in installation.md
2019-10-16 10:32:17 +02:00
translatewiki.net
ea037d0258 Localisation updates from https://translatewiki.net. 2019-10-14 17:39:42 +02:00
Tom Hughes
4b8f0a7389 Give factory created traces a size
Traces which are marked as inserted are expected to have a size.
2019-10-13 12:18:57 +01:00
Tom Hughes
f0324b60b1 Make trace.trace.count_points a plural string 2019-10-13 10:55:02 +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
hikemaniac
651342197a Added landuse icons and fixed some mistakes in browse.scss
Closes #2385
2019-10-09 17:48:07 +01:00
Matt Amos
7fb5bcaf3f Clarify that there is no pure SQL version of xid_to_int4 for diff replication. 2019-10-09 15:18:05 +01:00
Matt Amos
2423d86914 Make documentation clearer and shorter by deferring complicated shared-library SQL explanations to 'advanced' documentation. Also mention in the CONFIGURING.md. 2019-10-09 12:13:27 +01:00
Tom Hughes
d96a5c9c87 Switch to use v4.0 of the Facebook API for authentication 2019-10-08 18:36:27 +01:00
Tom Hughes
3938f1008e Update rubocop todo 2019-10-07 20:38:03 +01:00
Tom Hughes
bbd03b1bae Update bundle 2019-10-07 20:30:01 +01:00
translatewiki.net
059da1617b Localisation updates from https://translatewiki.net. 2019-10-07 19:56:25 +02:00
Matt Amos
809b194030 Reverting part of the db/structure.sql change which had been unintentionally committed. (perhaps PG version difference?) 2019-10-04 15:38:42 +01:00
Matt Amos
098e73479b Remove shared lib PG functions from committed DB structure. 2019-10-04 13:40:27 +01:00
Matt Amos
ced8ac86ab Remove need for shared library PostgreSQL functions
This repo contains code for three functions to be loaded into PostgreSQL as a shared library:

1. `maptile_for_point`, which is used only by the `/changes` API call. This API call is little-used and IMHO should be deprecated and removed. However, even now it's hardly on the hot path for most development activities.
2. `tile_for_point`, which is used only in migrations. At this point, it seems unlikely that anyone will be doing a migration on existing data which would call this function (most developers will be running migrations on an empty database, to set it up).
3. `xid_to_int4`, which is only used for replication using Osmosis and isn't used in the Rails code at all. Hopefully this will be replaced Real Soon Now, but until then it's a quite advanced feature that most developers won't need.

Therefore, this patch proposes to replace the above three shared library functions with SQL implementations of the first two. These are _much_ slower - by a factor of about 30x, however this makes no difference when they're run on a completely empty database. In return, we're able to drop a dependency on the PostgreSQL server development package, and clean a few lines out of the installation instructions.

It's still possible to make and install the shared library functions, and I've included instructions about how to do that - although it shouldn't be necessary for the vast majority of `openstreetmap-website` developers.
2019-10-04 13:25:00 +01:00