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

11570 commits

This branch
This branch
All branches
Author SHA1 Message Date
translatewiki.net
aa5790655e Localisation updates from https://translatewiki.net. 2021-03-08 15:57:34 +01:00
Tom Hughes
6538f49994 Merge remote-tracking branch 'upstream/pull/3118' 2021-03-05 15:50:34 +00:00
Quincy Morgan
d16c4667ed Remove incidental additions 2021-03-05 10:37:22 -05:00
Quincy Morgan
9e98c9d41d Merge branch 'master' into iD-2.19.6 2021-03-05 10:30:24 -05:00
Tom Hughes
f87e9a1088 Remove swfobject from Vendorfile as it is no longer used 2021-03-04 14:46:02 +00:00
Tom Hughes
d8b9b6dd58 Merge remote-tracking branch 'upstream/pull/3121' 2021-03-04 13:45:34 +00:00
Tom Hughes
d66541124f Merge remote-tracking branch 'upstream/pull/3120' 2021-03-04 13:45:31 +00:00
translatewiki.net
1c2d0ba92d Localisation updates from https://translatewiki.net. 2021-03-04 14:05:49 +01:00
Andy Allan
18b8780f21 Remove CSS overrides for the login page at small screen sizes 
Some of these selectors no longer apply, and the one that did just
made the behaviour worse, so they are all no longer required.
 2021-03-04 11:09:16 +00:00
Andy Allan
9bd1d74091 Prevent input group wrapping when sidebar is resized 
Fixes #3119
 2021-03-04 11:04:47 +00:00
Quincy Morgan
d66ad4a455 Update to iD v2.19.6 2021-03-03 14:21:42 -05:00
Tom Hughes
dfeb93c9f8 Merge remote-tracking branch 'upstream/pull/3117' 2021-03-03 18:43:34 +00:00
Andy Allan
1c1bfd7488 Add a small margin before the changesets more button 
See also #2717
 2021-03-03 17:46:01 +00:00
Andy Allan
3fdf1e204a Remove unnecessary margin-tops 2021-03-03 17:16:31 +00:00
Andy Allan
926576881f Remove final uses of the deemphasize class 2021-03-03 15:51:11 +00:00
Andy Allan
952cf0fdb4 Remove the old richtext_area helper 
This has been superseded by the `f.richtext_field` custom form builder.
 2021-03-03 15:34:16 +00:00
Tom Hughes
2233edbcfa Use a 307 Temporary Redirect to redirect to authentication 
When the user wants to enable an external authenticator we need
to redirect to omniauth but that now needs to be a POST so use a
redirect that preserves the POST method.

Fixes #3114
 2021-03-03 09:27:33 +00:00
Tom Hughes
ff3a30d245 Fix new rubocop warnings 2021-03-02 08:24:15 +00:00
Tom Hughes
4eb2e318af Update bundle 2021-03-02 08:22:08 +00:00
Tom Hughes
00bd8be546 Merge remote-tracking branch 'upstream/pull/3113' 2021-03-02 08:14:16 +00:00
translatewiki.net
68e48d97ba Localisation updates from https://translatewiki.net. 2021-03-01 14:50:53 +01:00
dependabot[bot]
11317d635d
Bump eslint from 7.20.0 to 7.21.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.20.0 to 7.21.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.20.0...v7.21.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-01 05:05:49 +00:00
translatewiki.net
0072472607 Localisation updates from https://translatewiki.net. 2021-02-25 16:25:29 +01:00
Tom Hughes
8b9164644b Merge remote-tracking branch 'upstream/pull/3109' 2021-02-24 17:12:36 +00:00
Andy Allan
df1ec6b680 Remove standard-form CSS rules 2021-02-24 14:48:10 +00:00
Andy Allan
f7b8b114a6 Convert the search forms to bootstrap 
This moves the forms to a flex grid, albeit with a little twiddling
to get things working in a compact space.
 2021-02-24 12:21:51 +00:00
Andy Allan
3debff60ef Merge branch 'pull/3091' 2021-02-24 10:49:39 +00:00
Andy Allan
00dbe5f4a4 Use the bootstrap spacer variable as the basis for spacing calcuation, and match mb-1 definition 2021-02-24 10:35:28 +00:00
Tom Hughes
a0dd71112a Update bundle 2021-02-23 18:56:55 +00:00
translatewiki.net
120344cd01 Localisation updates from https://translatewiki.net. 2021-02-22 16:49:08 +01:00
Tom Hughes
f91dd6afc2 Tighten up cookie security 
Mark all cookies as Secure, and the cookies which are not
modified client side as HttpOnly.
 2021-02-19 18:18:13 +00:00
mxdanger
ea92d66cc0 Add btn-wrapper class 2021-02-17 18:27:41 -08:00
Fredrik
7917c1cc92
Escape characters 2021-02-17 21:53:04 +00:00
Fredrik
49e06f2f14
Update statistics 2021-02-17 21:32:38 +00:00
Tom Hughes
56a2aa8efa Merge remote-tracking branch 'upstream/pull/3102' 2021-02-17 18:55:55 +00:00
Andy Allan
501e256419 Refactor the share panel to use bootstrap forms 2021-02-17 17:17:19 +00:00
Andy Allan
5c086dad6e Use bootstrap form-check for overlay selection 2021-02-17 17:05:49 +00:00
Tom Hughes
101c2af87e Merge remote-tracking branch 'upstream/pull/3100' 2021-02-17 11:56:53 +00:00
Andy Allan
8dab3f90fd Bump composite_primary_keys to 12.0.8 
12.0.7 has been yanked
 2021-02-17 11:12:47 +00:00
Andy Allan
5761371a56
Merge pull request #3083 from migurski/migurski/docker-compose-cleanups 
Post-merge Docker Compose cleanup issues
 2021-02-17 10:22:11 +00:00
Tom Hughes
2d50a84004 Fix new rubocop warnings 2021-02-16 21:14:54 +00:00
Tom Hughes
0982f17457 Update bundle 2021-02-16 21:10:28 +00:00
Tom Hughes
3c4f32a760 Validate avatar images 
Closes #3097
 2021-02-16 17:37:18 +00:00
Tom Hughes
80f576a29b Fix avatar mode update on file change 2021-02-16 17:12:34 +00:00
Tom Hughes
017d4a1017 Merge remote-tracking branch 'upstream/pull/3095' 2021-02-16 08:10:49 +00:00
translatewiki.net
cbc3402ffd Localisation updates from https://translatewiki.net. 2021-02-15 14:52:55 +01:00
dependabot[bot]
c53b3ceec5
Bump eslint from 7.19.0 to 7.20.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.19.0 to 7.20.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.19.0...v7.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-15 05:01:20 +00:00
Michal Migurski
a3e23096b3 Removed ENABLE_BOOTSNAP environment variable 2021-02-12 22:56:17 -08:00
Michal Migurski
7be797cbe2 Added explanatory notes and comments 2021-02-12 22:56:17 -08:00
Michal Migurski
87c62fec3b Added note about password and privileges for OSM DB user 2021-02-12 22:56:17 -08:00