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

10987 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
b0c90ed2b4 Merge remote-tracking branch 'upstream/pull/3187' 2021-04-28 18:59:34 +01:00
Tom Hughes
9d9b47ab55 Merge remote-tracking branch 'upstream/pull/3186' 2021-04-28 18:58:59 +01:00
Andy Allan
2955fe4d4b Refactor user blocks information to use a dl 
This also standardises the labels to have the colon, in common with
oauth_clients#show.
 2021-04-28 17:28:30 +01:00
Andy Allan
dbf35e0cf6 Merge branch 'pull/3146' 2021-04-28 16:03:57 +01:00
Andy Allan
02bfc46ab3 Move duration to its own line, so that it can be clearly labelled 2021-04-28 16:01:03 +01:00
Andy Allan
93ecedf02a Use the rake extension for remaining files, for consistency 2021-04-28 12:05:25 +01:00
Andy Allan
8ecb53b869
Merge pull request #3104 from fredrik-lindseth/patch-1 
Format openstreetmap.org/stats/data_stats
 2021-04-28 11:58:10 +01:00
Andy Allan
7158426ebb
Merge pull request #3169 from harry-wood/empty-lists 
Display message when the there are no notes/comments to display
 2021-04-28 10:36:09 +01:00
Tom Hughes
7cafc62063 Update bundle 2021-04-27 18:52:58 +01:00
Tom Hughes
46eae20478 Monkey patch oauth gem to avoid use of deprecated URI.unescape 2021-04-26 22:10:45 +01:00
Tom Hughes
89456c8b40 Handle UTF-8 correctly in monkey patched OAuth::Helper.escape 
Fixes #3185
 2021-04-26 22:10:45 +01:00
translatewiki.net
384c83a248 Localisation updates from https://translatewiki.net. 2021-04-26 15:30:10 +02:00
Tom Hughes
fe50bcd4d7 Merge remote-tracking branch 'upstream/pull/3183' 2021-04-26 14:11:43 +01:00
dependabot[bot]
bba9860791
Bump eslint from 7.24.0 to 7.25.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.24.0 to 7.25.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.24.0...v7.25.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-26 05:01:19 +00:00
Tom Hughes
70d7d8d850 Fix some ruby 3 compatibility issues 2021-04-22 19:20:25 +01:00
Tom Hughes
816a24592e Update deadlock_retry gem for ruby 3 compatibility 2021-04-22 19:08:37 +01:00
Tom Hughes
ad6c0d3eba Monkey patch oauth gem to avoid use of deprecated URI.escape 2021-04-22 18:53:27 +01:00
Tom Hughes
11aec2e0d7 Drop dynamic_form gem which is no longer required 2021-04-22 18:29:02 +01:00
Tom Hughes
d9104413f8 Drop version constraint for debug_inspector 2021-04-22 13:21:55 +00:00
translatewiki.net
3261f446ab Localisation updates from https://translatewiki.net. 2021-04-22 15:09:51 +02:00
Tom Hughes
914ec8723c Fix new rubocop warnings 2021-04-20 18:29:41 +01:00
Tom Hughes
844e485005 Update bundle 2021-04-20 18:23:13 +01:00
translatewiki.net
ae28387135 Localisation updates from https://translatewiki.net. 2021-04-19 12:54:05 +02:00
translatewiki.net
c7314e66c7 Localisation updates from https://translatewiki.net. 2021-04-15 13:12:33 +02:00
Andy Allan
28af501924 Merge branch 'pull/3164' 2021-04-14 16:13:29 +01:00
Andy Allan
6bb18436a3 Add tests for routing and to ensure output format 
This avoids the tests passing if the json output is an array of kv pairs,
instead of the desired hash of attributes.
 2021-04-14 16:11:57 +01:00
Tom Hughes
26e72635cb Update bundle 2021-04-13 19:19:25 +01:00
Tom Hughes
877d88b86d Merge remote-tracking branch 'upstream/pull/3174' 2021-04-13 08:10:58 +01:00
dependabot[bot]
de82f4ebd7
Bump actions/cache from v2.1.4 to v2.1.5 
Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.4...1a9e2138d905efd099035b49d8b7a3888c653ca8)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-13 06:37:33 +00:00
Tom Hughes
13499b19f9 Merge remote-tracking branch 'upstream/pull/3172' 2021-04-12 18:34:10 +01:00
translatewiki.net
24e9446417 Localisation updates from https://translatewiki.net. 2021-04-12 15:54:04 +02:00
dependabot[bot]
f0ad61063a
Bump eslint from 7.23.0 to 7.24.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.23.0 to 7.24.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.23.0...v7.24.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-12 05:01:27 +00:00
Harry Wood
95d682119a Display no diary comments message when empty 
Display a 'No diary comments' message when there are no diary comments to display, rather than an empty table.
 2021-04-10 00:47:20 +01:00
Michal Migurski
a968c1b923 Added test for user prefs JSON response 2021-04-09 14:28:13 -07:00
Harry Wood
de8ee536b1 Display no notes message when empty 
Display a 'No notes' message when there are no notes to display, rather than an empty table with pagination features.
 2021-04-09 19:21:09 +01:00
Tom Hughes
d8aeb7e653 Update bundle 2021-04-08 19:27:47 +01:00
translatewiki.net
1cbc0774e3 Localisation updates from https://translatewiki.net. 2021-04-08 16:35:58 +02:00
Andy Allan
b70da7b8ea
Merge pull request #1558 from plarus/master 
Add start url and indicate minimal-ui is sufficient when added as a PWA.
 2021-04-08 14:01:08 +01:00
Michal Migurski
143a90fcac Added root elements and dict support for preferences response 2021-04-07 17:45:24 -07:00
plarus
2b5e705006
Update manifest.json.erb 
Change for minimal-ui
 2021-04-07 19:45:58 +02:00
Tom Hughes
2d111c0f34 Merge remote-tracking branch 'upstream/pull/3166' 2021-04-07 16:44:06 +01:00
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