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

1618 commits

Author SHA1 Message Date
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
Tom Hughes
16c3c53302 Merge remote-tracking branch 'upstream/pull/2271' 2019-06-26 11:22:19 +01:00
Tom Hughes
d2d5d48f29 Allow signups to be blocked by MX host 2019-06-23 11:21:03 +01:00
Andy Allan
cd5e28406b Use friendy_date_ago helper for notes 
Refs #2255
 2019-06-19 18:04:08 +02: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
d9b8ebeb01 Merge remote-tracking branch 'upstream/pull/2257' 2019-06-12 19:50:52 +01:00
Tom Hughes
24b138db09 Merge remote-tracking branch 'upstream/pull/2228' 2019-06-12 19:16:32 +01:00
Andy Allan
085412f624 Use i18n for submit button for issue comments 
Normally when an en-GB.yml translation is missing, rails falls back to en.yml. But when
using the submit helpers, if the en-GB translation is missing, rails knows how to create
a fallback like 'Create {model_name}' without touching the en.yml file. This string might
then be different from what the test expects, e.g. 'Add Comment'.

So it's important to set the language headers, to avoid phantomjs from picking up your desktop
preferences in this specific case.
 2019-06-12 19:24:06 +02:00
Tom Hughes
b5d903c603 Test import of various trace formats 
Fixes #2254
 2019-06-11 19:52:51 +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
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
fbcd2bc10a Refactor some diary entry routes to use resources 2019-05-29 15:55:27 +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
b89e6c2274 Update user_creation_test for new parameter 2019-05-13 16:54:29 +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
Simon Poole
e30813bbb1 Rubocop fixes and increase per method complexity limit from 23 to 25 2019-05-13 16:54:29 +02:00
Simon Poole
51c84869c4 Fix tests for change in users_controller, add test for missing read_tou 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
9e759dc030 Expect CORS preflight responses to not have a content type 
https://github.com/cyu/rack-cors/pull/180
 2019-03-28 08:45:58 +00:00
Andy Allan
7b057545c0 Disentangle the api abilities from the web abilities 
This will allow us to rename api actions without causing permissions headaches. The choice of
abilities files is made by inheriting from either api_controller or application_controller.

Also rename capabilities to api_capabilites, for consistency.
 2019-03-27 18:07:29 +01:00
Tom Hughes
dcfe326f65 Merge remote-tracking branch 'upstream/pull/2175' 2019-03-26 19:14:04 +00:00
Andy Allan
400db58036 Use activerecord-import for bulk importing tracepoint records 
Non-rigourous testing shows a significant speedup, even on ssds.
 2019-03-20 10:35:40 +01:00
Tom Hughes
e3ed9988ce Merge remote-tracking branch 'upstream/pull/2177' 2019-03-16 15:39:03 +00:00
Tom Hughes
874fddf499 Merge remote-tracking branch 'upstream/pull/2164' 2019-03-16 15:31:29 +00:00
Andy Allan
987398ad2a Rubocop fixes 2019-03-16 15:30:41 +00:00
Frederik Ramm
538bfed8a6 Move changeset XML generation to a view 2019-03-16 15:30:18 +00:00
Andy Allan
d102c9aaf4 Move all settings to settings.yml 
We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml
 2019-03-13 18:06:23 +01:00
Andy Allan
1ca77d6dda Rubocop fixes for ruby 2.5 2019-03-13 10:33:33 +01:00
Tom Hughes
be0e33862f Merge remote-tracking branch 'upstream/pull/2167' 2019-03-06 17:23:46 +00:00
Andy Allan
2c21dd4906 Silence the simplecov output message 
It's very rare for the information in this message to be useful or
actionable when running the tests, so it's best to silence the message.
 2019-03-06 09:54:05 +01:00
Tom Hughes
94b59f4403 Merge remote-tracking branch 'upstream/pull/2161' 2019-02-28 19:17:40 +00:00
Tom Hughes
73214da35d Merge remote-tracking branch 'upstream/pull/2160' 2019-02-28 18:58:05 +00:00