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
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
Andy Allan
85bf9adb91 Handle issue_types properly if current_user is both and admin and a moderator 2018-03-14 16:47:45 +08:00
Andy Allan
283cffdfdb Handle current_user being both an admin and a moderator for building user list 2018-03-14 16:47:45 +08:00
Andy Allan
6bcffbf499 Unwind the set_issues method 2018-03-14 16:34:19 +08:00
Andy Allan
e7e12a38c6 Create a more accurate permissions check message 2018-03-14 16:29:47 +08:00
Andy Allan
5310c7000c Remove cascading deletes, add another foreign key, and switch index around. 2018-03-14 16:15:39 +08:00
Andy Allan
3e5a4a14df Ensure reports have an issue id and a user id 2018-03-14 15:36:46 +08:00
Andy Allan
5e7abf67fb Remove nonsense has_one relationship 2018-03-14 15:20:04 +08:00
Andy Allan
c1bb412033 Fix class name 2018-03-14 15:18:47 +08:00
Andy Allan
870a497f94 Remove unnecessary div 2018-03-14 15:16:51 +08:00
Andy Allan
04901868fa Apply list styling to list of related reports 2018-03-14 15:14:35 +08:00
Andy Allan
e41751fb32 Use th instead of td and b 2018-03-14 14:56:06 +08:00
Andy Allan
9e46754c88 User user_path to generate links to users 2018-03-14 14:21:43 +08:00
Andy Allan
05b871db99 Avoid wrapping in the reports count column 2018-03-14 13:06:32 +08:00
Andy Allan
aaaeb211de Combine last_updated_by and last_updated_at columns on issues index 
Also change to use time as a distance, and link to the user.
 2018-03-14 12:51:22 +08:00
Andy Allan
e44f856b53 Combine category and reporting user 2018-03-14 12:51:22 +08:00
Andy Allan
13e7a4b0e9 Increase padding around report disclaimer 2018-03-14 12:51:22 +08:00
Andy Allan
e85110957a Remove vandalism as an option for reporting notes. 2018-03-14 12:51:22 +08:00
Andy Allan
59ca99d17c Use lower case to refer to reportable objects 2018-03-14 12:13:43 +08:00
Andy Allan
36970bcf50 Use underscore versions of model names for translation keys. 2018-03-14 12:12:24 +08:00
Andy Allan
0737c4f169 Fix grammar 2018-03-14 11:58:55 +08:00
translatewiki.net
d2f7188d15 Localisation updates from https://translatewiki.net. 2018-03-12 09:10:50 +01:00
Bryan Housel
08edaf794b Update to iD v2.7.1 2018-03-11 11:58:48 -04:00
Andy Allan
0f5ad1f3cc Merge branch 'pull/1765' 2018-03-09 15:57:24 +08:00
Andy Allan
b2ff9f3aad Simplify redirect. 2018-03-09 15:56:56 +08:00
translatewiki.net
5cfc163bc2 Localisation updates from https://translatewiki.net. 2018-03-08 09:43:51 +01:00
Štefan Baebler
36a382bb43 Added support for 2 more secondary wikidata tag links 
Listed on in https://wiki.openstreetmap.org/wiki/Key:wikidata :
* name:etymology:wikidata
* network:wikidata
 2018-03-05 08:38:50 +00:00
Bryan Housel
e019a1f031 Update to iD v2.7.0 2018-03-05 08:38:50 +00:00