Commit graph

8689 commits

Author SHA1 Message Date
Andy Allan
44217775f0 Rename i18n keys track->trace 2018-08-29 17:59:58 +08:00
Andy Allan
d0089f0ce8 Rename traces#list to traces#index 2018-08-29 17:58:37 +08:00
Andy Allan
16fef14b61 Rename traces#view to traces#show 2018-08-29 17:43:38 +08:00
Andy Allan
b745126b6e Split out updating a trace into an update action 2018-08-29 17:31:12 +08:00
Tom Hughes
db39876dd6 Merge remote-tracking branch 'upstream/pull/1961' 2018-08-29 08:36:22 +01:00
Tom Hughes
80a6e8da05 Tidy up control flow in trace creation 2018-08-29 08:34:38 +01:00
Andy Allan
942e62117f
Merge pull request #1938 from jguthrie100/fix_no_trace_description_error
Fixes "new trace" validation error
2018-08-29 14:49:26 +08:00
Bryan Housel
e58d5166dd Update to iD v2.11.1 2018-08-29 01:05:54 -04:00
Tom Hughes
06915a77b5 Fix FactoryBot deprecation warnings 2018-08-28 19:12:01 +01:00
Tom Hughes
6c597f614b Update bundle 2018-08-28 18:57:32 +01:00
Tom Hughes
e0abb299d0 Merge remote-tracking branch 'upstream/pull/1948' 2018-08-28 18:53:45 +01:00
Tom Hughes
32a400c5af Only include embed related messages in the embed javascript 2018-08-28 18:02:32 +01:00
Tom Hughes
1dfbd9282c Merge remote-tracking branch 'upstream/pull/1950' 2018-08-28 17:59:46 +01:00
Tom Hughes
08f0621d6f Tidy whitespace 2018-08-28 17:56:34 +01:00
Tom Hughes
9fe97ad70f Merge remote-tracking branch 'upstream/pull/1958' 2018-08-28 17:55:01 +01:00
Ilya Zverev
a46ecae757 Reverse coordinates order only when called with two nondescript numbers 2018-08-28 15:16:26 +03:00
Ilya Zverev
5b4a8ba587 Adjust test for latlon searching 2018-08-27 14:40:11 +03:00
Ilya Zverev
d9d51fce9b Add parsing coordinates in lon, lat format 2018-08-27 14:06:17 +03:00
translatewiki.net
ad18d363b8 Localisation updates from https://translatewiki.net. 2018-08-27 07:53:06 +02:00
Bryan Housel
b225d063a7 Update to iD v2.11.0 2018-08-26 02:28:16 -04:00
translatewiki.net
a050f87af6 Localisation updates from https://translatewiki.net. 2018-08-23 08:26:52 +02:00
translatewiki.net
1cb1f18381 Localisation updates from https://translatewiki.net. 2018-08-17 15:10:45 +02:00
Tom Hughes
ed82d0a756 Only fetch client side translations for the current locale 2018-08-16 12:22:36 +01:00
mmd-osm
fe644bbd72 Include num_changes in changeset xml response 2018-08-14 10:57:13 +02:00
Tom Hughes
e9abea3dd7 Avoid some accidental manouver type matches 2018-08-13 17:13:26 +01:00
translatewiki.net
d5885ffada Localisation updates from https://translatewiki.net. 2018-08-13 08:21:06 +02:00
Tom Hughes
7c7ff4fdf7 Stick with autoprefixer 8.x for now 2018-08-12 20:30:20 +01:00
Tom Hughes
828425c0c2 Fix bundle dependencies 2018-08-12 20:06:53 +01:00
Tom Hughes
907f63cc62 Replace sass-rails with sassc-rails
http://sass.logdown.com/posts/7081811
2018-08-12 19:53:51 +01:00
Tom Hughes
a3bbaa74ff Update bundle 2018-08-12 19:42:02 +01:00
translatewiki.net
395eaea06c Localisation updates from https://translatewiki.net. 2018-08-09 09:34:50 +02:00
translatewiki.net
e3f91c688e Localisation updates from https://translatewiki.net. 2018-08-06 07:27:46 +02:00
translatewiki.net
e9581f7ef2 Localisation updates from https://translatewiki.net. 2018-08-02 10:23:36 +02:00
Tom Hughes
91194cf354 Set the locale when adding a comment to an issue 2018-08-01 21:35:51 +01:00
Tom Hughes
5fa0aebe9f Use dynamic error pages built through the asset pipeline
Fixes #1241
2018-08-01 19:13:04 +01:00
translatewiki.net
49d5c68600 Localisation updates from https://translatewiki.net. 2018-07-30 08:28:19 +02:00
Tom Hughes
640ea955fe Remove script sources which are no longer needed by iD 2018-07-26 17:44:16 +01:00
Tom Hughes
e418074b2a Merge remote-tracking branch 'upstream/pull/1939' 2018-07-26 17:38:40 +01:00
J Guthrie
c38a50fc5f Added locale 2018-07-26 16:49:12 +01:00
J Guthrie
07480996d7 Refactored and added new test 2018-07-26 16:27:28 +01:00
translatewiki.net
4549df57fb Localisation updates from https://translatewiki.net. 2018-07-26 10:13:58 +02:00
Bryan Housel
315df40f19 Update to iD v2.10.0 2018-07-26 01:38:22 -04:00
J Guthrie
a04b19a9ae Return after rendering - stops further processing in controller 2018-07-25 02:30:59 +01:00
J Guthrie
4ae7bb4178 Switched if to unless to satisfy rubycop 2018-07-25 02:04:04 +01:00
J Guthrie
c299bd42ef No trace description now redirects to /new 2018-07-25 01:49:51 +01:00
translatewiki.net
39f0b501e8 Localisation updates from https://translatewiki.net. 2018-07-23 09:43:27 +02:00
Frederik Ramm
b9f9d9df88 allow moderators to read hidden notes through API 2018-07-22 15:42:14 +02:00
translatewiki.net
d368488946 Localisation updates from https://translatewiki.net. 2018-07-20 15:10:59 +02:00
Tom Hughes
28b48cf583 Add issues link to "More" menu for intermediate sized screens
Fixes #1928
2018-07-18 18:59:52 +01:00
Tom Hughes
5d30594a7b Update leaflet to 1.3.3 2018-07-18 18:42:15 +01:00