rails.git
20 months agoShow deleted diary entries to administrators, if the user isn't also deleted
Andy Allan [Wed, 5 Jun 2019 13:30:08 +0000 (15:30 +0200)]
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.

20 months agoAllow administrators to unhide diary entries, if they wish
Andy Allan [Wed, 5 Jun 2019 13:29:47 +0000 (15:29 +0200)]
Allow administrators to unhide diary entries, if they wish

20 months agoMerge remote-tracking branch 'upstream/pull/2249'
Tom Hughes [Wed, 5 Jun 2019 16:19:57 +0000 (17:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2249'

20 months agoMerge remote-tracking branch 'upstream/pull/2250'
Tom Hughes [Wed, 5 Jun 2019 16:18:55 +0000 (17:18 +0100)]
Merge remote-tracking branch 'upstream/pull/2250'

20 months agoIgnore the block length of the routes
Andy Allan [Wed, 5 Jun 2019 14:29:54 +0000 (16:29 +0200)]
Ignore the block length of the routes

Since the routes are more of a dsl than code, we've been happy to
repeatedly bump up this number. But then that hides other code which
has over-long block lengths hiding behind.

So instead let's exclude the routes from this metric.

20 months agoRemove dead link to sitemap
Andy Allan [Wed, 5 Jun 2019 14:18:48 +0000 (16:18 +0200)]
Remove dead link to sitemap

Fixes #1113

20 months agoFix rubocop warning
Tom Hughes [Wed, 5 Jun 2019 08:20:00 +0000 (09:20 +0100)]
Fix rubocop warning

20 months agoUpdate rubocop todo
Tom Hughes [Wed, 5 Jun 2019 08:10:03 +0000 (09:10 +0100)]
Update rubocop todo

20 months agoAdd rubocop-rails
Tom Hughes [Wed, 5 Jun 2019 07:51:08 +0000 (08:51 +0100)]
Add rubocop-rails

20 months agoUpdate bundle
Tom Hughes [Wed, 5 Jun 2019 07:46:52 +0000 (08:46 +0100)]
Update bundle

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Jun 2019 15:46:00 +0000 (17:46 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 30 May 2019 17:35:06 +0000 (19:35 +0200)]
Localisation updates from https://translatewiki.net.

20 months agoMerge remote-tracking branch 'upstream/pull/2225'
Tom Hughes [Thu, 30 May 2019 17:06:58 +0000 (18:06 +0100)]
Merge remote-tracking branch 'upstream/pull/2225'

20 months agoUpdate bundle
Tom Hughes [Thu, 30 May 2019 08:25:34 +0000 (09:25 +0100)]
Update bundle

20 months agoMerge remote-tracking branch 'upstream/pull/2237'
Tom Hughes [Thu, 30 May 2019 08:20:37 +0000 (09:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2237'

20 months agoUse strong_migrations to help developers avoid problems in production database schema...
Andy Allan [Wed, 29 May 2019 09:05:09 +0000 (11:05 +0200)]
Use strong_migrations to help developers avoid problems in production database schema changes

21 months agoMerge remote-tracking branch 'upstream/pull/2239'
Tom Hughes [Wed, 29 May 2019 16:41:08 +0000 (17:41 +0100)]
Merge remote-tracking branch 'upstream/pull/2239'

21 months agoMerge remote-tracking branch 'upstream/pull/2238'
Tom Hughes [Wed, 29 May 2019 16:37:18 +0000 (17:37 +0100)]
Merge remote-tracking branch 'upstream/pull/2238'

21 months agorubocop and erblint fixes
Andy Allan [Wed, 29 May 2019 15:09:51 +0000 (17:09 +0200)]
rubocop and erblint fixes

21 months agoAllow a configurable delay to keep diary entries from being published in feeds
Andy Allan [Wed, 29 May 2019 14:56:15 +0000 (16:56 +0200)]
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.

21 months agoRefactor diary entry form
Andy Allan [Wed, 29 May 2019 14:09:14 +0000 (16:09 +0200)]
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.

21 months agoRefactor some diary entry routes to use resources
Andy Allan [Wed, 29 May 2019 13:55:27 +0000 (15:55 +0200)]
Refactor some diary entry routes to use resources

21 months agoRefactor diary entries to use create and update methods
Andy Allan [Wed, 29 May 2019 13:37:23 +0000 (15:37 +0200)]
Refactor diary entries to use create and update methods

This brings it slightly more into line with resourceful routing.

21 months agoMerge remote-tracking branch 'upstream/pull/2236'
Tom Hughes [Wed, 29 May 2019 10:05:21 +0000 (11:05 +0100)]
Merge remote-tracking branch 'upstream/pull/2236'

21 months agoUpdate annotations to show 'using' clause on indexes
Andy Allan [Wed, 29 May 2019 10:02:50 +0000 (12:02 +0200)]
Update annotations to show 'using' clause on indexes

21 months agoUpdate annotations to correctly show bigint types
Andy Allan [Wed, 29 May 2019 09:52:20 +0000 (11:52 +0200)]
Update annotations to correctly show bigint types

21 months agoMerge remote-tracking branch 'upstream/pull/2232'
Tom Hughes [Tue, 28 May 2019 13:36:38 +0000 (14:36 +0100)]
Merge remote-tracking branch 'upstream/pull/2232'

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 May 2019 14:54:08 +0000 (16:54 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate to iD v2.15.1
Bryan Housel [Sat, 25 May 2019 02:20:29 +0000 (22:20 -0400)]
Update to iD v2.15.1

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 May 2019 12:31:35 +0000 (14:31 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate to iD v2.15.0
Bryan Housel [Tue, 21 May 2019 17:23:10 +0000 (13:23 -0400)]
Update to iD v2.15.0

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 May 2019 12:03:37 +0000 (14:03 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate database schema
Tom Hughes [Sun, 19 May 2019 16:17:25 +0000 (17:17 +0100)]
Update database schema

21 months agoMerge remote-tracking branch 'upstream/pull/2028'
Tom Hughes [Sun, 19 May 2019 16:14:19 +0000 (17:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2028'

21 months agoRemove left over string from first draft
Simon Poole [Sun, 19 May 2019 15:17:59 +0000 (17:17 +0200)]
Remove left over string from first draft

21 months agoExclude per-user diary pages from indexing
Tom Hughes [Sun, 19 May 2019 10:56:47 +0000 (11:56 +0100)]
Exclude per-user diary pages from indexing

21 months agoAdd some extra indexes for ACL lookups
Tom Hughes [Sat, 18 May 2019 11:57:31 +0000 (12:57 +0100)]
Add some extra indexes for ACL lookups

21 months agoBlock indexing of diaries
Tom Hughes [Sat, 18 May 2019 09:10:42 +0000 (10:10 +0100)]
Block indexing of diaries

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 17 May 2019 10:35:45 +0000 (12:35 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoAllow user_blocks to be created for longer periods
Andy Allan [Wed, 15 May 2019 09:30:28 +0000 (11:30 +0200)]
Allow user_blocks to be created for longer periods

This avoids admins from having to manually change end periods in the database

21 months agoReduce es lint moaning
Simon Poole [Mon, 13 May 2019 15:45:50 +0000 (17:45 +0200)]
Reduce es lint moaning

21 months agoUpdate user_creation_test for new parameter
Simon Poole [Tue, 2 Apr 2019 22:23:10 +0000 (00:23 +0200)]
Update user_creation_test for new parameter

21 months agoTry to make erblint happy
Simon Poole [Tue, 2 Apr 2019 21:58:33 +0000 (23:58 +0200)]
Try to make erblint happy

21 months agoAdd checkbox for contributor terms and improve text
Simon Poole [Tue, 2 Apr 2019 11:52:56 +0000 (13:52 +0200)]
Add checkbox for contributor terms and improve text

21 months agoRemove unnecessary test for 0
Simon Poole [Thu, 31 Jan 2019 08:44:31 +0000 (09:44 +0100)]
Remove unnecessary test for 0

21 months agoFix tests for change in users_controller
Simon Poole [Wed, 30 Jan 2019 14:30:05 +0000 (15:30 +0100)]
Fix tests for change in users_controller

21 months agoRubocop fixes and increase per method complexity limit from 23 to 25
Simon Poole [Wed, 30 Jan 2019 13:39:05 +0000 (14:39 +0100)]
Rubocop fixes and increase per method complexity limit from 23 to 25

21 months agoStyle fixes
Simon Poole [Wed, 30 Jan 2019 12:33:18 +0000 (13:33 +0100)]
Style fixes

21 months agoFix tests for change in users_controller, add test for missing read_tou
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

21 months agoRequire that tou_read checkbox is set
Simon Poole [Wed, 30 Jan 2019 09:20:47 +0000 (10:20 +0100)]
Require that tou_read checkbox is set

21 months agoUse jquery
Simon Poole [Wed, 30 Jan 2019 09:19:21 +0000 (10:19 +0100)]
Use jquery

21 months agoRename string to avoid translation confusion
Simon Poole [Wed, 14 Nov 2018 13:00:53 +0000 (14:00 +0100)]
Rename string to avoid translation confusion

21 months agoMove link to ToU to attribution footer
Simon Poole [Wed, 14 Nov 2018 12:53:04 +0000 (13:53 +0100)]
Move link to ToU to attribution footer

21 months agoMove onclick handling of tou checkbox to ujs
Simon Poole [Fri, 26 Oct 2018 18:00:00 +0000 (20:00 +0200)]
Move onclick handling of tou checkbox to ujs

21 months agoAdd links to the ToU and include them in signup
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

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 May 2019 12:55:56 +0000 (14:55 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 May 2019 15:24:10 +0000 (17:24 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate bundle
Tom Hughes [Wed, 8 May 2019 18:03:48 +0000 (19:03 +0100)]
Update bundle

21 months agoUpdate polyfills
Tom Hughes [Wed, 8 May 2019 18:01:55 +0000 (19:01 +0100)]
Update polyfills

21 months agoUpdate leaflet to 1.5.1
Tom Hughes [Wed, 8 May 2019 18:00:15 +0000 (19:00 +0100)]
Update leaflet to 1.5.1

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 May 2019 15:01:54 +0000 (17:01 +0200)]
Localisation updates from https://translatewiki.net.

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 May 2019 16:16:12 +0000 (18:16 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Apr 2019 15:46:20 +0000 (17:46 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoRemove version constraint on postgres driver
Tom Hughes [Sat, 27 Apr 2019 11:44:21 +0000 (12:44 +0100)]
Remove version constraint on postgres driver

22 months agoAdd geolink class to login/logout referer links
J Guthrie [Sat, 27 Apr 2019 11:20:36 +0000 (12:20 +0100)]
Add geolink class to login/logout referer links

Fixes #2216

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Apr 2019 18:31:39 +0000 (20:31 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoTeach travis to validate the database schema
Tom Hughes [Wed, 24 Apr 2019 09:26:50 +0000 (10:26 +0100)]
Teach travis to validate the database schema

22 months agoUpdate database schema
Tom Hughes [Wed, 24 Apr 2019 09:42:18 +0000 (10:42 +0100)]
Update database schema

22 months agoUse rails 4.2 defaults for older migrations
Tom Hughes [Wed, 24 Apr 2019 10:05:02 +0000 (11:05 +0100)]
Use rails 4.2 defaults for older migrations

22 months agoAvoid error when there is no layer with a keyid
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

22 months agoReturn correct base layer ID
Tom Hughes [Tue, 23 Apr 2019 13:41:09 +0000 (14:41 +0100)]
Return correct base layer ID

22 months agoAdd rubocop-performance
Tom Hughes [Tue, 23 Apr 2019 08:29:31 +0000 (09:29 +0100)]
Add rubocop-performance

22 months agoFix new rubocop warnings
Tom Hughes [Tue, 23 Apr 2019 08:25:47 +0000 (09:25 +0100)]
Fix new rubocop warnings

22 months agoDisable failing cop pending upstream fix
Tom Hughes [Tue, 23 Apr 2019 08:25:28 +0000 (09:25 +0100)]
Disable failing cop pending upstream fix

22 months agoUpdate bundle
Tom Hughes [Tue, 23 Apr 2019 08:10:23 +0000 (09:10 +0100)]
Update bundle

22 months agoRevert to tracking new versions of rinku
Tom Hughes [Tue, 23 Apr 2019 07:34:17 +0000 (08:34 +0100)]
Revert to tracking new versions of rinku

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Apr 2019 20:27:01 +0000 (22:27 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Apr 2019 15:17:44 +0000 (17:17 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Apr 2019 15:52:58 +0000 (17:52 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoSwitch travis to use xenial
Tom Hughes [Sun, 14 Apr 2019 16:35:47 +0000 (17:35 +0100)]
Switch travis to use xenial

22 months agoMerge remote-tracking branch 'upstream/pull/2205'
Tom Hughes [Sun, 14 Apr 2019 15:09:04 +0000 (16:09 +0100)]
Merge remote-tracking branch 'upstream/pull/2205'

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Apr 2019 16:04:13 +0000 (18:04 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoResourceful(ish) naming for api/users_controller
Andy Allan [Wed, 10 Apr 2019 15:06:15 +0000 (17:06 +0200)]
Resourceful(ish) naming for api/users_controller

22 months agoResourceful route names for api/trace_controller
Andy Allan [Wed, 10 Apr 2019 14:52:20 +0000 (16:52 +0200)]
Resourceful route names for api/trace_controller

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Apr 2019 14:59:31 +0000 (16:59 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoEnable a number of eslint style rules
Tom Hughes [Sun, 7 Apr 2019 16:02:39 +0000 (17:02 +0100)]
Enable a number of eslint style rules

22 months agoEnable some more eslint checks
Tom Hughes [Sat, 6 Apr 2019 16:27:17 +0000 (17:27 +0100)]
Enable some more eslint checks

22 months agoExclude generated i18n files from eslint checks
Tom Hughes [Sat, 6 Apr 2019 16:13:12 +0000 (17:13 +0100)]
Exclude generated i18n files from eslint checks

22 months agoUse double quotes consistently in javascript code
Tom Hughes [Sat, 6 Apr 2019 14:59:34 +0000 (15:59 +0100)]
Use double quotes consistently in javascript code

22 months agoEnable some more eslint rules from iD rules
Tom Hughes [Sat, 6 Apr 2019 14:48:51 +0000 (15:48 +0100)]
Enable some more eslint rules from iD rules

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Apr 2019 18:15:40 +0000 (20:15 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoFix queuing of trace imports for API uploads
Tom Hughes [Wed, 3 Apr 2019 20:53:16 +0000 (21:53 +0100)]
Fix queuing of trace imports for API uploads

Fixes #2200

22 months agoMerge remote-tracking branch 'upstream/pull/2196'
Tom Hughes [Wed, 3 Apr 2019 18:06:18 +0000 (19:06 +0100)]
Merge remote-tracking branch 'upstream/pull/2196'

22 months agoFix issues found by eslint
Tom Hughes [Mon, 1 Apr 2019 20:33:33 +0000 (21:33 +0100)]
Fix issues found by eslint

22 months agoReplace jshint with eslint
Tom Hughes [Mon, 1 Apr 2019 20:33:17 +0000 (21:33 +0100)]
Replace jshint with eslint

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Apr 2019 18:44:00 +0000 (20:44 +0200)]
Localisation updates from https://translatewiki.net.

22 months agoUse erb-lint to prohibit inline scripting
Tom Hughes [Sun, 31 Mar 2019 18:06:59 +0000 (19:06 +0100)]
Use erb-lint to prohibit inline scripting

22 months agoFormat closed_at correctly in changeset API responses
Tom Hughes [Sat, 30 Mar 2019 15:35:37 +0000 (15:35 +0000)]
Format closed_at correctly in changeset API responses

Fixes #2195

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 28 Mar 2019 18:41:23 +0000 (19:41 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoFix dependencies
Tom Hughes [Thu, 28 Mar 2019 09:35:12 +0000 (09:35 +0000)]
Fix dependencies