rails.git
2 years agoAllow indexing of diary entries again
Tom Hughes [Sat, 15 Jun 2019 23:53:38 +0000 (00:53 +0100)]
Allow indexing of diary entries again

2 years agoFix importing of GPX traces with a leading byte order marker
Tom Hughes [Fri, 14 Jun 2019 17:49:04 +0000 (18:49 +0100)]
Fix importing of GPX traces with a leading byte order marker

Fixes #2258

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Jun 2019 18:22:51 +0000 (20:22 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoMerge remote-tracking branch 'upstream/pull/2209'
Tom Hughes [Wed, 12 Jun 2019 18:56:59 +0000 (19:56 +0100)]
Merge remote-tracking branch 'upstream/pull/2209'

2 years agoMerge remote-tracking branch 'upstream/pull/2257'
Tom Hughes [Wed, 12 Jun 2019 18:50:52 +0000 (19:50 +0100)]
Merge remote-tracking branch 'upstream/pull/2257'

2 years agoFix new eslint warnings
Tom Hughes [Sun, 14 Apr 2019 18:39:40 +0000 (19:39 +0100)]
Fix new eslint warnings

2 years agoReplace eslint-rails-ee with direct calls to eslint
Tom Hughes [Sun, 7 Apr 2019 23:00:57 +0000 (00:00 +0100)]
Replace eslint-rails-ee with direct calls to eslint

2 years agoMerge remote-tracking branch 'upstream/pull/2228'
Tom Hughes [Wed, 12 Jun 2019 18:16:32 +0000 (19:16 +0100)]
Merge remote-tracking branch 'upstream/pull/2228'

2 years agoMerge remote-tracking branch 'upstream/pull/2256'
Tom Hughes [Wed, 12 Jun 2019 17:58:15 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/2256'

2 years agoUse built-in form submit translation keys for traces
Andy Allan [Wed, 12 Jun 2019 14:36:13 +0000 (16:36 +0200)]
Use built-in form submit translation keys for traces

2 years agoUse built-in form submit translation keys for oauth client applications
Andy Allan [Wed, 12 Jun 2019 14:32:52 +0000 (16:32 +0200)]
Use built-in form submit translation keys for oauth client applications

2 years agoUse i18n for submit button for issue comments
Andy Allan [Wed, 12 Jun 2019 14:25:19 +0000 (16:25 +0200)]
Use i18n for submit button for issue comments

Normally when an en-GB.yml translation is missing, rails falls back to en.yml. But when
using the submit helpers, if the en-GB translation is missing, rails knows how to create
a fallback like 'Create {model_name}' without touching the en.yml file. This string might
then be different from what the test expects, e.g. 'Add Comment'.

So it's important to set the language headers, to avoid phantomjs from picking up your desktop
preferences in this specific case.

2 years agoUse built-in form sumbit translation keys for diary comments
Andy Allan [Wed, 12 Jun 2019 14:20:29 +0000 (16:20 +0200)]
Use built-in form sumbit translation keys for diary comments

Also use a diary comment object as the basis for the form

2 years agoUse built-in form sumbit translation keys for messages
Andy Allan [Wed, 12 Jun 2019 14:11:54 +0000 (16:11 +0200)]
Use built-in form sumbit translation keys for messages

2 years agoUse built-in form sumbit translation keys for redactions
Andy Allan [Wed, 12 Jun 2019 14:08:20 +0000 (16:08 +0200)]
Use built-in form sumbit translation keys for redactions

2 years agoUse built-in form sumbit translation keys for user blocks
Andy Allan [Wed, 12 Jun 2019 14:07:18 +0000 (16:07 +0200)]
Use built-in form sumbit translation keys for user blocks

2 years agoAdd a note about avoiding commits to other locale files
Andy Allan [Wed, 12 Jun 2019 13:03:24 +0000 (15:03 +0200)]
Add a note about avoiding commits to other locale files

2 years agoRound up the frame size for trace animations
Tom Hughes [Tue, 11 Jun 2019 21:33:07 +0000 (22:33 +0100)]
Round up the frame size for trace animations

2 years agoInclude first frame twice in trace animations
Tom Hughes [Tue, 11 Jun 2019 19:36:53 +0000 (20:36 +0100)]
Include first frame twice in trace animations

2 years agoTest import of various trace formats
Tom Hughes [Tue, 11 Jun 2019 18:52:51 +0000 (19:52 +0100)]
Test import of various trace formats

Fixes #2254

2 years agoFix rubocop warning
Tom Hughes [Tue, 11 Jun 2019 12:20:00 +0000 (13:20 +0100)]
Fix rubocop warning

2 years agoInstall libarchive-dev for travis
Tom Hughes [Tue, 11 Jun 2019 12:10:24 +0000 (13:10 +0100)]
Install libarchive-dev for travis

2 years agoParse each GPX file in an archive separately
Tom Hughes [Tue, 11 Jun 2019 11:57:00 +0000 (12:57 +0100)]
Parse each GPX file in an archive separately

Fixes #2253

2 years agoMerge remote-tracking branch 'upstream/pull/2204'
Tom Hughes [Mon, 10 Jun 2019 20:29:38 +0000 (21:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2204'

2 years agoUpdate to released version 0.4.0 of gd2-ffij
Tom Hughes [Mon, 10 Jun 2019 20:27:19 +0000 (21:27 +0100)]
Update to released version 0.4.0 of gd2-ffij

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Jun 2019 18:39:47 +0000 (20:39 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoFix erblint warnings
Tom Hughes [Thu, 6 Jun 2019 17:20:21 +0000 (18:20 +0100)]
Fix erblint warnings

2 years agoMake hidden diary entries and comments more visible
Tom Hughes [Thu, 6 Jun 2019 16:47:54 +0000 (17:47 +0100)]
Make hidden diary entries and comments more visible

2 years agoMerge remote-tracking branch 'upstream/pull/2248'
Tom Hughes [Thu, 6 Jun 2019 16:51:51 +0000 (17:51 +0100)]
Merge remote-tracking branch 'upstream/pull/2248'

2 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 6 Jun 2019 16:13:35 +0000 (18:13 +0200)]
Localisation updates from https://translatewiki.net.

2 years agoShow all diary comments to administrators
Andy Allan [Wed, 5 Jun 2019 13:52:51 +0000 (15:52 +0200)]
Show all diary comments to administrators

2 years agoAllow admins to unhide diary comments, if they wish
Andy Allan [Wed, 5 Jun 2019 13:52:15 +0000 (15:52 +0200)]
Allow admins to unhide diary comments, if they wish

2 years 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.

2 years 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

2 years 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'

2 years 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'

2 years 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.

2 years 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

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

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

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

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

2 years 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.

2 years 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.

2 years 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'

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

2 years 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'

2 years 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

2 years 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'

2 years 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'

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

2 years 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.

2 years 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.

2 years 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

2 years 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.

2 years 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'

2 years 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

2 years 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

2 years 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'

2 years 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.

2 years 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

2 years 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.

2 years 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

2 years 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.

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

2 years 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'

2 years 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

2 years agoRemove SWF gpx trackpoints feature for Potlatch1
mmd-osm [Sun, 19 May 2019 13:17:14 +0000 (15:17 +0200)]
Remove SWF gpx trackpoints feature for Potlatch1

2 years 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

2 years 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

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

2 years 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.

2 years 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

2 years agoAdjust to final animated GIF interface
Tom Hughes [Mon, 13 May 2019 19:17:01 +0000 (20:17 +0100)]
Adjust to final animated GIF interface

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

2 years 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

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

2 years 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

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

2 years 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

2 years 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

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

2 years 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

2 years 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

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

2 years 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

2 years 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

2 years 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

2 years 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

2 years 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.

2 years 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.

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

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

2 years 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

2 years 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.

2 years 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.

2 years 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.

2 years 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

2 years 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

2 years 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.