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

9001 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
297b0a0e16 Merge remote-tracking branch 'upstream/pull/1987' 2018-09-10 19:09:31 +01:00
Tom Hughes
276599d34f Merge remote-tracking branch 'upstream/pull/1986' 2018-09-10 19:01:28 +01:00
Tom Hughes
0e0c89b95c Merge remote-tracking branch 'upstream/pull/1985' 2018-09-10 18:58:27 +01:00
Tom Hughes
995a5f89c2 Merge remote-tracking branch 'upstream/pull/1984' 2018-09-10 18:53:13 +01:00
Tom Hughes
568a447a8c Merge remote-tracking branch 'upstream/pull/1983' 2018-09-10 18:53:09 +01:00
Tom Hughes
744fadccd9 Rename CSS class matches for changes in action names 2018-09-10 14:12:56 +01:00
translatewiki.net
29eb778043 Localisation updates from https://translatewiki.net. 2018-09-10 08:30:56 +02:00
Wil
1d2a3841ab Resolve 34 Rubocop Lint/AmbiguousOperator conflicts 2018-09-10 11:43:50 +08:00
Andy Allan
cf107bca70 Remove Lint/ShadowingOuterLocalVariable - already fixed 2018-09-10 11:34:04 +08:00
Wil
a182820139 Resolve 96 Rubocop Lint/AmbiguousRegexpLiteral conflicts 2018-09-10 11:28:16 +08:00
Andy Allan
100babbe6c Just pass the object, rather than the id, to _path methods where possible 2018-09-10 11:09:30 +08:00
Andy Allan
4dd4831c0a Just pass the user object, rather than the display_name, to the user_path helper 2018-09-10 10:54:29 +08:00
Andy Allan
3f2ba044e5 Rename diary_entry#list to #index 2018-09-10 10:26:28 +08:00
Andy Allan
a3606e00b4 Rename user#list to user#index 2018-09-10 10:03:34 +08:00
Andy Allan
a8ecb1bf4b Use full url escaping when required in trace tests 2018-09-10 09:37:52 +08:00
Tom Hughes
5a2d2f97ce Update changeset browse view for renaming of changeset#list to changeset#index 2018-09-09 12:36:34 +01:00
Tom Hughes
ba05009de1 Update trace RSS for renaming of trace#view to trace#show 2018-09-09 11:50:05 +01:00
Tom Hughes
bc4e65394f Improve tests for trace RSS feeds 2018-09-09 11:50:05 +01:00
translatewiki.net
5cead9d5ab Localisation updates from https://translatewiki.net. 2018-09-06 21:37:01 +02:00
Tom Hughes
f03ed73755 Fix rubocop warnings 2018-09-05 19:33:54 +01:00
Tom Hughes
983e21db2e Merge remote-tracking branch 'upstream/pull/1974' 2018-09-05 19:06:16 +01:00
Tom Hughes
70cca71f38 Merge remote-tracking branch 'upstream/pull/1973' 2018-09-05 19:01:24 +01:00
Tom Hughes
a0dc300840 Merge remote-tracking branch 'upstream/pull/1972' 2018-09-05 18:41:17 +01:00
Andy Allan
84e19eba83 Remove temporary routes 
These were preserved to avoid users hitting errors, if we deployed
while they were filling in the related forms.
 2018-09-05 15:40:05 +08:00
Andy Allan
de6aa3f015 Rename changeset#list to changeset#index 2018-09-05 15:17:11 +08:00
Andy Allan
5a06a3dffe Rename diary_entry#view to diary_entry#show 2018-09-05 14:52:36 +08:00
Andy Allan
19c26e70a3 Rename user#view to user#show 2018-09-05 14:21:01 +08:00
Andy Allan
dfe21fec82 Use resourceful routing for message replies 2018-09-05 13:22:43 +08:00
Andy Allan
db30ea642e Use a resourceful path for message marking 2018-09-05 11:23:53 +08:00
Andy Allan
5405dde6ec Use resourceful destroy method for messages 2018-09-05 10:38:36 +08:00
Tom Hughes
6027c42ee7 Hide note comments made by deleted users 
Fixes #1970
 2018-09-04 22:22:39 +01:00
Ilya Zverev
67925e6d98 Do not display two coordinates on 'where am I' click 
Closes #1968
 2018-09-03 17:46:26 +01:00
translatewiki.net
d792a3bab5 Localisation updates from https://translatewiki.net. 2018-09-03 08:23:19 +02:00
Tom Hughes
eeb8bbba49 Require people replying to diary notifications to be subscribed 2018-08-30 18:34:15 +01:00
Tom Hughes
a1b179fa38 Merge remote-tracking branch 'upstream/pull/1964' 2018-08-30 18:26:05 +01:00
Andy Allan
8a4405dd0c Put the resourceful routing at the top of the list, for clarity 2018-08-30 09:48:57 +08:00
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
720da8b78c Avoid multiple returns 2018-08-29 08:53:23 +01:00
Tom Hughes
05514ced0c Merge remote-tracking branch 'upstream/pull/1962' 2018-08-29 08:46:44 +01:00
Tom Hughes
43776279fb Merge remote-tracking branch 'upstream/pull/1963' 2018-08-29 08:43:28 +01:00
Tom Hughes
5bc8abbe05 Merge remote-tracking branch 'upstream/pull/1960' 2018-08-29 08:43:08 +01:00
Tom Hughes
f07af588e6 Merge remote-tracking branch 'upstream/pull/1959' 2018-08-29 08:42:39 +01: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
Andy Allan
71b76a21ae Fix whitespace in locale file 2018-08-29 14:24:23 +08:00
Andy Allan
f38e03f0ed Refactor message creation to use a create action 
This makes it more conventional, rather than handling posts to the new action. The posting of the form was also reworked to use a hidden field for the displayname, rather than in the url, again for convention.
 2018-08-29 14:18:20 +08:00