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

2992 commits

Author SHA1 Message Date
Andy Allan
5e407dfb34
Merge branch 'master' into messages 2018-10-03 14:04:12 +02:00
Tom Hughes
86fcb272e5 Update wiki page data 2018-09-26 23:28:40 +01:00
Tom Hughes
6c2093b29d Fix new rubocop warnings 2018-09-22 17:12:29 +01:00
Tom Hughes
ad3ca54e28 Remove Imperial from hosting credits 
Fixes #1944
 2018-09-22 16:57:53 +01:00
translatewiki.net
a3b094cc09 Localisation updates from https://translatewiki.net. 2018-09-20 11:16:54 +02:00
Tom Hughes
1ebd7ca9b0 Remove bogus translation 2018-09-17 17:16:20 +01:00
translatewiki.net
797a249b07 Localisation updates from https://translatewiki.net. 2018-09-17 08:17:04 +02:00
Tom Hughes
f84fe0006c Remove bogus translation 2018-09-13 19:41:22 +01:00
translatewiki.net
9cd74649fb Localisation updates from https://translatewiki.net. 2018-09-13 11:04:58 +02: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
translatewiki.net
29eb778043 Localisation updates from https://translatewiki.net. 2018-09-10 08:30:56 +02: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
translatewiki.net
5cead9d5ab Localisation updates from https://translatewiki.net. 2018-09-06 21:37:01 +02: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
translatewiki.net
d792a3bab5 Localisation updates from https://translatewiki.net. 2018-09-03 08:23:19 +02: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
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
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
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
translatewiki.net
ad18d363b8 Localisation updates from https://translatewiki.net. 2018-08-27 07:53:06 +02: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
translatewiki.net
d5885ffada Localisation updates from https://translatewiki.net. 2018-08-13 08:21:06 +02: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
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
J Guthrie
c38a50fc5f Added locale 2018-07-26 16:49:12 +01:00