Commit graph

2067 commits

Author SHA1 Message Date
Tom Hughes
7531060a12 Use squiggly heredocs 2019-12-11 10:40:41 +00:00
Tom Hughes
57f5b7840e Fix rubocop warnings 2019-12-04 19:31:53 +00:00
Andy Allan
f1c6a87aa1
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
Remove expand_bbox endpoint
2019-12-04 12:48:34 +01:00
Andy Allan
44c6fdc273 Use the conventional 'destroy' method name for destroying traces 2019-12-04 11:59:18 +01:00
Mayank Tankhiwale
11cd1c9fc1 Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website 2019-11-23 20:32:47 +05:30
Mayank Tankhiwale
9f7ec064e4 Fix #2402
1. Modified about routes
2. Accept the new params in site#about
3. Update about.html.erb
2019-11-23 20:26:19 +05:30
Andy Allan
8ad88b9ddc Move user preference XML generation to a view 2019-11-20 16:39:23 +01:00
Andy Allan
25ebf87e5a Rename UserPreference controller methods to follow rails conventions more closely 2019-11-20 16:09:48 +01:00
mmd-osm
fc8923c305 Remove expand_bbox endpoint 2019-11-09 21:08:40 +01:00
Tom Hughes
90e2a144dc Merge remote-tracking branch 'upstream/pull/2412' 2019-10-30 19:20:30 +00:00
Andy Allan
7410b59a50 Remove unused trace_optionals partial
Although the code to render the partial runs, `yield :optionals`
was removed from the site layout in 2013. So the code has been
ineffective since then.
2019-10-30 15:02:35 +01:00
Andy Allan
15865b5a8d Remove node/way/relation Search API
This API clearly shows its age, having never been fully implemented
and simply returning 100 ways (or 2000 relations) at random matching
the provided tags.

It is, as far as I'm aware, completely unused. While it provides a
good amount of humour to anyone who reads the code, the time as come
for it to be retired.
2019-10-23 11:41:05 +02:00
Andy Allan
60ecfde65c Convert various administator? tests to use cancancan permissions checks 2019-10-23 10:52:12 +02:00
Tom Hughes
936967d0cb Allow administrators to see deleted diary comments 2019-10-17 12:16:28 +01:00
ENT8R
b7bdc88008 Don't expose technical terms to the user 2019-10-03 17:17:59 +02:00
ENT8R
d6c01586fe Sort and order notes by different values and ascending or descending order 2019-10-03 14:12:27 +02:00
Tom Hughes
783b5e3729 Merge remote-tracking branch 'upstream/pull/1926' 2019-08-28 17:23:10 +01:00
Tom Hughes
135ec35a91 Fix numericality validation to use correct integer only constraint
Fixes #2355
2019-08-22 12:14:06 +01:00
Tom Hughes
1f880528bd Fix new rubocop warnings 2019-07-18 16:47:08 +01:00
Tom Hughes
3cfffc2258 Update gravatar methods to check for Active Storage images 2019-07-16 22:29:07 +01:00
Tom Hughes
905a7eadb6 Defer deletion of avatars to a background job 2019-07-16 08:27:14 +01:00
Tom Hughes
6c202448ad Move user images to Active Storage with paperclip as a fallback 2019-07-09 19:17:30 +01:00
mmd-osm
84faaaf795 Rubocop 2019-06-28 22:05:38 +02:00
mmd-osm
fb953006a1 Replace respond_to with render xml format 2019-06-28 21:56:42 +02:00
mmd
11cc4a5e60
Merge branch 'master' into patch/view_migration 2019-06-27 22:40:51 +02:00
mmd-osm
8ad1ce9798 Refactoring 2019-06-27 22:28:40 +02:00
mmd-osm
b9ae40d978 Remove non functioning changeset_cache, user_display_name_cache 2019-06-27 21:26:11 +02:00
mmd-osm
cf3cf5216f Avoid unnecessary arrays 2019-06-27 18:33:12 +02:00
Tom Hughes
a66c34991a Merge remote-tracking branch 'upstream/pull/2280' 2019-06-26 19:57:12 +01:00
Tom Hughes
89f8f7af35 Merge remote-tracking branch 'upstream/pull/2281' 2019-06-26 19:19:58 +01:00
Andy Allan
0dbb33016f Rename @edits variable to @changesets, for clarity 2019-06-26 17:07:49 +02:00
Andy Allan
2398614349 Add support for an unversioned 'versions' API call
This will eventually replace the unversioned 'capabilities' call.
Client applications can use this versions call to find out what versions
are available, if they support multiple versions. The capabilities
of each version, and the format of the capabilities call, is then
able to change between versions. If a client only supports one version
they can jump straight to the versioned capabilities call.

Additionally, supported versions are now a list of version identifiers,
without any implications surrounding min/max values (e.g. guesswork
for supported intermediate versions).

Fixes #2162
2019-06-26 16:52:10 +02:00
Tom Hughes
cbea796ef4 Merge remote-tracking branch 'upstream/pull/2207' 2019-06-26 14:30:30 +01:00
Andy Allan
f77d4dc4f7 Avoid stating the action to render when it just matches the current action 2019-06-26 14:50:35 +02:00
Andy Allan
c24b0e9399 Rework to ensure views are named after the controller method name 2019-06-26 13:45:40 +02:00
Tom Hughes
d2d5d48f29 Allow signups to be blocked by MX host 2019-06-23 11:21:03 +01:00
Andy Allan
d33b1f6b29 Pass the models, not the ids, when dealing with friendships 2019-06-19 16:56:31 +02:00
Andy Allan
2169c503ef Rename user.friend_users to user.friends
This is possible now since we've renamed Friend to Friendship
2019-06-19 16:51:35 +02:00
Andy Allan
1cf8fec58d Rename Friend model to Friendship
This better describes what the model represents, which is the relationship
between the two users.
2019-06-19 16:39:25 +02:00
Tom Hughes
24b138db09 Merge remote-tracking branch 'upstream/pull/2228' 2019-06-12 19:16:32 +01:00
Andy Allan
9e158a5d39 Show all diary comments to administrators 2019-06-06 16:03:42 +02:00
Andy Allan
fdffd22cca Allow admins to unhide diary comments, if they wish 2019-06-06 16:03:42 +02:00
Andy Allan
49fc17c6b6 Show deleted diary entries to administrators, if the user isn't also deleted
This will allow administrators to review diary entry deletions from non-spam users.
2019-06-06 15:59:47 +02:00
Andy Allan
f2f3fbb1f1 Allow administrators to unhide diary entries, if they wish 2019-06-06 15:59:47 +02:00
Tom Hughes
e49953f141 Merge remote-tracking branch 'upstream/pull/2239' 2019-05-29 17:41:08 +01:00
Andy Allan
6ed749e7eb Allow a configurable delay to keep diary entries from being published in feeds
This is to provide another tool to help spam fighting.

The configuration value is set to zero hours for new deploys in
order to be 'least surprising'. You can change the setting without
interfering with your test suite.
2019-05-29 16:56:15 +02:00
Andy Allan
b7893df84e Refactor diary entries to use create and update methods
This brings it slightly more into line with resourceful routing.
2019-05-29 15:37:23 +02:00
mmd-osm
b97e8d5427 Remove SWF gpx trackpoints feature for Potlatch1 2019-05-19 15:17:14 +02:00
Simon Poole
1be8d599e8 Add checkbox for contributor terms and improve text 2019-05-13 16:54:29 +02:00
Simon Poole
fa81a608f7 Remove unnecessary test for 0 2019-05-13 16:54:29 +02:00