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

484 commits

Author SHA1 Message Date
Tom Hughes
9153fd3559 Fix link in error page when a user has public edits disabled 2019-12-12 18:50:30 +00:00
Andy Allan
7595e5a4dd Use squiggly heredocs instead of rails strip_heredoc 
Squiggly heredocs were introduced in ruby 2.3 and I prefer the ability
to indent the closing heredoc marker.
 2019-12-11 10:54:19 +01: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
Tom Hughes
dba3940571 Replace content_tag_for with a simple tr element 2019-12-03 22:54:55 +00:00
Tom Hughes
c468af5fbd Errors have text/plain as the content type 2019-11-24 11:05:02 +00:00
Tom Hughes
1f4d48eaf3 Fix some deprecation warnings 2019-11-24 11:05:02 +00:00
Tom Hughes
22cd2314e5 Update to rails 6.0.1 2019-11-24 11:05:02 +00:00
Tom Hughes
6ec02bcdb2 Merge remote-tracking branch 'upstream/pull/2440' 2019-11-20 19:01:13 +00:00
Andy Allan
25ebf87e5a Rename UserPreference controller methods to follow rails conventions more closely 2019-11-20 16:09:48 +01:00
Andy Allan
bc850d1d37 Move Relation.to_xml and to_xml_node out of the model and into tests 2019-11-20 15:45:28 +01:00
Andy Allan
2b1bac1279 Move Way.to_xml and to_xml_node out of the model and into tests 
This code is only used in the tests. Refs #2433
 2019-11-20 15:31:47 +01:00
Andy Allan
4e7c0c3008 Move Node.to_xml and to_xml_node out of model and into tests 
This code is only used in the tests for creating 'fixture' payloads,
so it shouldn't be kept in the models.
 2019-11-13 17:01:40 +01:00
Andy Allan
ae5c364e97 Move the format tests to test the output from the controller 2019-11-13 15:21:41 +01:00
mmd-osm
fc8923c305 Remove expand_bbox endpoint 2019-11-09 21:08:40 +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
Tom Hughes
e219916dcb When overriding setup make sure to call the superclass 2019-09-05 21:24:20 +01: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
91a37235ac Remove support for old style user images 2019-07-16 22:33:26 +01:00
Tom Hughes
6c202448ad Move user images to Active Storage with paperclip as a fallback 2019-07-09 19:17:30 +01:00
Tom Hughes
6f9b0c2f6b Fix rubocop warnings 2019-07-07 16:30:04 +01:00
Tom Hughes
a66c34991a Merge remote-tracking branch 'upstream/pull/2280' 2019-06-26 19:57:12 +01: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
cbb3c2bdf0 Use user models, not ids, in assertions 2019-06-19 17:03:13 +02: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
31edc7dff6 Merge remote-tracking branch 'upstream/pull/2226' 2019-06-18 21:10:07 +01:00
Tom Hughes
26cbdcf71a Fix importing of GPX traces with a leading byte order marker 
Fixes #2258
 2019-06-14 19:01:53 +01:00
Tom Hughes
24b138db09 Merge remote-tracking branch 'upstream/pull/2228' 2019-06-12 19:16:32 +01:00
Andy Allan
fdffd22cca Allow admins to unhide diary comments, if they wish 2019-06-06 16:03:42 +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
1b1d90a0f9 Refactor diary entry form 
This uses the built-in helpers for naming form elements, rather than
having to override with specific i18n labels. It also changes the label
to 'Update', and capitalizes the title on the edit page.
 2019-05-29 16:09:14 +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
Andy Allan
2142ff02c2 Allow moderators to hide diary entries and comments 2019-05-15 13:40:15 +02:00
Simon Poole
1be8d599e8 Add checkbox for contributor terms and improve text 2019-05-13 16:54:29 +02:00
Simon Poole
e488a7e862 Fix tests for change in users_controller 2019-05-13 16:54:29 +02:00
Tom Hughes
9f57f60b87 Fix new rubocop warnings 2019-04-23 09:33:34 +01:00
Frederik Ramm
17e6e69c39 Move generation of gpx_file XML from model to builder 2019-04-14 16:25:14 +01:00
Andy Allan
e66c719294 Resourceful(ish) naming for api/users_controller 2019-04-10 17:06:15 +02:00
Andy Allan
5444af981c Resourceful route names for api/trace_controller 2019-04-10 16:52:20 +02:00
Tom Hughes
79bda7a8ed Format closed_at correctly in changeset API responses 
Fixes #2195
 2019-03-30 15:40:08 +00:00
Tom Hughes
dcfe326f65 Merge remote-tracking branch 'upstream/pull/2175' 2019-03-26 19:14:04 +00:00
Tom Hughes
e3ed9988ce Merge remote-tracking branch 'upstream/pull/2177' 2019-03-16 15:39:03 +00:00