]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Mon, 15 Jul 2019 18:17:01 +0000 (19:17 +0100)]
Skip uploading images for users that have a new style avatar
Tom Hughes [Mon, 15 Jul 2019 16:29:39 +0000 (17:29 +0100)]
Add a rake task to move user avatars to Active Storage
Tom Hughes [Mon, 15 Jul 2019 09:03:09 +0000 (10:03 +0100)]
Update querystring references
Tom Hughes [Mon, 15 Jul 2019 08:27:52 +0000 (09:27 +0100)]
Revert accidental schema changes
Tom Hughes [Mon, 15 Jul 2019 07:39:20 +0000 (08:39 +0100)]
It's to_sym not to_symbol
Tom Hughes [Mon, 15 Jul 2019 07:19:30 +0000 (08:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2296'
Tom Hughes [Sun, 14 Jul 2019 11:08:02 +0000 (12:08 +0100)]
Enable a few more eslint checks
Tom Hughes [Sun, 14 Jul 2019 09:52:18 +0000 (10:52 +0100)]
Enforce consistent indentation in javascript code
Tom Hughes [Sat, 13 Jul 2019 16:46:23 +0000 (17:46 +0100)]
Fix eslint warning
Tom Hughes [Sat, 13 Jul 2019 16:39:03 +0000 (17:39 +0100)]
Update eslint
Closes #2307
Tom Hughes [Thu, 11 Jul 2019 19:23:31 +0000 (20:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2305'
Mateusz Konieczny [Thu, 11 Jul 2019 19:09:43 +0000 (21:09 +0200)]
make link in documentation clickable
translatewiki.net [Thu, 11 Jul 2019 15:39:18 +0000 (17:39 +0200)]
Localisation updates from https://translatewiki.net.
Andy Allan [Wed, 10 Jul 2019 15:24:32 +0000 (17:24 +0200)]
Ignore the class length of test files
There's no sensible way to refactor a controller test into multiple classes,
so lets exclude them from the class length metrics to reveal other over-length
classes.
Tom Hughes [Sun, 7 Jul 2019 15:14:00 +0000 (16:14 +0100)]
Allow configuration of storage server URL for security policy
Tom Hughes [Fri, 5 Jul 2019 13:31:04 +0000 (14:31 +0100)]
Monkey patch Active Storage to set content type when uploading to S3
Tom Hughes [Wed, 3 Jul 2019 20:48:25 +0000 (21:48 +0100)]
Add support for using S3 as the object store
Tom Hughes [Tue, 2 Jul 2019 21:31:31 +0000 (22:31 +0100)]
Move user images to Active Storage with paperclip as a fallback
Tom Hughes [Tue, 2 Jul 2019 19:47:42 +0000 (20:47 +0100)]
Add support for Active Storage attachments
translatewiki.net [Mon, 8 Jul 2019 18:23:32 +0000 (20:23 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Mon, 8 Jul 2019 10:08:12 +0000 (11:08 +0100)]
Update wiki page data
Tom Hughes [Sun, 7 Jul 2019 15:30:04 +0000 (16:30 +0100)]
Fix rubocop warnings
Tom Hughes [Sun, 7 Jul 2019 15:24:57 +0000 (16:24 +0100)]
Update bundle
Tom Hughes [Sun, 7 Jul 2019 15:14:32 +0000 (16:14 +0100)]
Merge remote-tracking branch 'upstream/pull/2223'
translatewiki.net [Fri, 5 Jul 2019 05:26:34 +0000 (07:26 +0200)]
Localisation updates from https://translatewiki.net.
Grant Slater [Wed, 3 Jul 2019 19:47:07 +0000 (20:47 +0100)]
Ubuntu 18.04 is now required. Add apt-get update
Tom Hughes [Wed, 3 Jul 2019 16:59:14 +0000 (17:59 +0100)]
Include bundler in packages to install on Ubuntu
Tom Hughes [Wed, 3 Jul 2019 13:19:45 +0000 (14:19 +0100)]
More tweaks for RTL email
Fixes #2297
Tom Hughes [Wed, 3 Jul 2019 08:49:46 +0000 (09:49 +0100)]
Fix styling of email notifications in RTL languages
Fixes #2297
Tom Hughes [Wed, 3 Jul 2019 07:28:22 +0000 (08:28 +0100)]
Add missing space
Tom Hughes [Tue, 2 Jul 2019 18:42:51 +0000 (19:42 +0100)]
Revert "Block indexing of diary entries"
This reverts commit
fc67e63589536b0d8fa3a92aa7eff57ebeceb3a6 .
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese
translatewiki.net [Mon, 1 Jul 2019 07:43:51 +0000 (09:43 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 30 Jun 2019 14:27:25 +0000 (15:27 +0100)]
Merge remote-tracking branch 'upstream/pull/2294'
Bryan Housel [Sun, 30 Jun 2019 14:15:38 +0000 (10:15 -0400)]
Update to iD v2.15.3
Tom Hughes [Sun, 30 Jun 2019 10:57:56 +0000 (11:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2293'
Abijeet Patro [Sun, 30 Jun 2019 10:44:38 +0000 (16:14 +0530)]
Fix spellings from aggree to agree
As reported on https://translatewiki.net/wiki/Thread:Support/Found_typo_in_https://translatewiki.net/w/i.php%3Ftitle%3DOsm:Users.terms.tou_explain_html/en
Tom Hughes [Sat, 29 Jun 2019 23:25:21 +0000 (00:25 +0100)]
Update list of dependencies to install
mmd-osm [Fri, 28 Jun 2019 20:05:38 +0000 (22:05 +0200)]
Rubocop
mmd-osm [Fri, 28 Jun 2019 19:56:42 +0000 (21:56 +0200)]
Replace respond_to with render xml format
mmd-osm [Fri, 28 Jun 2019 19:35:02 +0000 (21:35 +0200)]
Revert XML default for routes
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese
mmd [Thu, 27 Jun 2019 20:40:51 +0000 (22:40 +0200)]
Merge branch 'master' into patch/view_migration
mmd-osm [Thu, 27 Jun 2019 20:23:38 +0000 (22:23 +0200)]
Refactoring
mmd-osm [Thu, 27 Jun 2019 19:26:11 +0000 (21:26 +0200)]
Remove non functioning changeset_cache, user_display_name_cache
translatewiki.net [Thu, 27 Jun 2019 16:37:17 +0000 (18:37 +0200)]
Localisation updates from https://translatewiki.net.
mmd-osm [Thu, 27 Jun 2019 16:33:12 +0000 (18:33 +0200)]
Avoid unnecessary arrays
mmd-osm [Wed, 26 Jun 2019 20:29:18 +0000 (22:29 +0200)]
Simplify partial rendering
mmd-osm [Wed, 26 Jun 2019 19:34:40 +0000 (21:34 +0200)]
Avoid using @variables in partials
Tom Hughes [Wed, 26 Jun 2019 18:57:12 +0000 (19:57 +0100)]
Merge remote-tracking branch 'upstream/pull/2280'
Tom Hughes [Wed, 26 Jun 2019 18:23:18 +0000 (19:23 +0100)]
Merge remote-tracking branch 'upstream/pull/2282'
Tom Hughes [Wed, 26 Jun 2019 18:19:58 +0000 (19:19 +0100)]
Merge remote-tracking branch 'upstream/pull/2281'
Andy Allan [Wed, 26 Jun 2019 16:24:57 +0000 (18:24 +0200)]
Split some extremely long strings over multiple lines using squiggly heredocs
I'm not entirely convinced that testing walls of text like this is useful
anyway, but at least this approach makes the lines significantly less long.
Andy Allan [Wed, 26 Jun 2019 15:07:49 +0000 (17:07 +0200)]
Rename @edits variable to @changesets, for clarity
Andy Allan [Wed, 26 Jun 2019 14:38:20 +0000 (16:38 +0200)]
Add support for an unversioned 'versions' API call
This will eventually replace the unversioned 'capabilities' call.
Client applications can use this versions call to find out what versions
are available, if they support multiple versions. The capabilities
of each version, and the format of the capabilities call, is then
able to change between versions. If a client only supports one version
they can jump straight to the versioned capabilities call.
Additionally, supported versions are now a list of version identifiers,
without any implications surrounding min/max values (e.g. guesswork
for supported intermediate versions).
Fixes #2162
Tom Hughes [Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)]
Merge remote-tracking branch 'upstream/pull/2207'
Tom Hughes [Wed, 26 Jun 2019 13:07:29 +0000 (14:07 +0100)]
Merge remote-tracking branch 'upstream/pull/2279'
Andy Allan [Wed, 26 Jun 2019 12:50:35 +0000 (14:50 +0200)]
Avoid stating the action to render when it just matches the current action
Tom Hughes [Wed, 26 Jun 2019 12:36:44 +0000 (13:36 +0100)]
Merge remote-tracking branch 'upstream/pull/2278'
Andy Allan [Wed, 26 Jun 2019 12:25:34 +0000 (14:25 +0200)]
Simplify render calls for changesets
Andy Allan [Wed, 26 Jun 2019 12:13:09 +0000 (14:13 +0200)]
Simplify partial rendering when the partial is named after the model
Andy Allan [Wed, 26 Jun 2019 10:52:21 +0000 (12:52 +0200)]
Rework to ensure views are named after the controller method name
Tom Hughes [Wed, 26 Jun 2019 10:22:19 +0000 (11:22 +0100)]
Merge remote-tracking branch 'upstream/pull/2271'
Tom Hughes [Tue, 25 Jun 2019 07:20:18 +0000 (08:20 +0100)]
Fix text direction for traditional chinese
Tom Hughes [Tue, 25 Jun 2019 07:16:28 +0000 (08:16 +0100)]
Update bundle
translatewiki.net [Mon, 24 Jun 2019 15:02:58 +0000 (17:02 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sun, 23 Jun 2019 10:21:03 +0000 (11:21 +0100)]
Allow signups to be blocked by MX host
Tom Hughes [Sat, 22 Jun 2019 23:22:46 +0000 (00:22 +0100)]
Block indexing of diary entries
Tom Hughes [Fri, 21 Jun 2019 10:23:38 +0000 (11:23 +0100)]
Update Potlatch 2 to
2.5-83-g28c84372 build
translatewiki.net [Thu, 20 Jun 2019 19:47:58 +0000 (21:47 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Thu, 20 Jun 2019 18:02:31 +0000 (19:02 +0100)]
Merge remote-tracking branch 'upstream/pull/2267'
Tom Hughes [Thu, 20 Jun 2019 17:58:38 +0000 (18:58 +0100)]
Merge remote-tracking branch 'upstream/pull/2270'
Tom Hughes [Thu, 20 Jun 2019 17:54:44 +0000 (18:54 +0100)]
Merge remote-tracking branch 'upstream/pull/2269'
Andy Allan [Wed, 19 Jun 2019 10:16:04 +0000 (12:16 +0200)]
Update note comments to use friendly_date_ago helper
Refs #2255
Andy Allan [Wed, 19 Jun 2019 10:11:47 +0000 (12:11 +0200)]
Use friendly_date_ago for notes display
Refs #2255
Andy Allan [Wed, 19 Jun 2019 10:09:46 +0000 (12:09 +0200)]
Use friendly_date_ago for user blocks
Refs #2255
Andy Allan [Wed, 19 Jun 2019 10:06:13 +0000 (12:06 +0200)]
Use friendly_date_ago helper for changeset comments
Refs #2255
Andy Allan [Wed, 19 Jun 2019 10:05:47 +0000 (12:05 +0200)]
Use friendly_date_ago helper for chnagesets
Refs #2255
Andy Allan [Wed, 19 Jun 2019 10:01:39 +0000 (12:01 +0200)]
Use friendly_date_ago helper for user_blocks
Refs #2255
Removes two unused translations.
Andy Allan [Wed, 19 Jun 2019 10:00:58 +0000 (12:00 +0200)]
Use friendy_date_ago helper for notes
Refs #2255
Andy Allan [Wed, 19 Jun 2019 09:59:37 +0000 (11:59 +0200)]
Add a friendly_date_ago helper
Refs #2255
Andy Allan [Wed, 19 Jun 2019 09:44:29 +0000 (11:44 +0200)]
Use distance_in_words_ago scope for user blocks
Refs #2255
Andy Allan [Wed, 19 Jun 2019 09:36:09 +0000 (11:36 +0200)]
Use scope for common details and changeset display in browse pages
Refs #2255
Andy Allan [Wed, 19 Jun 2019 09:34:29 +0000 (11:34 +0200)]
Use scope for time_ago when viewing users
Refs #2255.
Also removes unused translation referencing ago, that was unneeded
after
cbf71f04c244440f82d86e12758a2e443f68c0f8
Andy Allan [Wed, 19 Jun 2019 09:27:37 +0000 (11:27 +0200)]
Use distance_in_words_ago scope for issues display
Refs #2255
Andy Allan [Wed, 19 Jun 2019 09:25:31 +0000 (11:25 +0200)]
Use the distance_in_words_ago scope for diary comments pages
Refs #2255
Andy Allan [Wed, 19 Jun 2019 09:23:43 +0000 (11:23 +0200)]
Use the distance_in_words_ago scope for trace display
Refs #2255
Andy Allan [Wed, 19 Jun 2019 15:03:13 +0000 (17:03 +0200)]
Use user models, not ids, in assertions
Andy Allan [Wed, 19 Jun 2019 14:56:31 +0000 (16:56 +0200)]
Pass the models, not the ids, when dealing with friendships
Andy Allan [Wed, 19 Jun 2019 14:51:35 +0000 (16:51 +0200)]
Rename user.friend_users to user.friends
This is possible now since we've renamed Friend to Friendship
Andy Allan [Wed, 19 Jun 2019 14:39:25 +0000 (16:39 +0200)]
Rename Friend model to Friendship
This better describes what the model represents, which is the relationship
between the two users.
Andy Allan [Wed, 19 Jun 2019 08:42:09 +0000 (10:42 +0200)]
Add translations for distance_in_time_ago
This allows translators to accurately translate times when they
need to modify the distance_in_time beyond just adding 'ago'.
Refs #2255
Tom Hughes [Tue, 18 Jun 2019 20:10:07 +0000 (21:10 +0100)]
Merge remote-tracking branch 'upstream/pull/2226'
Tom Hughes [Tue, 18 Jun 2019 18:13:49 +0000 (19:13 +0100)]
Update bundle
Bryan Housel [Mon, 17 Jun 2019 21:26:24 +0000 (17:26 -0400)]
Pass through `photo_overlay` parameter
(re: https://github.com/openstreetmap/iD/issues/6492)
Bryan Housel [Mon, 17 Jun 2019 20:10:54 +0000 (16:10 -0400)]
Update to iD v2.15.2
translatewiki.net [Mon, 17 Jun 2019 17:34:33 +0000 (19:34 +0200)]
Localisation updates from https://translatewiki.net.
Tom Hughes [Sat, 15 Jun 2019 23:54:30 +0000 (00:54 +0100)]
Allow indexing of diary entries again
Tom Hughes [Sat, 15 Jun 2019 23:53:38 +0000 (00:53 +0100)]
Allow indexing of diary entries again
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