]>
git.openstreetmap.org Git - rails.git/log
Simon Poole [Wed, 30 Jan 2019 12:33:18 +0000 (13:33 +0100)]
Style fixes
Simon Poole [Wed, 30 Jan 2019 12:21:16 +0000 (13:21 +0100)]
Fix tests for change in users_controller, add test for missing read_tou
Simon Poole [Wed, 30 Jan 2019 09:20:47 +0000 (10:20 +0100)]
Require that tou_read checkbox is set
Simon Poole [Wed, 30 Jan 2019 09:19:21 +0000 (10:19 +0100)]
Use jquery
Simon Poole [Wed, 14 Nov 2018 13:00:53 +0000 (14:00 +0100)]
Rename string to avoid translation confusion
Simon Poole [Wed, 14 Nov 2018 12:53:04 +0000 (13:53 +0100)]
Move link to ToU to attribution footer
Simon Poole [Fri, 26 Oct 2018 18:00:00 +0000 (20:00 +0200)]
Move onclick handling of tou checkbox to ujs
Simon Poole [Sun, 21 Oct 2018 08:39:56 +0000 (10:39 +0200)]
Add links to the ToU and include them in signup
- this adds links to the ToU in the Welcome box and on the About page
- adds a timestamp column to the users table to record acceptance of the ToU
- require ToU to be accepted before signup can proceed
- rearrange and change text on signup page
translatewiki.net [Mon, 13 May 2019 12:55:56 +0000 (14:55 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 May 2019 15:24:10 +0000 (17:24 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 8 May 2019 18:03:48 +0000 (19:03 +0100)]
Update bundle
Tom Hughes [Wed, 8 May 2019 18:01:55 +0000 (19:01 +0100)]
Update polyfills
Tom Hughes [Wed, 8 May 2019 18:00:15 +0000 (19:00 +0100)]
Update leaflet to 1.5.1
translatewiki.net [Mon, 6 May 2019 15:01:54 +0000 (17:01 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 May 2019 16:16:12 +0000 (18:16 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Apr 2019 15:46:20 +0000 (17:46 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 27 Apr 2019 11:44:21 +0000 (12:44 +0100)]
Remove version constraint on postgres driver
J Guthrie [Sat, 27 Apr 2019 11:20:36 +0000 (12:20 +0100)]
Add geolink class to login/logout referer links
Fixes #2216
translatewiki.net [Thu, 25 Apr 2019 18:31:39 +0000 (20:31 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 24 Apr 2019 09:26:50 +0000 (10:26 +0100)]
Teach travis to validate the database schema
Tom Hughes [Wed, 24 Apr 2019 09:42:18 +0000 (10:42 +0100)]
Update database schema
Tom Hughes [Wed, 24 Apr 2019 10:05:02 +0000 (11:05 +0100)]
Use rails 4.2 defaults for older migrations
Tom Hughes [Wed, 24 Apr 2019 10:12:50 +0000 (11:12 +0100)]
Avoid error when there is no layer with a keyid
Fixes #2215
Tom Hughes [Tue, 23 Apr 2019 13:41:09 +0000 (14:41 +0100)]
Return correct base layer ID
Tom Hughes [Tue, 23 Apr 2019 08:29:31 +0000 (09:29 +0100)]
Add rubocop-performance
Tom Hughes [Tue, 23 Apr 2019 08:25:47 +0000 (09:25 +0100)]
Fix new rubocop warnings
Tom Hughes [Tue, 23 Apr 2019 08:25:28 +0000 (09:25 +0100)]
Disable failing cop pending upstream fix
Tom Hughes [Tue, 23 Apr 2019 08:10:23 +0000 (09:10 +0100)]
Update bundle
Tom Hughes [Tue, 23 Apr 2019 07:34:17 +0000 (08:34 +0100)]
Revert to tracking new versions of rinku
translatewiki.net [Mon, 22 Apr 2019 20:27:01 +0000 (22:27 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Apr 2019 15:17:44 +0000 (17:17 +0200)]
Localisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Apr 2019 15:52:58 +0000 (17:52 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 14 Apr 2019 16:35:47 +0000 (17:35 +0100)]
Switch travis to use xenial
Tom Hughes [Sun, 14 Apr 2019 15:09:04 +0000 (16:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2205'
translatewiki.net [Thu, 11 Apr 2019 16:04:13 +0000 (18:04 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 10 Apr 2019 15:06:15 +0000 (17:06 +0200)]
Resourceful(ish) naming for api/users_controller
Andy Allan [Wed, 10 Apr 2019 14:52:20 +0000 (16:52 +0200)]
Resourceful route names for api/trace_controller
translatewiki.net [Mon, 8 Apr 2019 14:59:31 +0000 (16:59 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 7 Apr 2019 16:02:39 +0000 (17:02 +0100)]
Enable a number of eslint style rules
Tom Hughes [Sat, 6 Apr 2019 16:27:17 +0000 (17:27 +0100)]
Enable some more eslint checks
Tom Hughes [Sat, 6 Apr 2019 16:13:12 +0000 (17:13 +0100)]
Exclude generated i18n files from eslint checks
Tom Hughes [Sat, 6 Apr 2019 14:59:34 +0000 (15:59 +0100)]
Use double quotes consistently in javascript code
Tom Hughes [Sat, 6 Apr 2019 14:48:51 +0000 (15:48 +0100)]
Enable some more eslint rules from iD rules
translatewiki.net [Thu, 4 Apr 2019 18:15:40 +0000 (20:15 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Wed, 3 Apr 2019 20:53:16 +0000 (21:53 +0100)]
Fix queuing of trace imports for API uploads
Fixes #2200
Tom Hughes [Wed, 3 Apr 2019 18:06:18 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/2196'
Tom Hughes [Mon, 1 Apr 2019 20:33:33 +0000 (21:33 +0100)]
Fix issues found by eslint
Tom Hughes [Mon, 1 Apr 2019 20:33:17 +0000 (21:33 +0100)]
Replace jshint with eslint
translatewiki.net [Mon, 1 Apr 2019 18:44:00 +0000 (20:44 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 31 Mar 2019 18:06:59 +0000 (19:06 +0100)]
Use erb-lint to prohibit inline scripting
Tom Hughes [Sat, 30 Mar 2019 15:35:37 +0000 (15:35 +0000)]
Format closed_at correctly in changeset API responses
Fixes #2195
translatewiki.net [Thu, 28 Mar 2019 18:41:23 +0000 (19:41 +0100)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 28 Mar 2019 09:35:12 +0000 (09:35 +0000)]
Fix dependencies
Tom Hughes [Thu, 28 Mar 2019 08:50:49 +0000 (08:50 +0000)]
Update to rails 5.2.3
Tom Hughes [Thu, 28 Mar 2019 08:45:58 +0000 (08:45 +0000)]
Expect CORS preflight responses to not have a content type
https://github.com/cyu/rack-cors/pull/180
Tom Hughes [Thu, 28 Mar 2019 08:37:52 +0000 (08:37 +0000)]
Update bundle
Tom Hughes [Thu, 28 Mar 2019 08:24:04 +0000 (08:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2190'
Tom Hughes [Thu, 28 Mar 2019 00:30:48 +0000 (00:30 +0000)]
erblint: use consistent spacing in HTML tags
Tom Hughes [Thu, 28 Mar 2019 00:29:04 +0000 (00:29 +0000)]
erblint: remove leading blank lines
Tom Hughes [Wed, 27 Mar 2019 19:14:16 +0000 (19:14 +0000)]
erblint: avoid dynamic find_by methods
Tom Hughes [Wed, 27 Mar 2019 19:11:49 +0000 (19:11 +0000)]
erblint: add rel=noopener to links that open in a new tab
Tom Hughes [Wed, 27 Mar 2019 18:59:52 +0000 (18:59 +0000)]
erblint: use conditional assignment
Tom Hughes [Wed, 27 Mar 2019 18:57:04 +0000 (18:57 +0000)]
erblint: use word arrays
Tom Hughes [Wed, 27 Mar 2019 18:55:48 +0000 (18:55 +0000)]
erblint: use parentheses for nested function calls
Tom Hughes [Wed, 27 Mar 2019 18:54:16 +0000 (18:54 +0000)]
erblint: use symbols as procs
Tom Hughes [Wed, 27 Mar 2019 18:49:01 +0000 (18:49 +0000)]
erblint: avoid negated if conditions
Tom Hughes [Wed, 27 Mar 2019 18:46:07 +0000 (18:46 +0000)]
erblint: prefer symbolic logical operators over and/or/not
Tom Hughes [Wed, 27 Mar 2019 18:19:08 +0000 (18:19 +0000)]
Merge remote-tracking branch 'upstream/pull/2192'
Tom Hughes [Wed, 27 Mar 2019 18:10:09 +0000 (18:10 +0000)]
Merge remote-tracking branch 'upstream/pull/2191'
Andy Allan [Wed, 27 Mar 2019 17:00:57 +0000 (18:00 +0100)]
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.
Andy Allan [Wed, 27 Mar 2019 16:16:49 +0000 (17:16 +0100)]
Set image dimensions in order to avoid a reflow after the page is drawn by the browser
Andy Allan [Wed, 27 Mar 2019 16:15:18 +0000 (17:15 +0100)]
Refactor notes#mine to simplify code
Tom Hughes [Wed, 27 Mar 2019 16:15:19 +0000 (16:15 +0000)]
erblint: fix remaining single quoted strings
Tom Hughes [Wed, 27 Mar 2019 12:07:11 +0000 (12:07 +0000)]
Merge remote-tracking branch 'upstream/pull/2189'
Andy Allan [Wed, 27 Mar 2019 10:50:45 +0000 (11:50 +0100)]
Use trace jobs by default
Tom Hughes [Wed, 27 Mar 2019 10:43:23 +0000 (10:43 +0000)]
Merge remote-tracking branch 'upstream/pull/2188'
Andy Allan [Wed, 27 Mar 2019 10:40:50 +0000 (11:40 +0100)]
Use the trace jobs for creating and destroy traces via the API
Tom Hughes [Wed, 27 Mar 2019 10:38:46 +0000 (10:38 +0000)]
Merge remote-tracking branch 'upstream/pull/2187'
Andy Allan [Wed, 27 Mar 2019 10:24:31 +0000 (11:24 +0100)]
Check validity token in changesets controller
It makes no difference today, but prevents problems in future if
methods accepting post requests are added to this controller in future.
Andy Allan [Wed, 27 Mar 2019 09:59:10 +0000 (10:59 +0100)]
erblint: avoid parentheses for method calls with no arguments
Andy Allan [Wed, 27 Mar 2019 09:57:00 +0000 (10:57 +0100)]
erblint: prefer double quoted strings
Andy Allan [Wed, 27 Mar 2019 09:42:16 +0000 (10:42 +0100)]
Exclude most views from string literal checks
This allows us to work through them slowly, while preventing errors
from creeping into directories that already pass.
Andy Allan [Wed, 27 Mar 2019 09:30:48 +0000 (10:30 +0100)]
erblint: Add or remove curly braces around hash parameters as required
Andy Allan [Wed, 27 Mar 2019 09:03:56 +0000 (10:03 +0100)]
erblint: use hash rocket syntax
Tom Hughes [Tue, 26 Mar 2019 21:11:51 +0000 (21:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2168'
Tom Hughes [Tue, 26 Mar 2019 20:22:32 +0000 (20:22 +0000)]
Exclude files in the vendor directory from erb-lint rubocop checks
Tom Hughes [Tue, 26 Mar 2019 19:41:44 +0000 (19:41 +0000)]
Fix capitalisation of div tag
Andy Allan [Wed, 6 Mar 2019 10:44:59 +0000 (11:44 +0100)]
Update coding style section of the contribution guide to describe our use of rubocop and erblint
Andy Allan [Wed, 6 Mar 2019 10:38:44 +0000 (11:38 +0100)]
Add erblint to travis
Andy Allan [Wed, 6 Mar 2019 10:30:40 +0000 (11:30 +0100)]
Introduce erb-lint for linting erb files
This also allows running rubocop on the ruby code within the erb
files.
Andy Allan [Wed, 6 Mar 2019 10:18:10 +0000 (11:18 +0100)]
Whitespace fixes to various erb files
Andy Allan [Wed, 6 Mar 2019 10:13:47 +0000 (11:13 +0100)]
Whitespace fixes for messages erb files
Andy Allan [Wed, 6 Mar 2019 10:11:15 +0000 (11:11 +0100)]
Whitespace fixes for layouts erb files
Andy Allan [Wed, 6 Mar 2019 10:02:54 +0000 (11:02 +0100)]
Whitespace fixes for diary_entry erb files
Andy Allan [Wed, 6 Mar 2019 09:59:55 +0000 (10:59 +0100)]
Whitespace fixes for browse erb files
Andy Allan [Wed, 6 Mar 2019 09:54:13 +0000 (10:54 +0100)]
Whitespace fixes for errors erb files
Andy Allan [Wed, 6 Mar 2019 09:53:57 +0000 (10:53 +0100)]
Whitespace fixes for oauth_clients erb files
Andy Allan [Wed, 6 Mar 2019 09:53:40 +0000 (10:53 +0100)]
Whitespace fixes for issues erb files
Andy Allan [Wed, 6 Mar 2019 09:50:33 +0000 (10:50 +0100)]
Whitespace fixes for users erb files
Andy Allan [Wed, 6 Mar 2019 09:42:25 +0000 (10:42 +0100)]
Whitespace fixes for user_blocks erb files