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

5526 commits

Author SHA1 Message Date
Tom Hughes
3abeeb7f41 Require open3 before using it 2020-06-26 19:40:37 +01: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
Tom Hughes
6ad0340b05 Localise formatting of point count for traces 
Fixes #2592
 2020-04-15 22:42:41 +01:00
Tom Hughes
3666b67433 Merge remote-tracking branch 'upstream/pull/2431' 2020-04-15 19:18:10 +01:00
Andy Allan
92ca406995
Merge pull request #2547 from bezdna/mobile-layout 
Trigger small screen layout based on the width of the screen, rather than the width of the menus.
 2020-04-15 16:50:12 +02:00
Tom Hughes
0dffed7a05 Merge remote-tracking branch 'upstream/pull/2579' 2020-04-15 15:41:49 +01:00
Tom Hughes
66ec3cd845 Add blob to frame-src in CSP for iD 
Fixes #2582
Closes #2583
 2020-04-09 18:43:12 +01:00
Andy Allan
a219df24ca Ensure that urls are only valid if the entire string is a url 
This replaces our homegrown regexps (that didn't quite work) with
ruby built-in regexps, and uses the termination anchor to ensure
that the entire string, not just the first part, is validated.
 2020-04-01 17:53:37 +02:00
Tom Hughes
e47c11c644 Merge remote-tracking branch 'upstream/pull/2577' 2020-04-01 11:56:27 +01:00
Andy Allan
055a976051 Remove custom table styling 
This removes the custom table styling code, and move to using bootstrap table styling for almost all remaining tables.
 2020-04-01 12:29:01 +02:00
Simon Legner
83bb627da6 Fix typo in comment 
Closes #2576
 2020-04-01 00:11:19 +01:00
Tom Hughes
b5c778b662 Fix new rubocop warnings 2020-03-31 19:08:10 +01:00
Tom Hughes
e693063fa5 Make linkify return an HTML safe result for unsafe inputs 
Fixes #2567
 2020-03-22 12:59:39 +00:00
Tom Hughes
3184bec5ae Fix some untranslateable strings 
Fixes #2565
 2020-03-20 17:22:23 +00:00
Tom Hughes
4176b78edf Pass I18n argument correctly 2020-03-20 14:58:45 +00:00
Tom Hughes
587a1b0754 Fix lego translation with locate control 
Fixes #2564
 2020-03-20 14:28:51 +00:00
Tom Hughes
e89742928d Merge remote-tracking branch 'upstream/pull/2548' 2020-03-18 20:15:06 +00:00
Andy Allan
b8c1bbb4f8 Remove unnecessary h() calls on model attributes 
These were necessary in the rails 2.x era, but not now.
 2020-03-18 14:33:30 +01:00
Andy Allan
5fdada204c Use bootstrap table striping to replace hand-cycled table stripes 
This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.
 2020-03-18 12:14:24 +01:00
Andy Allan
b0c50ab344 Enable remaining bootstrap components 
Fixes #2511
 2020-03-18 11:16:03 +01:00
hikemaniac
74142661e3 Moved CSS rule 2020-03-14 16:39:21 +01:00