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

1501 commits

Author SHA1 Message Date
Tom Hughes
cb3c4ec09b Update for rubocop 0.54.0 2018-05-17 19:39:25 +01:00
Tom Hughes
9c04912f1d Merge remote-tracking branch 'upstream/pull/1866' 2018-05-16 18:57:34 +01:00
Tom Hughes
4eb6267f45 Revert "Remove unused POST method for message replies" 
This reverts commit 40cab845fb.
 2018-05-16 10:43:26 +01:00
Andy Allan
e1c62f1bf2 Remove if_user and similar methods 
Rather than hiding features based on CSS, just avoid including them
in the output. Fixes #1862
 2018-05-16 13:05:20 +08:00
Andy Allan
5da01b92c5 Fix test which was accidentally testing as the entry user twice 2018-05-16 12:59:16 +08:00
Andy Allan
4ec70f7994 Rename messages#read to #show 
Also rename the named path, to align with resourceful routing
 2018-05-15 18:25:54 +08:00
Andy Allan
73df8447e3 Rename messages#delete to destroy 
This is a better fit for rails controller method conventions, paving
the way to resourceful routing. Keep user-facing strings as 'delete'
since that's more commonly used.
 2018-05-15 18:15:01 +08:00
Andy Allan
40cab845fb Remove unused POST method for message replies 
This action just shows the pre-filled form, with the target for
the form being the same as for new messages.
 2018-05-15 17:33:40 +08:00
Tom Hughes
d14cf519fd Merge remote-tracking branch 'upstream/pull/1858' 2018-05-14 20:14:56 +01:00
Tom Hughes
33ea119c8f Merge remote-tracking branch 'upstream/pull/1857' 2018-05-14 20:13:41 +01:00
Andy Allan
00bd64c7fb Rename message_controller to messages_controller 2018-05-09 16:38:37 +08:00
Andy Allan
b446138aef Rename trace_controller to traces_controller 2018-05-09 12:38:09 +08:00
Andy Allan
011cfa794a Use named paths for messages 2018-05-09 11:24:11 +08:00
Andy Allan
9408ed6946 Pluralise user_preferences_controller 
This is the rails convention for controllers and can make route
generation easier.

http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention
 2018-04-18 11:26:00 +08:00
Andy Allan
45e6ebcafc Alter class to avoid conflict with model test class 2018-04-11 16:05:13 +08:00
Andy Allan
0a86a1ea8d Fix handling of title when replying to diary entries 2018-04-11 14:03:17 +08:00
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +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
Tom Hughes
1f2ac59d1d Fix new rubocop warnings 2018-03-26 19:00:03 +01: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
e7e12a38c6 Create a more accurate permissions check message 2018-03-14 16:29:47 +08:00
Andy Allan
36970bcf50 Use underscore versions of model names for translation keys. 2018-03-14 12:12:24 +08:00
Andy Allan
0f5ad1f3cc Merge branch 'pull/1765' 2018-03-09 15:57:24 +08: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
biswesh456
674589ce2c Change test case 2018-03-03 20:20:52 +05:30
Andy Allan
1c04af415e Update tests for new link text 2018-02-28 16:10:30 +08:00
Andy Allan
a20e28809f Merge branch 'master' into moderation 2018-02-28 15:55:28 +08:00
Andy Allan
424b6ef1cf Merge branch 'master' into moderation 2018-02-28 15:46:25 +08:00
Andy Allan
3006ce9713 Remove reporting of changesets 2018-02-28 14:39:40 +08:00
Andy Allan
80a241f798 Allow reporting of anonymous notes 2018-02-28 14:26:40 +08:00
biswesh456
646dcb62fc Allow admins and moderators to delete traces 
Fixes #1625
 2018-02-24 20:36:12 +05:30
Andy Allan
2d915b0e24 Avoid submit_tag to avoid 'Save changes' default 2018-02-23 12:30:37 +08:00
Andy Allan
549acfa918
Merge pull request #1732 from tomhughes/npemap 
Remove npemap as a source for UK postcodes
 2018-02-23 10:23:22 +08:00
mmd-osm
910a7fe9fc Small comment fix 2018-02-14 17:23:30 +00:00
mmd-osm
cea403dce0 Remove BBOX expansion performance optimization 
Closes #1749
Fixes #1742
 2018-02-14 17:23:06 +00:00
Tom Hughes
96cc9abd23 Use https when redirecting to the render server 2018-02-09 22:31:45 +00:00
Tom Hughes
43edc68ec7 Add tests for quad tiles 2018-02-04 17:33:44 +00:00
Tom Hughes
5925039729 Remove npemap as a source for UK postcodes 2018-02-04 15:14:41 +00:00
Tom Hughes
673b58f96f Merge remote-tracking branch 'upstream/pull/1704' 2018-02-04 15:09:40 +00:00
Tom Hughes
b590fdccfc Fix rubocop warnings 2018-01-24 14:37:37 +00:00
Tom Hughes
4e9144fba2 Add support for compressed request bodies 2018-01-24 14:25:02 +00:00
Tom Hughes
a83030dab7 Fix new rubocop warnings 2018-01-22 18:55:45 +00:00
Andy Allan
79bd1777ab Fully internationalise the issues and reports interfaces. 2018-01-22 11:57:08 +00:00
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Andy Allan
3a386f185c Reopen issues if necessary when creating a report. 2018-01-21 11:18:24 +00:00
Tom Hughes
be86e4824f Convert various URLs to https 2018-01-08 20:18:21 +00:00
Tom Hughes
c658e84535 Fix tests that only worked if object 400 didn't exist 2017-12-19 17:43:53 +00:00