Commit graph

9531 commits

Author SHA1 Message Date
Tom Hughes
ee8ed3c682 Add missing space 2019-07-03 08:28:22 +01:00
Tom Hughes
37966859da Revert "Block indexing of diary entries"
This reverts commit fc67e63589.
2019-07-02 19:45:23 +01:00
Tom Hughes
ea2c790a42 Fix text direction for traditional chinese 2019-07-02 19:45:23 +01:00
translatewiki.net
a0660c009c Localisation updates from https://translatewiki.net. 2019-07-01 09:43:51 +02:00
Tom Hughes
5584404412 Merge remote-tracking branch 'upstream/pull/2294' 2019-06-30 15:27:25 +01:00
Bryan Housel
12cdc58688 Update to iD v2.15.3 2019-06-30 10:15:38 -04:00
Tom Hughes
b75cf73a54 Merge remote-tracking branch 'upstream/pull/2293' 2019-06-30 11:57:56 +01:00
Abijeet Patro
390c7d7624
Fix spellings from aggree to agree
As reported on https://translatewiki.net/wiki/Thread:Support/Found_typo_in_https://translatewiki.net/w/i.php%3Ftitle%3DOsm:Users.terms.tou_explain_html/en
2019-06-30 16:14:38 +05:30
Tom Hughes
78ecc76067 Update list of dependencies to install 2019-06-30 00:25:21 +01:00
mmd-osm
84faaaf795 Rubocop 2019-06-28 22:05:38 +02:00
mmd-osm
fb953006a1 Replace respond_to with render xml format 2019-06-28 21:56:42 +02:00
mmd-osm
2bfb976b8e Revert XML default for routes 2019-06-28 21:35:02 +02:00
Tom Hughes
4e3527f519 Fix text direction for traditional chinese 2019-06-27 21:53:01 +01:00
mmd
11cc4a5e60
Merge branch 'master' into patch/view_migration 2019-06-27 22:40:51 +02:00
mmd-osm
8ad1ce9798 Refactoring 2019-06-27 22:28:40 +02:00
mmd-osm
b9ae40d978 Remove non functioning changeset_cache, user_display_name_cache 2019-06-27 21:26:11 +02:00
translatewiki.net
c1c277186e Localisation updates from https://translatewiki.net. 2019-06-27 18:37:17 +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
b25f10eb56 Merge remote-tracking branch 'upstream/pull/2282' 2019-06-26 19:23:18 +01:00
Tom Hughes
89f8f7af35 Merge remote-tracking branch 'upstream/pull/2281' 2019-06-26 19:19:58 +01:00
Andy Allan
fd61706e4c Split some extremely long strings over multiple lines using squiggly heredocs
I'm not entirely convinced that testing walls of text like this is useful
anyway, but at least this approach makes the lines significantly less long.
2019-06-26 18:24:57 +02:00
Andy Allan
0dbb33016f Rename @edits variable to @changesets, for clarity 2019-06-26 17:07:49 +02:00
Andy Allan
2398614349 Add support for an unversioned 'versions' API call
This will eventually replace the unversioned 'capabilities' call.
Client applications can use this versions call to find out what versions
are available, if they support multiple versions. The capabilities
of each version, and the format of the capabilities call, is then
able to change between versions. If a client only supports one version
they can jump straight to the versioned capabilities call.

Additionally, supported versions are now a list of version identifiers,
without any implications surrounding min/max values (e.g. guesswork
for supported intermediate versions).

Fixes #2162
2019-06-26 16:52:10 +02:00
Tom Hughes
cbea796ef4 Merge remote-tracking branch 'upstream/pull/2207' 2019-06-26 14:30:30 +01:00
Tom Hughes
899fc66a62 Merge remote-tracking branch 'upstream/pull/2279' 2019-06-26 14:07:29 +01:00
Andy Allan
f77d4dc4f7 Avoid stating the action to render when it just matches the current action 2019-06-26 14:50:35 +02:00
Tom Hughes
f280dcb2d7 Merge remote-tracking branch 'upstream/pull/2278' 2019-06-26 13:36:44 +01:00
Andy Allan
0211141c08 Simplify render calls for changesets 2019-06-26 14:25:34 +02:00
Andy Allan
3914050fcc Simplify partial rendering when the partial is named after the model 2019-06-26 14:13:09 +02:00
Andy Allan
c24b0e9399 Rework to ensure views are named after the controller method name 2019-06-26 13:45:40 +02:00
Tom Hughes
16c3c53302 Merge remote-tracking branch 'upstream/pull/2271' 2019-06-26 11:22:19 +01:00
Tom Hughes
5b4636d521 Fix text direction for traditional chinese 2019-06-25 08:20:18 +01:00
Tom Hughes
1817032c87 Update bundle 2019-06-25 08:16:36 +01:00
translatewiki.net
4440730c9b Localisation updates from https://translatewiki.net. 2019-06-24 17:02:58 +02:00
Tom Hughes
d2d5d48f29 Allow signups to be blocked by MX host 2019-06-23 11:21:03 +01:00
Tom Hughes
fc67e63589 Block indexing of diary entries 2019-06-23 00:23:21 +01:00
Tom Hughes
dd281a19c4 Update Potlatch 2 to 2.5-83-g28c84372 build 2019-06-21 11:25:36 +01:00
translatewiki.net
81d6d6a6a3 Localisation updates from https://translatewiki.net. 2019-06-20 21:47:58 +02:00
Tom Hughes
16cbc2eb79 Merge remote-tracking branch 'upstream/pull/2267' 2019-06-20 19:02:31 +01:00
Tom Hughes
80427b3e5e Merge remote-tracking branch 'upstream/pull/2270' 2019-06-20 18:58:38 +01:00
Tom Hughes
6b6345ecdb Merge remote-tracking branch 'upstream/pull/2269' 2019-06-20 18:54:44 +01:00
Andy Allan
23dfc4d3bd Update note comments to use friendly_date_ago helper
Refs #2255
2019-06-19 18:04:08 +02:00
Andy Allan
220ad92766 Use friendly_date_ago for notes display
Refs #2255
2019-06-19 18:04:08 +02:00
Andy Allan
e5d8bd539f Use friendly_date_ago for user blocks
Refs #2255
2019-06-19 18:04:08 +02:00
Andy Allan
75bf96c4f3 Use friendly_date_ago helper for changeset comments
Refs #2255
2019-06-19 18:04:08 +02:00
Andy Allan
3167e6b4bb Use friendly_date_ago helper for chnagesets
Refs #2255
2019-06-19 18:04:08 +02:00
Andy Allan
5e06815214 Use friendly_date_ago helper for user_blocks
Refs #2255

Removes two unused translations.
2019-06-19 18:04:08 +02:00