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

8428 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
5effa0a6d6 Avoid losing filter settings when an invalid user is entered 2018-06-10 15:42:35 +01:00
Tom Hughes
e8942437c0 Use select_tag for issue filter fields instead of abusing select 2018-06-10 15:32:27 +01:00
Tom Hughes
f227804093 Add some extra indexes on issues 2018-06-10 15:25:53 +01:00
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
translatewiki.net
fc90b73581 Localisation updates from https://translatewiki.net. 2018-04-09 08:27:07 +02:00
Tom Hughes
adbd737a0c Ask for confirmation before deleting a trace 
Fixes #1812
 2018-04-05 21:16:28 +01:00
translatewiki.net
259f9650cb Localisation updates from https://translatewiki.net. 2018-04-05 09:31:53 +02:00
Tom Hughes
be35dda9c3 Merge remote-tracking branch 'upstream/pull/1804' 2018-04-02 15:41:35 +01:00
Tom Hughes
10c3230e27 Merge remote-tracking branch 'upstream/pull/1801' 2018-04-02 15:25:17 +01:00
Tom Hughes
7e6e1dfbaf Tweak highlighting of geolocation errors 2018-04-02 15:24:03 +01:00
Tom Hughes
87dfbda932 Merge remote-tracking branch 'upstream/pull/1800' 2018-04-02 15:18:11 +01:00
J Guthrie
65ceb77eab Added autoPan for Directions markers 2018-03-31 22:18:25 +01:00
J Guthrie
6f74ae3429 Added missing onramp instructions to locale file 2018-03-31 16:31:35 +01:00
J Guthrie
efd17cfbe9 Moved inline styling to stylesheet 2018-03-29 22:48:39 +01:00
J Guthrie
becccea034 Remove/replace redundant no_place locale translation 2018-03-29 22:27:33 +01:00
J Guthrie
1bb52e3cb6 Unlocateable place now highlighted in red and specified in error message 
The textbox containing the unlocateable place gets highlighted in red
Also added a new locale value to specify an error for a specific place
 2018-03-29 21:02:42 +01:00
Tom Hughes
37f404252c Merge remote-tracking branch 'upstream/pull/1796' 2018-03-29 08:35:03 +01:00
translatewiki.net
0273b00baf Localisation updates from https://translatewiki.net. 2018-03-29 09:16:45 +02:00
Tom Hughes
357de642b3 Merge remote-tracking branch 'upstream/pull/1799' 2018-03-28 17:38:34 +01:00
Tom Hughes
f3b6e0faa1 Merge remote-tracking branch 'upstream/pull/1798' 2018-03-28 17:33:35 +01:00
Tom Hughes
be35d4ab9c Merge remote-tracking branch 'upstream/pull/1797' 2018-03-28 17:33:01 +01:00
Tom Hughes
475e40d215 Merge remote-tracking branch 'upstream/pull/1795' 2018-03-28 17:23:21 +01:00
Andy Allan
e3c8a57184 Strip trailing whitespace from multiline html translations 2018-03-28 17:16:17 +08:00
Andy Allan
3b75e92415 Be more consistent with 'my' vs 'your' for objects that belong to 
the user
 2018-03-28 17:07:50 +08:00
Andy Allan
5e76b66271 Use named paths for a few trace links 2018-03-28 16:55:10 +08:00
Andy Allan
9c3aae76e3 Move the api routes into the api/0.6 scope 2018-03-28 15:38:10 +08:00
Andy Allan
87d1a5bc93 Remove unnecessary route aliases 
These simply duplicate the aliases that are set by default.
 2018-03-28 15:29:24 +08:00
Andy Allan
ba543340b1 Use concise route definitions for single method routes 2018-03-28 15:03:32 +08:00
Andy Allan
2852ac3e4a Disable image_optim workers in tests 
They aren't needed for anything related to testing, and the warnings
about missing binaries adds noise to the test output.
 2018-03-28 13:52:51 +08:00
Andy Allan
a48633446b Remove image_optim config loading override 
image_optim_rails loads the config files by default, and has a
built-in mechanism for per-environment configs. Forcing the config
loading in this way is unnecessary.
 2018-03-28 13:52:31 +08:00
Andy Allan
9a5d835987 Silence puma startup messages when running tests 2018-03-28 13:30:31 +08:00
Andy Allan
46c183ffeb Add more tests 2018-03-28 11:05:47 +08:00
Andy Allan
ab3150646c Update system tests for report link changes 2018-03-28 11:05:46 +08:00
Andy Allan
c71fd544e0 Avoid sending a commit value from from the search button 2018-03-28 11:05:46 +08:00
Andy Allan
918a382cad Use options_for_select to set the selected items in the search form 2018-03-28 11:05:46 +08:00
Andy Allan
32d1afbb18 Create a report_link helper, and use text instead of a flag icon 2018-03-28 11:05:46 +08:00
Tom Hughes
1f2ac59d1d Fix new rubocop warnings 2018-03-26 19:00:03 +01:00
Tom Hughes
6fba59724a Update rubocop 2018-03-26 18:49:50 +01:00
Tom Hughes
85f942bb62 Revert to dalli 2.7.6 2018-03-26 09:44:33 +01:00
Tom Hughes
df19865364 Update bundle 2018-03-26 08:54:38 +01:00
translatewiki.net
b25636465a Localisation updates from https://translatewiki.net. 2018-03-26 08:19:11 +02:00
Tom Hughes
1a2bdacf17 Merge remote-tracking branch 'upstream/pull/1788' 2018-03-25 14:27:16 +01:00
translatewiki.net
f68099eb8e Localisation updates from https://translatewiki.net. 2018-03-22 08:19:26 +01:00
Andy Allan
ee1a8637d3 Convert issue status to an enum 2018-03-21 12:05:08 +08:00
Andy Allan
9f84c6f46e Use user_path links. Fixes #1785 2018-03-21 11:33:45 +08:00
translatewiki.net
eb7b0c05e3 Localisation updates from https://translatewiki.net. 2018-03-19 21:07:35 +01:00
translatewiki.net
701334bcc6 Localisation updates from https://translatewiki.net. 2018-03-15 16:10:33 +01:00
Andy Allan
facce9d0bb Refactor set_default_assigned_role to be more easily read. 2018-03-14 17:35:58 +08:00
Andy Allan
696bbd169b Redirect to the reportable after creating a report. 2018-03-14 17:24:41 +08:00
Andy Allan
2fc70be734 Add a redirect and error message if user ends up trying to report something without the correct parameters 2018-03-14 17:09:57 +08:00