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

342 commits

Author SHA1 Message Date
Tom Hughes
05514ced0c Merge remote-tracking branch 'upstream/pull/1962' 2018-08-29 08:46:44 +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
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
Ilya Zverev
a46ecae757 Reverse coordinates order only when called with two nondescript numbers 2018-08-28 15:16:26 +03:00
Ilya Zverev
5b4a8ba587 Adjust test for latlon searching 2018-08-27 14:40:11 +03:00
Tom Hughes
5fa0aebe9f Use dynamic error pages built through the asset pipeline 
Fixes #1241
 2018-08-01 19:13:04 +01:00
J Guthrie
07480996d7 Refactored and added new test 2018-07-26 16:27:28 +01:00
Frederik Ramm
b9f9d9df88 allow moderators to read hidden notes through API 2018-07-22 15:42:14 +02:00
Tom Hughes
90d5d062f5 Fix nominatim stubs 2018-07-10 18:50:29 +01:00
Tom Hughes
b4106383d9 Add /api/0.6/users to fetch multiple users 
Fixes #1921
 2018-07-09 22:26:55 +01:00
Tom Hughes
f7a35c5895 Fix new rubocop warnings 2018-06-18 09:00:49 +01:00
Tom Hughes
22385c179a Improve controller tests for issues 2018-06-10 17:48:47 +01:00
Tom Hughes
d3700e6201 Merge branch 'master' into next 2018-06-10 17:02:12 +01:00
Tom Hughes
ba9a00b10c Merge remote-tracking branch 'upstream/pull/1892' 2018-06-06 14:51:30 +01:00
Tom Hughes
4df0fe72e2 Merge remote-tracking branch 'upstream/pull/1893' 2018-06-06 14:33:36 +01:00
Andy Allan
d336523738 Speed up tests by making fewer random changes 
The old_node_controller#test_version in particular was slow, since
it saves a huge number of tags when adding a tag 30 times over. Since
the tests are random and not based on the number of iterations, this
reduces the iteration counts.
 2018-06-06 13:54:09 +08:00
Andy Allan
88ff81b694 Refactor messages show action to be resourceful 2018-06-06 11:51:52 +08:00
Andy Allan
9b36021ec5 Refactor inbox and outbox paths to avoid display names in urls. 2018-06-06 11:33:33 +08:00
Andy Allan
57d3b3af55 Refactor trace creation pages 
Split the trace creation into new and create methods, with standard resourceful routing. Provide a redirect for external requests to the old url.
 2018-06-06 10:22:42 +08:00
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
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
Andy Allan
696bbd169b Redirect to the reportable after creating a report. 2018-03-14 17:24:41 +08:00
biswesh456
674589ce2c Change test case 2018-03-03 20:20:52 +05:30
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
biswesh456
646dcb62fc Allow admins and moderators to delete traces 
Fixes #1625
 2018-02-24 20:36:12 +05:30
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
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
a83030dab7 Fix new rubocop warnings 2018-01-22 18:55:45 +00:00
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Tom Hughes
c658e84535 Fix tests that only worked if object 400 didn't exist 2017-12-19 17:43:53 +00:00
mmd-osm
e21c967fdd Revoking administrator role on current user should fail 
Fixes #1697
Closes #1701
 2017-12-19 17:31:34 +00:00
mmd-osm
2c7f2b117b Remove extra blank line 2017-12-16 14:06:21 +01:00