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

5545 commits

Author SHA1 Message Date
Tom Hughes
efa2c20bff Merge remote-tracking branch 'upstream/pull/2696' 2020-07-08 19:09:55 +01:00
Tom Hughes
4cf3c3b6ed Merge remote-tracking branch 'upstream/pull/2670' 2020-07-08 19:04:04 +01:00
Tom Hughes
3a43f9fe04 Merge remote-tracking branch 'upstream/pull/2697' 2020-07-08 18:57:32 +01:00
Tom Hughes
77bece20ff Merge remote-tracking branch 'upstream/pull/2700' 2020-07-08 18:43:26 +01:00
Andy Allan
8c326a6c1f Remove unnecessary layout calls from api controllers 
These were left over from the refactoring of the controllers into api and non-api versions.
 2020-07-08 18:51:27 +02:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Andy Allan
1977e66ace Use bootstrap text-muted in place of custom deemphasze class 
This avoids changing anything related to forms, since they will be
switched over to bootstrap separately.
 2020-07-08 18:30:15 +02:00
Andy Allan
8192c0bd17 Rework the users#show page to avoid custom column css 
This uses bootstrap instead, ensuring the map shows before the
text on small screens, but to the right of it on md+ widths. The
height of the map also changes at this breakpoint instead of being
based on the menu width (body.small).

The account edit page was also changed to match the content_map
changes, and a full width map is now used. This can be changed, if
required, using bootstrap breakpoints but I like it as it is.
 2020-07-08 16:46:15 +02:00
Tom Hughes
9f993fe8c8 Fix new rubocop warnings 2020-07-07 10:44:52 +01:00
Tom Hughes
96ee7ef95c Only report traces as offline when they are offline 2020-07-07 10:37:56 +01:00
Tom Hughes
ce99bfd9ac Remove some debug logging comitted by mistake 2020-07-07 10:37:39 +01:00
Tom Hughes
2def62ee19 Fix errors with GPX offline mode 2020-07-05 14:49:12 +01:00
Tom Hughes
b8eaf227d9 Merge remote-tracking branch 'upstream/pull/2688' 2020-07-04 10:39:07 +01:00
Andy Allan
8cd83426cc Make the back button not look disabled 
This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable.

Alternative implementation of #2386
 2020-07-04 11:20:46 +02:00
Andy Allan
bae057dbdf Avoid list markers for the richtext help text 2020-07-04 10:51:16 +02:00
Martin Raifer
d49771ba95 Add banner for SOTM 2020 2020-07-01 12:27:07 +01:00
Tom Hughes
0585866202 Merge remote-tracking branch 'upstream/pull/2661' 2020-07-01 08:28:08 +01:00
Tom Hughes
3abeeb7f41 Require open3 before using it 2020-06-26 19:40:37 +01:00
Paul Norman
fb4aa31048
Add ÖPNVKarte layer 2020-06-25 20:47:25 -07:00
Simon Poole
63c0b697a4 Change tile licence 
This changes the text describing the tile licence as per decision of the OSMF board starting July 1st 2020
 2020-06-22 01:06:14 +02:00
Tom Hughes
a13b40ace9 Fix new erblint warnings 2020-06-11 19:44:22 +01:00
Tom Hughes
39b60219fe Fix new rubocop warnings 2020-06-11 19:21:41 +01:00
Tom Hughes
81a5a55f57 Show user delete links to admins 2020-06-11 17:26:05 +01:00
Andy Allan
600812f6ad Rework user#set_status and #delete to avoid GET requests 
This renames the delete action to destroy, and starts using resourceful
routing for user actions.
 2020-06-10 11:49:18 +02:00
Tom Hughes
d6f518f627 More improvements to locale selection for the data browser 
Use the browser language preferences for non-logged in users.
 2020-06-07 19:10:48 +01:00
Tom Hughes
293fe68eff Merge remote-tracking branch 'upstream/pull/2642' 2020-06-04 17:40:13 +01:00
Tom Hughes
768a792a61 Improve selection of name to display in data browser 
If the user is logged in then consider all their preferred
languages rather than just the UI language, and use the full
locale matching algorithm instead of just checking parents.

Fixes #2636
 2020-06-04 17:33:11 +01:00
Tom Hughes
c9f9ade96f Fix new rubocop warnings 2020-06-03 17:47:35 +01:00
Tom Hughes
a8c63724f6 Merge remote-tracking branch 'upstream/pull/2641' 2020-06-03 17:31:12 +01:00
Andy Allan
3786366fdc Rename friend to friendship in notifier 
Followup to #2269
 2020-06-03 18:29:08 +02:00
Andy Allan
8ebfdbc1ff Move make_friend and remove_friend to friendships controller 2020-06-03 18:23:07 +02:00
Andy Allan
0a33c66146 Convert lib files to model concerns 2020-06-03 16:44:26 +02:00
Andy Allan
c780a3f453
Merge pull request #2624 from francois2metz/diary-entry 
Add link to my diary in the diary index
 2020-06-03 14:11:04 +02:00
Tom Hughes
0f9e28711c Don't try and resize images that aren't resizable 2020-05-13 11:30:26 +01:00
Tom Hughes
5432cb6db5 Attach resized images to notification emails 
Fixes #2625
 2020-05-13 11:29:02 +01:00
Tom Hughes
f3219ada14 Fix new rubocop warnings 2020-05-12 19:18:45 +01:00
François de Metz
2ea79e21a0
Add link to my diary in the diary index. 2020-05-12 11:37:43 +02:00
François de Metz
43385325a8
Refactor the link to create a new entry diary. 2020-05-12 11:27:08 +02:00
Quincy Morgan
4d88d1677a Fix issue with iD embedded document sometimes showing scrollbars 2020-05-07 09:11:45 -07:00
Tom Hughes
7e925c3c00 Look at all note comments to find the close event 
Fixes #2612
 2020-05-06 14:06:04 +01:00
Tom Hughes
11e97b3edb Merge remote-tracking branch 'upstream/pull/2601' 2020-04-28 19:44:43 +01:00
Quincy Morgan
570db89eb8 Move document-level styling for iD to its stylesheet 2020-04-28 10:54:43 -07:00
Quincy Morgan
4dd9ea34bc Fix issue where iD would not take the full height of its iframe 2020-04-28 10:02:01 -07:00
Tom Hughes
03cde71a5e Refactor more controller tests 2020-04-26 20:33:06 +01:00
Andy Allan
32e46ad4e3 Remove tempfile patch for trace data 
Effectively reverts c0d2ad40c3

This patch is no longer required, since we only use send_data in
combination with Tempfile.read and that all works fine.
 2020-04-22 15:16:46 +02:00
Tom Hughes
64b3e289ac Merge remote-tracking branch 'upstream/pull/2597' 2020-04-22 13:34:19 +01:00
Andy Allan
35db86714b Use Open3.capture2 instead of backticks, to avoid command line injection risks 
In this situation, trace_name can be trivially checked as legitimate, but this
removes any lingering risks from interpolating into a command line instead of
passing parameters explicitly.

Refs #2229
 2020-04-22 13:57:32 +02:00
Tom Hughes
359d76c8f0 Redirect to the error page for non-existent issues 2020-04-22 12:37:56 +01:00
Tom Hughes
1cb92c9d2a Send meta information with error pages 2020-04-22 12:21:42 +01:00
Tom Hughes
9b634f3493 Cache OpenID provider names on a per-locale basis 
Fixes #2591
 2020-04-15 22:48:28 +01:00