Commit graph

412 commits

Author SHA1 Message Date
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
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
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
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
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
a20e28809f Merge branch 'master' into moderation 2018-02-28 15:55:28 +08:00
Tom Hughes
5925039729 Remove npemap as a source for UK postcodes 2018-02-04 15:14:41 +00:00
Andy Allan
effb1b7f41 Merge branch 'master' into moderation 2017-11-29 12:18:39 +00:00
Tom Hughes
6209a9be78 Drop geocoder.us from search engines
Fixes #1633
2017-09-25 22:52:03 +01:00
Andy Allan
8cf16fe78b Create an IssueCommentsController for managing IssueComments 2017-09-13 16:19:16 +01:00
Andy Allan
d7612f42d0 Refactor creating a new report to use a ReportsController
It's really a report that the user is creating, the issue is created indirectly. Similar
refactoring will be required for issue comments.
2017-09-06 18:06:21 +01:00
Andy Allan
2b617b766a Add a basic feature test for reporting diary entries. 2017-09-06 11:26:32 +01:00
Andy Allan
dbd88d893f Merge branch 'master' into moderation 2017-07-12 10:16:11 +01:00
Tom Hughes
2357118c46 Avoid using format as a URL parameter name
This prevents rails confusing it with the builtin format
parameter derived from the URL extension.
2017-06-03 12:08:35 +01:00
Tom Hughes
3a16b68368 Use POST when editing GPX trace details
Fixes #1533
2017-05-01 16:56:02 +01:00
Mikel Maron
443080d7b0 WIP diary comment subscriptions 2016-10-03 15:04:22 -04:00
Matt Amos
757a1aaa85 Made rubocop happy by formatting and minor syntax tweaks. 2016-08-22 17:24:10 +01:00
Shrey
683722ed5c Added IssueComments + ForeignKeys + Indexes 2016-08-22 16:15:12 +01:00
Shrey
453f758f91 Controllers + a few tests + new notification added. Work pending on the notification view 2016-08-22 16:13:31 +01:00
Tom Hughes
63dbfc15a6 Validate page numbers in URLs 2015-07-29 00:39:09 +01:00
Tom Hughes
7fef0353f2 More test work 2015-03-08 00:48:13 +00:00
Tom Hughes
b0150caee6 Convert OpenID authentication to use OmniAuth 2015-02-25 01:07:23 +00:00
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
ef7f3d800c Fix most auto-correctable rubocop issues 2015-02-20 08:56:16 +00:00
Tom Hughes
34e3e51456 Cleanup trailing whitespace 2015-02-20 08:56:16 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
2014-11-10 16:14:06 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
2014-11-03 11:08:13 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Tom Hughes
f636391580 Move changeset comment feeds out of the API namespace 2014-10-23 21:40:13 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
2014-10-23 21:24:51 +01:00
Tom Hughes
a70b61315c Merge branch 'master' into overpass 2014-06-15 14:54:39 +01:00
Martin Raifer
1eab367de5 Instruct iD to load gpx file
When one clicks on the edit link of an uploaded GPX file, this instructs
the iD editor to load the respective GPX data from the appropriate URL.

See https://github.com/openstreetmap/iD/issues/970#issuecomment-43439476.
2014-05-18 18:59:08 +01:00
John Firebaugh
f2bf38606e Permalinks for directions 2014-05-14 15:52:25 -07:00
Tom Hughes
078059b76b Initial work on overpass based query API 2014-03-16 16:18:12 +00:00
Simon Poole
a24f52dec7 Add a landing page for "fix the map / report a problem" links 2014-01-19 13:48:27 +00:00
Tom Hughes
e418075e26 Replace some legacy routes with redirects 2013-12-03 19:08:21 +00:00
Tom Hughes
61bb31ebdd Preserve the bounding box when redirecting history URLs
Using the options style for the redirect seems to cause parameters
to be preserved, which the path style of redirect does not.
2013-12-01 19:59:57 +00:00
Tom Hughes
fb9b4edcdd Add tests for new redirects and fix a few bugs in the redirects 2013-11-28 08:56:52 +00:00
Tom Hughes
3cd5f45e08 Simplify browse routes and make routes more consistent
This gets rid of the /browse/ prefix and uses /history consistently
for all routes that show a list of changesets.
2013-11-28 00:14:07 +00:00
John Firebaugh
2b4f8e92c9 Merge branch 'master' into redesign
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
2013-11-15 16:47:49 -08:00
Aaron Lidman
1b19974b12 Add note creation to the sidebar 2013-11-11 19:06:07 -08:00
John Firebaugh
15ff7b9843 Remove unused 2013-11-06 13:05:51 -08:00
John Firebaugh
5835350879 Restore raw latlon search result 2013-10-15 21:01:14 +01:00
Tom Hughes
71065a5f2a Add tests for trace#edit 2013-10-15 00:12:04 +01:00
John Firebaugh
8530e3eedb AJAXy changeset history 2013-10-13 14:46:09 -07:00