cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10997 commits 4 branches 1 tag 499 MiB
Commit graph

10997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
c105164d7e Merge remote-tracking branch 'upstream/pull/3165' 2021-04-07 16:42:14 +01:00
Andy Allan
6f2e3e9508 Add missing root attributes to User#show and User#index json responses 2021-04-07 16:30:08 +01:00
Andy Allan
094d6c8bb9 Move confirmation methods into ConfirmationsController 2021-04-07 16:05:32 +01:00
Andy Allan
7a66c6d4eb Split password reset functionality into PasswordsController 2021-04-07 16:05:28 +01:00
Michal Migurski
fd7526857b Updated JSON response format per feedback 2021-04-06 21:44:38 -07:00
Michal Migurski
a67ff9c038 Added JSON support to user preferences 2021-04-06 21:27:54 -07:00
Tom Hughes
e751703983 Update bundle 2021-04-06 19:45:55 +01:00
translatewiki.net
f286f40823 Localisation updates from https://translatewiki.net. 2021-04-05 15:33:55 +02:00
Tom Hughes
e0d501f832 Don't allow deleted users to be confirmed 2021-04-01 17:28:03 +01:00
translatewiki.net
5861bfb8f2 Localisation updates from https://translatewiki.net. 2021-04-01 13:48:14 +02:00
Tom Hughes
25510b6616 Add additional limits on sending messages 
Additional limits apply to new accounts and accounts with
unresolved issues reported against them.

Fixes #3135
 2021-03-31 22:40:34 +01:00
Tom Hughes
41f95466fa Merge remote-tracking branch 'upstream/pull/3157' 2021-03-31 16:45:24 +01:00
Tom Hughes
4a6b1e54a5 Switch GPX MIME type detection to use marcel 2021-03-30 18:26:23 +01:00
Tom Hughes
7bdd4e6809 Update to rails 6.0.3.6 2021-03-30 18:14:51 +01:00
Tom Hughes
bf3743f190 Add missing callbacks to session controller 2021-03-29 20:36:07 +01:00
translatewiki.net
097449d8e1 Localisation updates from https://translatewiki.net. 2021-03-29 18:02:30 +02:00
Andy Allan
60444d3015 Add test case to ensure clicking on the registration link takes you to the right page 2021-03-29 15:51:07 +01:00
Tom Hughes
bdfd935793 Merge remote-tracking branch 'upstream/pull/3157' 2021-03-29 15:15:48 +01:00
Andy Allan
12228510c3 Fix registration link 
Fixes #3156
 2021-03-29 14:57:41 +01:00
Tom Hughes
640fee0bf8 Merge remote-tracking branch 'upstream/pull/3155' 2021-03-29 12:48:26 +01:00
dependabot[bot]
ba1e629022
Bump eslint from 7.22.0 to 7.23.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.22.0 to 7.23.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.22.0...v7.23.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-29 05:01:40 +00:00
Tom Hughes
8f31b15237 Update bundle 2021-03-25 22:27:45 +00:00
Tom Hughes
cd99ff26fd Merge remote-tracking branch 'upstream/pull/3152' 2021-03-24 21:14:41 +00:00
Andy Allan
bb2afc3e8b Prevent addition of style attributes to all elements 2021-03-24 20:55:30 +00:00
Tom Hughes
580b7bfc0c Merge remote-tracking branch 'upstream/pull/3149' 2021-03-24 19:53:41 +00:00
Andy Allan
d7eac9b5a8 Strip away class attributes from sanitized outputs 
There's a lot of shenanigans that are possible when you can apply
arbitrary classes to the rendered output.
 2021-03-24 19:15:21 +00:00
Andy Allan
f442bb9e80 Rework configuration to use Sanitize::Config.merge 
This is the recommended approach, and works better when dealing with deeper attributes
 2021-03-24 18:19:14 +00:00
Andy Allan
5d39bf8491 Add tests for richtext table classes 2021-03-24 17:55:15 +00:00
Tom Hughes
0bdc865d9f Merge remote-tracking branch 'upstream/pull/3147' 2021-03-24 15:32:16 +00:00
Tom Hughes
a512392e6c Merge remote-tracking branch 'upstream/pull/3148' 2021-03-24 15:32:13 +00:00
Andy Allan
76063e9657 Bundle update for mimemagic yankage 2021-03-24 13:45:18 +00:00
Andy Allan
9fd96cfb87 Move sessions-related tests out of UsersControllerTest 2021-03-24 11:40:17 +00:00
Andy Allan
f18baae22e Refactor login/logout into sessions controller 
Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.
 2021-03-24 11:32:46 +00:00
Tom Hughes
3512d6303c Fix new rubocop warnings 2021-03-23 19:48:13 +00:00
Tom Hughes
fff12dd970 Update bundle 2021-03-23 19:34:34 +00:00
polarbearing
b4e2f8e34f
Show the crafted duration of a block independent of the reading time 
Fixes #3143.
Not tested by myself. Treat like pseudocode, I don't speak Ruby.
 2021-03-23 12:37:14 +01:00
translatewiki.net
1fd5d7f4fe Localisation updates from https://translatewiki.net. 2021-03-22 15:44:07 +01:00
Tom Hughes
69eb78ab79 Merge remote-tracking branch 'upstream/pull/3142' 2021-03-22 07:23:00 +00:00
Tom Hughes
240dc47b93 Merge remote-tracking branch 'upstream/pull/3144' 2021-03-22 07:05:57 +00:00
dependabot[bot]
9b13520b2e
Bump qs from 6.10.0 to 6.10.1 
Bumps [qs](https://github.com/ljharb/qs) from 6.10.0 to 6.10.1.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.0...v6.10.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-22 05:02:44 +00:00
Morten Bruhn
979528786c Added place=archipelago to en.yml 2021-03-21 19:33:30 +01:00
Morten Bruhn
8ff838ae45 Added natural=atoll to en.yml 2021-03-21 19:31:17 +01:00
Tom Hughes
547d9b63c4 Merge remote-tracking branch 'upstream/pull/3141' 2021-03-21 15:07:59 +00:00
Tom Hughes
4c2e4de5c0 Handle errors checking for gravatars 2021-03-21 10:24:53 +00:00
dependabot[bot]
438a8f876d
Bump qs from 6.9.6 to 6.10.0 
Bumps [qs](https://github.com/ljharb/qs) from 6.9.6 to 6.10.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-19 05:02:29 +00:00
translatewiki.net
9786b716aa Localisation updates from https://translatewiki.net. 2021-03-18 13:49:53 +01:00
Tom Hughes
978ba726d9 Merge remote-tracking branch 'upstream/pull/3140' 2021-03-17 19:11:35 +00:00
Andy Allan
a08fe1c291 Use list-inline to achieve spacing between elements on a line 
This is a better solution than spans and margins. Additionally, rework
to use mb-* instead of my-* (bootstrap advises against using margin-top)
and get rid of <br>s by using paragraphs instead.
 2021-03-17 18:57:36 +00:00
Tom Hughes
8e5deafd85 Merge remote-tracking branch 'upstream/pull/3124' 2021-03-17 18:17:49 +00:00
Tom Hughes
e2db409872 Merge remote-tracking branch 'upstream/pull/3138' 2021-03-17 18:16:15 +00:00