]>
git.openstreetmap.org Git - rails.git/log
translatewiki.net [Mon, 23 Mar 2020 14:07:13 +0000 (15:07 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 22 Mar 2020 12:47:56 +0000 (12:47 +0000)]
Make linkify return an HTML safe result for unsafe inputs
Fixes #2567
Tom Hughes [Fri, 20 Mar 2020 17:22:23 +0000 (17:22 +0000)]
Fix some untranslateable strings
Fixes #2565
Tom Hughes [Fri, 20 Mar 2020 14:58:45 +0000 (14:58 +0000)]
Pass I18n argument correctly
Tom Hughes [Fri, 20 Mar 2020 14:28:51 +0000 (14:28 +0000)]
Fix lego translation with locate control
Fixes #2564
Tom Hughes [Thu, 19 Mar 2020 18:26:04 +0000 (18:26 +0000)]
Update javascript bundle
Tom Hughes [Thu, 19 Mar 2020 18:20:26 +0000 (18:20 +0000)]
Update to rails 6.0.2.2
translatewiki.net [Thu, 19 Mar 2020 14:12:49 +0000 (15:12 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 18 Mar 2020 20:15:06 +0000 (20:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2548'
Tom Hughes [Wed, 18 Mar 2020 14:58:06 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/pull/2448'
Tom Hughes [Wed, 18 Mar 2020 14:51:15 +0000 (14:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2562'
Andy Allan [Wed, 18 Mar 2020 14:35:55 +0000 (15:35 +0100)]
Copy trace fixture files, rather than symlinking
Since we are using tmpdirs in order to enable parallel testing, we
can go the full hog and drop the fakefs too and just copy all the
files directly into the tmpdir. If a test makes changes (e.g.
changing the icon file during an import) the copy in the tmpdir is
thrown away at the end of the test anyway.
Andy Allan [Wed, 4 Dec 2019 11:45:16 +0000 (12:45 +0100)]
Remove unused directories
Andy Allan [Wed, 27 Nov 2019 13:58:36 +0000 (14:58 +0100)]
Enable parallel tests
Andy Allan [Wed, 27 Nov 2019 13:57:49 +0000 (14:57 +0100)]
Use unique test directories for each trace test
This allows tests to be run in parallel, since it avoids deleting
some of the symlinks that other tests expect to be there.
Andy Allan [Wed, 27 Nov 2019 13:01:40 +0000 (14:01 +0100)]
Use the settings for the destination of the gpx fixture symlinks
This lets us change the settings values and have the fixtures appear
in the right place.
Andy Allan [Wed, 18 Mar 2020 13:33:30 +0000 (14:33 +0100)]
Remove unnecessary h() calls on model attributes
These were necessary in the rails 2.x era, but not now.
Tom Hughes [Wed, 18 Mar 2020 11:15:01 +0000 (11:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2561'
Andy Allan [Wed, 18 Mar 2020 10:27:36 +0000 (11:27 +0100)]
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.
Tom Hughes [Wed, 18 Mar 2020 11:02:07 +0000 (11:02 +0000)]
Merge remote-tracking branch 'upstream/pull/2560'
Andy Allan [Wed, 18 Mar 2020 10:16:03 +0000 (11:16 +0100)]
Enable remaining bootstrap components
Fixes #2511
translatewiki.net [Mon, 16 Mar 2020 14:52:51 +0000 (15:52 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 14 Mar 2020 15:51:23 +0000 (15:51 +0000)]
Merge remote-tracking branch 'upstream/pull/2558'
hikemaniac [Sat, 14 Mar 2020 15:39:21 +0000 (16:39 +0100)]
Moved CSS rule
hikemaniac [Sat, 14 Mar 2020 15:06:33 +0000 (16:06 +0100)]
Fix border-radius for search query input field
Tom Hughes [Sat, 14 Mar 2020 00:39:29 +0000 (00:39 +0000)]
Update javascript bundle
Closes #2557
translatewiki.net [Thu, 12 Mar 2020 18:27:55 +0000 (19:27 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 11 Mar 2020 18:52:39 +0000 (18:52 +0000)]
Update bundle
translatewiki.net [Mon, 9 Mar 2020 15:43:08 +0000 (16:43 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 5 Mar 2020 16:37:12 +0000 (17:37 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 4 Mar 2020 18:46:11 +0000 (18:46 +0000)]
Update bundle
translatewiki.net [Mon, 2 Mar 2020 13:51:22 +0000 (14:51 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 1 Mar 2020 19:08:40 +0000 (19:08 +0000)]
Enforce restrictions on issue visibility properly
Tom Hughes [Sat, 29 Feb 2020 17:52:55 +0000 (17:52 +0000)]
Fix eslint warnings
Tom Hughes [Sat, 29 Feb 2020 17:43:19 +0000 (17:43 +0000)]
Fix highlight of changesets with no bounding box
A changeset with no bounding box has no map layer so trying to
set it's style throws an exception which means we don't get to
the code to set the style on the list entry.
Fixes #2541
Tom Hughes [Sat, 29 Feb 2020 15:15:02 +0000 (15:15 +0000)]
Rework set_default_request_format ast set_request_formats
Instead of trying to work out the exact format, just figure
out the list of allowed formats and let rails do the rest.
Tom Hughes [Fri, 28 Feb 2020 22:50:08 +0000 (22:50 +0000)]
Update rubocop configuration
Tom Hughes [Fri, 28 Feb 2020 22:26:51 +0000 (22:26 +0000)]
Update bundle
translatewiki.net [Thu, 27 Feb 2020 16:19:42 +0000 (17:19 +0100)]
Localisation updates from https://translatewiki.net.
Holger Jeromin [Wed, 26 Feb 2020 19:27:52 +0000 (20:27 +0100)]
rename internal variable
Andy Allan [Wed, 26 Feb 2020 16:09:27 +0000 (17:09 +0100)]
Merge pull request #2542 from boubascript/master
Show mailto: links for email values in browse
Andy Allan [Wed, 26 Feb 2020 14:55:48 +0000 (15:55 +0100)]
Merge pull request #2485 from mmd-osm/patch/json2
JSON output nodes, ways, relations, map
translatewiki.net [Mon, 24 Feb 2020 14:45:28 +0000 (15:45 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 23 Feb 2020 20:30:29 +0000 (20:30 +0000)]
Allow bundle path to be overridden when building database functions
translatewiki.net [Thu, 20 Feb 2020 15:10:10 +0000 (16:10 +0100)]
Localisation updates from https://translatewiki.net.
Boubacar [Thu, 20 Feb 2020 04:44:40 +0000 (23:44 -0500)]
change validation to accept only single email values
Boubacar [Thu, 20 Feb 2020 01:52:35 +0000 (20:52 -0500)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website
Tom Hughes [Wed, 19 Feb 2020 19:11:32 +0000 (19:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2381'
ENT8R [Wed, 19 Feb 2020 11:58:47 +0000 (12:58 +0100)]
Keep the behaviour backwards-compatible
Boubacar [Mon, 17 Feb 2020 17:33:47 +0000 (12:33 -0500)]
change Max for rubocop Metrics/ModuleLength
Boubacar [Mon, 17 Feb 2020 16:39:30 +0000 (11:39 -0500)]
make email regex slightly more readable
Boubacar [Mon, 17 Feb 2020 16:28:25 +0000 (11:28 -0500)]
Merge branch 'master' of github.com:openstreetmap/openstreetmap-website
translatewiki.net [Mon, 17 Feb 2020 14:01:18 +0000 (15:01 +0100)]
Localisation updates from https://translatewiki.net.
Boubacar [Sun, 16 Feb 2020 22:45:43 +0000 (17:45 -0500)]
Fix macosx-bundle-config link typo
Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.
Tom Hughes [Mon, 17 Feb 2020 10:22:12 +0000 (10:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2540'
Andreas Hubel [Mon, 17 Feb 2020 09:21:57 +0000 (10:21 +0100)]
Improve macOS install notes
Boubacar [Mon, 17 Feb 2020 02:46:48 +0000 (21:46 -0500)]
Add email link helper to create mailto: links for email values in objects
Tom Hughes [Sun, 16 Feb 2020 23:05:55 +0000 (23:05 +0000)]
Merge remote-tracking branch 'upstream/pull/2539'
Boubacar [Sun, 16 Feb 2020 22:45:43 +0000 (17:45 -0500)]
Fix macosx-bundle-config link typo
Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.
Bryan Housel [Fri, 14 Feb 2020 17:01:56 +0000 (12:01 -0500)]
Update to iD v2.17.2
Tom Hughes [Thu, 13 Feb 2020 20:51:12 +0000 (20:51 +0000)]
Update bundle
Tom Hughes [Thu, 13 Feb 2020 12:38:24 +0000 (12:38 +0000)]
Merge remote-tracking branch 'upstream/pull/2534'
Anton Melnichuk [Thu, 13 Feb 2020 12:18:49 +0000 (14:18 +0200)]
fix help page, grid card layout on mobile
translatewiki.net [Thu, 13 Feb 2020 11:40:38 +0000 (12:40 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 12 Feb 2020 11:18:00 +0000 (11:18 +0000)]
Allow the embed page to be embedded in third party frames
translatewiki.net [Mon, 10 Feb 2020 13:58:42 +0000 (14:58 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 6 Feb 2020 14:03:08 +0000 (15:03 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 3 Feb 2020 22:43:15 +0000 (22:43 +0000)]
Update bundle
translatewiki.net [Mon, 3 Feb 2020 14:46:30 +0000 (15:46 +0100)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 Jan 2020 14:55:21 +0000 (15:55 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 30 Jan 2020 13:23:38 +0000 (13:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2526'
Andy Allan [Thu, 30 Jan 2020 12:34:29 +0000 (13:34 +0100)]
Fix border spacing for sidebar tags and routing tables
The reset code for border spacing was removed in
5c933868dbff and
led to minor artifacts in these two tables.
Andy Allan [Thu, 30 Jan 2020 12:14:53 +0000 (13:14 +0100)]
Remove list styling from various sidebar lists
Tom Hughes [Thu, 30 Jan 2020 10:07:59 +0000 (10:07 +0000)]
Merge remote-tracking branch 'upstream/pull/2525'
Andy Allan [Thu, 30 Jan 2020 09:24:08 +0000 (10:24 +0100)]
Use an unstyled list for the login buttons
Tom Hughes [Wed, 29 Jan 2020 17:55:55 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/2524'
Andy Allan [Wed, 29 Jan 2020 16:49:41 +0000 (17:49 +0100)]
Tweak the dropdown menu hover and active colours
Andy Allan [Wed, 29 Jan 2020 16:40:36 +0000 (17:40 +0100)]
Further tweaks to the navigation dropdown button colours
Andy Allan [Wed, 29 Jan 2020 16:18:12 +0000 (17:18 +0100)]
Don't highlight border when hovering on user-menu button
Andy Allan [Wed, 29 Jan 2020 16:14:43 +0000 (17:14 +0100)]
Styling for disabled edit button
Andy Allan [Wed, 29 Jan 2020 16:00:01 +0000 (17:00 +0100)]
Tweak positioning of inbox count on the user menu button
Andy Allan [Wed, 29 Jan 2020 15:54:29 +0000 (16:54 +0100)]
Switch to bootstrap for dropdowns and tooltips
Due to the javascript involved, it was more straightforward to combine
the two together. Moving to bootstrap v4 for dropdowns required some
redesign of the dropdown menu html, and the opportunity was taken to
move to using standard buttons for those menus.
translatewiki.net [Mon, 27 Jan 2020 16:47:33 +0000 (17:47 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 27 Jan 2020 08:43:30 +0000 (08:43 +0000)]
Re-enable minification of javascript assets
Rails 6 defaults to --skip-javascript when creating new environments
because by default it uses webpacker instead of sprockets to manage
javascript and that meant that I accidentally merged a change that
disabled the minification of javascript.
Fixes #2522
Tom Hughes [Sun, 26 Jan 2020 18:48:59 +0000 (18:48 +0000)]
Merge remote-tracking branch 'upstream/pull/2521'
Tom Hughes [Sun, 26 Jan 2020 18:46:30 +0000 (18:46 +0000)]
Merge remote-tracking branch 'upstream/pull/2519'
Holger Jeromin [Sun, 26 Jan 2020 10:26:58 +0000 (11:26 +0100)]
further linting stuff
Holger Jeromin [Sun, 26 Jan 2020 10:22:50 +0000 (11:22 +0100)]
fixing linting
Holger Jeromin [Sun, 26 Jan 2020 10:01:45 +0000 (11:01 +0100)]
Prevent exceptions while reversing directions
Andreas Geyer-Schulz [Sat, 25 Jan 2020 19:10:23 +0000 (20:10 +0100)]
Fix typo: change 'noreferer' to 'noreferrer'
as the correct rel attribute in external links.
Tom Hughes [Thu, 23 Jan 2020 18:39:02 +0000 (18:39 +0000)]
Update bundle
Closes #2517
translatewiki.net [Thu, 23 Jan 2020 15:18:01 +0000 (16:18 +0100)]
Localisation updates from https://translatewiki.net.
mmd-osm [Wed, 22 Jan 2020 21:47:47 +0000 (22:47 +0100)]
JSON: move root_attributes to shared folder
mmd-osm [Wed, 22 Jan 2020 21:33:30 +0000 (22:33 +0100)]
JSON: return HTTP 406 for unsupported formats
mmd-osm [Wed, 22 Jan 2020 16:38:28 +0000 (17:38 +0100)]
JSON: added clarification for non-supported Accept header formats
translatewiki.net [Mon, 20 Jan 2020 10:41:08 +0000 (11:41 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 20 Jan 2020 09:55:32 +0000 (09:55 +0000)]
Update bundle
Tom Hughes [Fri, 17 Jan 2020 00:06:13 +0000 (00:06 +0000)]
Merge remote-tracking branch 'upstream/pull/2512'
Quincy Morgan [Thu, 16 Jan 2020 23:56:46 +0000 (18:56 -0500)]
Update to iD v2.17.1
translatewiki.net [Thu, 16 Jan 2020 14:37:49 +0000 (15:37 +0100)]
Localisation updates from https://translatewiki.net.